Changeset 71385d4f in mainline

Timestamp:

2009-03-08T11:33:09Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c79d50d

Parents:

c24c26c6

Message:

Extended HID options.

File:

• HelenOS.config (modified) (1 diff)

HelenOS.config

@@ -332 +332 @@
 
 % What is your input device?
+@ "generic" Keyboard or serial line
 @ "keyboard" Keyboard
 @ "serial" Serial line
-! [MACHINE!=msim] CONFIG_HID_IN (choice)
+@ "none" No input device
+! [MACHINE!=msim&MACHINE!=ski&MACHINE!=serengeti] CONFIG_HID_IN (choice)
 % What is your input device?
 @ "serial" Serial line
-! [MACHINE=msim] CONFIG_HID_IN (choice)
+! [MACHINE=msim|MACHINE=ski|machine=serengeti] CONFIG_HID_IN (choice)
 
 % What is your output device?
+@ "generic" Monitor or serial line
 @ "monitor" Monitor
 @ "serial" Serial line
-! [MACHINE!=msim] CONFIG_HID_OUT (choice)
+@ "none" No output device
+! [MACHINE!=msim&MACHINE!=ski&MACHINE!=serengeti] CONFIG_HID_OUT (choice)
 % What is your output device?
 @ "serial" Serial line
-! [MACHINE=msim] CONFIG_HID_OUT (choice)
+! [MACHINE=msim|MACHINE=ski&MACHINE=serengeti] CONFIG_HID_OUT (choice)
 
 % i8042 controller support
-! [CONFIG_HID_IN=keyboard&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_I8042 (y/n)
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_I8042 (y/n)
 % i8042 controller support
-! [CONFIG_HID_IN=keyboard&PLATFORM=ia64&MACHINE=i460GX] CONFIG_I8042 (y/n)
-
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&MACHINE=i460GX] CONFIG_I8042 (y/n)
+
+% Support for NS16550 controller
+! [CONFIG_HID_IN=generic|CONFIG_HID_IN=serial|(PLATFORM=sparc64&CONFIG_HID_OUT!=none&CONFIG_HID_IN!=none)] CONFIG_NS16550 (y/n)
 % Support for NS16550 serial port
-! [CONFIG_HID_IN=serial|PLATFORM=sparc64] CONFIG_NS16550 (y/n)
-% Support for NS16550 serial port
-! [CONFIG_HID_IN=serial&PLATFORM=ia64&MACHINE=i460GX] CONFIG_NS16550 (y/n)
-
-% Support for Z8530 serial port
-! [PLATFORM=sparc64] CONFIG_Z8530 (y/n)
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial|CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&MACHINE=i460GX] CONFIG_NS16550 (y/n)
+
+% Support for Z8530 controller
+! [(CONFIG_HID_IN!=none|CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=sparc64] CONFIG_Z8530 (y/n)
 
 % Support for Serengeti console
-! [CONFIG_HID_IN=serial&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN (y/n)
+! [(CONFIG_HID_IN=serial|CONFIG_HID_OUT=serial)&MACHINE=serengeti] CONFIG_SGCN (y/n)
 
 % PC keyboard support
-! [CONFIG_HID_IN=keyboard&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
 % PC keyboard support
-! [CONFIG_HID_IN=keyboard&PLATFORM=ia64&MACHINE=i460GX] CONFIG_PC_KBD (y/n)
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&MACHINE=i460GX] CONFIG_PC_KBD (y/n)
 
 % Sun keyboard support
-! [CONFIG_HID_IN=keyboard&PLATFORM=sparc64] CONFIG_SUN_KBD (y/n)
+! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64] CONFIG_SUN_KBD (y/n)
 
 % Serial line input module
-! [CONFIG_HID_IN=serial] CONFIG_SRLN (y/n)
+! [CONFIG_HID_IN=generic|CONFIG_HID_IN=serial] CONFIG_SRLN (y/n)
 
 % EGA support
-! [CONFIG_HID_OUT=monitor&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_EGA (y/n)
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_EGA (y/n)
 % EGA support
-! [CONFIG_HID_OUT=monitor&PLATFORM=ia64&MACHINE=i460GX] CONFIG_EGA (y/n)
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&MACHINE=i460GX] CONFIG_EGA (y/n)
 
 % Framebuffer support
-! [CONFIG_HID_OUT=monitor] CONFIG_FB (y/n)
+! [CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor] CONFIG_FB (y/n)
 
 % Framebuffer width