Changeset b50b5af2 in mainline for kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (4 diffs)

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -57 +57 @@
 static irq_t icp_timer_irq;
 struct arm_machine_ops machine_ops = {
-        MACHINE_GENFUNC,
-        MACHINE_GENFUNC,
         icp_init,
         icp_timer_irq_start,
         icp_cpu_halt,
         icp_get_memory_size,
-        icp_fb_init,
         icp_irq_exception,
-        icp_get_fb_address,
         icp_frame_init,
         icp_output_init,
@@ -128 +124 @@
 }
 
-/** Initializes the icp frame buffer */
-void icp_fb_init(void)
-{
-        fb_properties_t prop = {
-                .addr = 0,
-                .offset = 0,
-                .x = 640,
-                .y = 480,
-                .scan = 2560,
-                .visual = VISUAL_BGR_0_8_8_8,
-        };
-        prop.addr = icp_get_fb_address();
-        fb_init(&prop);
-        fb_parea.pbase = ICP_FB;
-        fb_parea.frames = 300;
-        ddi_parea_register(&fb_parea);
-}
-
 /** Initializes icp_hw_map. */
 void icp_init(void)
@@ -172 +150 @@
 }
 
-
-/** Acquire console back for kernel. */
-void icp_grab_console(void)
-{
-}
-
-/** Return console to userspace. */
-void icp_release_console(void)
-{
-}
-
 /** Starts icp Real Time Clock device, which asserts regular interrupts.
- * 
+ *
  * @param frequency Interrupts frequency (0 disables RTC).
  */
@@ -296 +263 @@
 }
 
-/** Returns address of framebuffer device.
- *
- *  @return Address of framebuffer device.
- */
-uintptr_t icp_get_fb_address(void)
-{
+/*
+ * Integrator specific frame initialization
+ */
+void
+icp_frame_init(void)
+{
+        frame_mark_unavailable(ICP_FB_FRAME, ICP_FB_NUM_FRAME);
+        frame_mark_unavailable(0, 256);
+}
+
+void icp_output_init(void)
+{
+#ifdef CONFIG_FB
         if (!vga_init) {
                 icp_vga_init();
                 vga_init = true;
         }
-        return (uintptr_t) ICP_FB;
-}
-
-/*
- * Integrator specific frame initialization
- */
-void
-icp_frame_init(void)
-{
-        frame_mark_unavailable(ICP_FB_FRAME, ICP_FB_NUM_FRAME);
-        frame_mark_unavailable(0, 256);
-}
-
-void icp_output_init(void)
-{
+        
+        fb_properties_t prop = {
+                .addr = ICP_FB,
+                .offset = 0,
+                .x = 640,
+                .y = 480,
+                .scan = 2560,
+                .visual = VISUAL_BGR_0_8_8_8,
+        };
+        
+        outdev_t *fbdev = fb_init(&prop);
+        if (fbdev) {
+                stdout_wire(fbdev);
+                fb_parea.pbase = ICP_FB;
+                fb_parea.frames = 300;
+                ddi_parea_register(&fb_parea);
+        }
+#endif
 }