Changeset 1787e527 in mainline for kernel/arch/sparc64/src/console.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/sparc64/src/console.c (modified) (2 diffs)

kernel/arch/sparc64/src/console.c

@@ -103 +103 @@
         }
 #endif
+        
 #ifdef CONFIG_SGCN_PRN
-        sgcnout_init();
+        outdev_t *sgcndev = sgcnout_init();
+        if (sgcndev)
+                stdout_wire(sgcndev);
 #endif
 }
@@ -131 +134 @@
 }
 
-
-/** Acquire console back for kernel
- *
- */
-void arch_grab_console(void)
-{
-#ifdef CONFIG_FB
-        scr_redraw();
-#endif
-        
-#ifdef CONFIG_SGCN_KBD
-        sgcn_grab();
-#endif
-}
-
-/** Return console to userspace
- *
- */
-void arch_release_console(void)
-{
-#ifdef CONFIG_SGCN_KBD
-        sgcn_release();
-#endif
-}
-
 /** @}
  */