Changeset a71c158 in mainline for kernel/arch/ia32/src

Timestamp:

2009-08-21T14:12:45Z (16 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

Location:

kernel/arch/ia32/src

Files:

• drivers/vesa.c (modified) (5 diffs)
• ia32.c (modified) (2 diffs)

kernel/arch/ia32/src/drivers/vesa.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -40 +40 @@
 #include <genarch/fb/visuals.h>
 #include <arch/drivers/vesa.h>
+#include <console/chardev.h>
+#include <console/console.h>
 #include <putchar.h>
 #include <mm/page.h>
@@ -66 +68 @@
 uint8_t vesa_blue_pos;
 
-int vesa_present(void)
+bool vesa_init(void)
 {
-        if ((vesa_width != 0xffff) && (vesa_height != 0xffff))
-                return true;
+        if ((vesa_width == 0xffff) || (vesa_height == 0xffff))
+                return false;
         
-        return false;
-}
-
-void vesa_init(void)
-{
-        unsigned int visual;
+        visual_t visual;
         
         switch (vesa_bpp) {
@@ -97 +94 @@
                 break;
         default:
-                panic("Unsupported bits per pixel.");
+                LOG("Unsupported bits per pixel.");
+                return false;
         }
         
@@ -108 +106 @@
                 .visual = visual,
         };
-        fb_init(&vesa_props);
-}
-
-void vesa_redraw(void)
-{
-        fb_redraw();
+        
+        outdev_t *fbdev = fb_init(&vesa_props);
+        if (!fbdev)
+                return false;
+        
+        stdout_wire(fbdev);
+        return true;
 }
 

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)
-{
 }