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

Timestamp:

2009-11-16T21:22:54Z (14 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/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;
 }