Changeset a71c158 in mainline for kernel/arch/ia64/src/ia64.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/ia64/src/ia64.c (modified) (2 diffs)

kernel/arch/ia64/src/ia64.c

@@ -160 +160 @@
         }
         
-        skiout_init();
+        outdev_t *skidev = skiout_init();
+        if (skidev)
+                stdout_wire(skidev);
 #endif
         
 #ifdef CONFIG_EGA
-        ega_init(EGA_BASE, EGA_VIDEORAM);
+        outdev_t *egadev = ega_init(EGA_BASE, EGA_VIDEORAM);
+        if (egadev)
+                stdout_wire(egadev);
 #endif
         
@@ -249 +253 @@
 unative_t sys_tls_set(unative_t addr)
 {
-        return 0;
-}
-
-/** Acquire console back for kernel
- *
- */
-void arch_grab_console(void)
-{
-#ifdef MACHINE_ski
-        ski_kbd_grab();
-#endif
-}
-
-/** Return console to userspace
- *
- */
-void arch_release_console(void)
-{
-#ifdef MACHINE_ski
-        ski_kbd_release();
-#endif
+        return 0;
 }