Changes in kernel/arch/amd64/src/amd64.c [a71c158:c2417bc] in mainline

File:

• kernel/arch/amd64/src/amd64.c (modified) (2 diffs)

kernel/arch/amd64/src/amd64.c

@@ -151 +151 @@
                 i8254_init();
                 
-#if (defined(CONFIG_FB) || defined(CONFIG_EGA))
-                bool vesa = false;
-#endif
-                
 #ifdef CONFIG_FB
-                vesa = vesa_init();
-#endif
-                
+                if (vesa_present()) 
+                        vesa_init();
+                else
+#endif
 #ifdef CONFIG_EGA
-                if (!vesa) {
-                        outdev_t *egadev = ega_init(EGA_BASE, EGA_VIDEORAM);
-                        if (egadev)
-                                stdout_wire(egadev);
-                }
+                        ega_init(EGA_BASE, EGA_VIDEORAM);  /* video */
+#else
+                        {}
 #endif
                 
@@ -254 +249 @@
 }
 
+/** Acquire console back for kernel
+ *
+ */
+void arch_grab_console(void)
+{
+#ifdef CONFIG_FB
+        if (vesa_present())
+                vesa_redraw();
+        else
+#endif
+#ifdef CONFIG_EGA
+                ega_redraw();
+#else
+                {}
+#endif
+}
+
+/** Return console to userspace
+ *
+ */
+void arch_release_console(void)
+{
+}
+
 /** Construct function pointer
  *