WebSVN – HelenOS – Path Comparison – /

Ignore whitespace Rev 4269 → Rev 4270

 /trunk/kernel/arch/sparc64/src/console.c
 ,7 → 95,7
     indev_t *kbrdin;
     kbrdin = sgcnin_init();
     if (kbrdin)
-        srlnin_init(kbrdin);
+        srln_init(kbrdin);
 #endif
 #ifdef CONFIG_SGCN_PRN
     sgcnout_init();
 ,8 → 134,9
 #ifdef CONFIG_FB
     scr_redraw();
 #endif
     switch (kbd_type) {
-#ifdef CONFIG_SGCN
+#ifdef CONFIG_SGCN_KBD
     case KBD_SGCN:
         sgcn_grab();
         break;
 ,7 → 152,7
 void arch_release_console(void)
 {
     switch (kbd_type) {
-#ifdef CONFIG_SGCN
+#ifdef CONFIG_SGCN_KBD
     case KBD_SGCN:
         sgcn_release();
         break;

 /trunk/HelenOS.config
 ,8 → 388,11
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboardl)&PLATFORM=sparc64&MACHINE=generic] CONFIG_Z8530 (y/n)
 % 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
 ! [CONFIG_PC_KBD=y] CONFIG_I8042 (y)
 ,7 → 406,7
 ! [CONFIG_MIPS_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
 % 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
 ! [CONFIG_HID_OUT=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_EGA (y/n)