Changeset 1787e527 in mainline for kernel/arch/arm32/src/mach/testarm/testarm.c

Timestamp:

2009-11-16T21:22:54Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

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

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

@@ -57 +57 @@
 
 struct arm_machine_ops machine_ops = {
-        MACHINE_GENFUNC,
-        MACHINE_GENFUNC,
         gxemul_init,
         gxemul_timer_irq_start,
         gxemul_cpu_halt,
         gxemul_get_memory_size,
-        gxemul_fb_init,
         gxemul_irq_exception,
-        gxemul_get_fb_address,
         gxemul_frame_init,
         gxemul_output_init,
@@ -78 +74 @@
 }
 
-void gxemul_fb_init(void)
-{
+void gxemul_output_init(void)
+{
+#ifdef CONFIG_FB
         fb_properties_t prop = {
                 .addr = GXEMUL_FB_ADDRESS,
@@ -88 +85 @@
                 .visual = VISUAL_RGB_8_8_8,
         };
-        fb_init(&prop);
-}
-
-void gxemul_output_init(void)
-{
-        dsrlnout_init((ioport8_t *) gxemul_kbd);
+        
+        outdev_t *fbdev = fb_init(&prop);
+        if (fbdev)
+                stdout_wire(fbdev);
+#endif
+        
+#ifdef CONFIG_ARM_PRN
+        outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) gxemul_kbd);
+        if (dsrlndev)
+                stdout_wire(dsrlndev);
+#endif
 }
 
@@ -233 +235 @@
 }
 
-uintptr_t gxemul_get_fb_address()
-{
-        return ((uintptr_t)GXEMUL_FB_ADDRESS);
-}
-
-
 /** @}
  */