Changeset 3cc6a52 in mainline

Timestamp:

2009-04-10T19:51:16Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a1d89ad

Parents:

6eb2e96

Message:

fix serengeti console

Files:

• HelenOS.config (modified) (2 diffs)
• kernel/arch/sparc64/src/console.c (modified) (3 diffs)

HelenOS.config

@@ -389 +389 @@
 
 % Support for Serengeti console
-! [(CONFIG_HID_IN=generic|CONFIG_HID_OUT=generic)&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN (y/n)
+! [CONFIG_HID_OUT=generic&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN_PRN (y/n)
+
+% Support for Serengeti keyboard
+! [CONFIG_HID_IN=generic&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN_KBD (y/n)
 
 % i8042 controller support
@@ -404 +407 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)] CONFIG_SRLN (y)
+! [CONFIG_DSRLNIN=y|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&MACHINE=serengeti&CONFIG_SGCN_KBD=y)] CONFIG_SRLN (y)
 
 % EGA support

kernel/arch/sparc64/src/console.c

@@ -96 +96 @@
         kbrdin = sgcnin_init();
         if (kbrdin)
-                srlnin_init(kbrdin);
+                srln_init(kbrdin);
 #endif
 #ifdef CONFIG_SGCN_PRN
@@ -135 +135 @@
         scr_redraw();
 #endif
+        
         switch (kbd_type) {
-#ifdef CONFIG_SGCN
+#ifdef CONFIG_SGCN_KBD
         case KBD_SGCN:
                 sgcn_grab();
@@ -152 +153 @@
 {
         switch (kbd_type) {
-#ifdef CONFIG_SGCN
+#ifdef CONFIG_SGCN_KBD
         case KBD_SGCN:
                 sgcn_release();