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

Timestamp:

2009-08-21T14:12:45Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0e6dce8, b50b5af2, e5792d1

Parents:

90c8b8d

Message:

kernel output devices now suport multiple instances (except ski and sgcn, which respect the same interface, but behave as singletons)
if more than one output device gets initialized, the output is cloned to all of them
get rid of arch_grab_console() and arch_release_console() (output devices can implement a generic "redraw" method, input devices respect the "silent" global variable)
related cleanups and modifications

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);
-}
-
-
 /** @}
  */