Changeset 1787e527 in mainline for kernel/arch/ia32/src/ia32.c

Timestamp:

2009-11-16T21:22:54Z (15 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/ia32/src/ia32.c (modified) (2 diffs)

kernel/arch/ia32/src/ia32.c

@@ -112 +112 @@
                 i8254_init();
                 
+#if (defined(CONFIG_FB) || defined(CONFIG_EGA))
+                bool vesa = false;
+#endif
+                
 #ifdef CONFIG_FB
-                if (vesa_present())
-                        vesa_init();
-                else
-#endif
+                vesa = vesa_init();
+#endif
+                
 #ifdef CONFIG_EGA
-                        ega_init(EGA_BASE, EGA_VIDEORAM);  /* video */
-#else
-                        {}
+                if (!vesa) {
+                        outdev_t *egadev = ega_init(EGA_BASE, EGA_VIDEORAM);
+                        if (egadev)
+                                stdout_wire(egadev);
+                }
 #endif
                 
@@ -201 +206 @@
         THREAD->arch.tls = addr;
         set_tls_desc(addr);
-
+        
         return 0;
-}
-
-/** 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)
-{
 }