Changes in kernel/arch/arm32/src/mach/testarm/testarm.c [a71c158:30885b9] in mainline

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,
@@ -74 +78 @@
 }
 
-void gxemul_output_init(void)
-{
-#ifdef CONFIG_FB
+void gxemul_fb_init(void)
+{
         fb_properties_t prop = {
                 .addr = GXEMUL_FB_ADDRESS,
@@ -85 +88 @@
                 .visual = VISUAL_RGB_8_8_8,
         };
-        
-        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
+        fb_init(&prop);
+}
+
+void gxemul_output_init(void)
+{
+        dsrlnout_init((ioport8_t *) gxemul_kbd);
 }
 
@@ -235 +233 @@
 }
 
+uintptr_t gxemul_get_fb_address()
+{
+        return ((uintptr_t)GXEMUL_FB_ADDRESS);
+}
+
+
 /** @}
  */