Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 04b29cae43ebea0082c3145c91095f68c7fcc25e)
+++ HelenOS.config	(revision 8de4421abb3ed0f7fe9608f056ef87a1161d47f8)
@@ -42,5 +42,4 @@
 % Machine type
 @ "msim" MSIM
-@ "simics" Simics
 @ "bgxemul" GXEmul big endian
 @ "lgxemul" GXEmul little endian
@@ -147,5 +146,5 @@
 % User space architecture
 @ "mips32"
-! [PLATFORM=mips32&(MACHINE=msim|MACHINE=simics|MACHINE=lgxemul)] UARCH (choice)
+! [PLATFORM=mips32&(MACHINE=msim|MACHINE=lgxemul)] UARCH (choice)
 
 % User space architecture
@@ -213,5 +212,5 @@
 % Image format
 @ "ecoff"
-! [PLATFORM=mips32&(MACHINE=simics|MACHINE=bgxemul|MACHINE=lgxemul)] IMAGE (choice)
+! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] IMAGE (choice)
 
 
@@ -334,12 +333,11 @@
 % Input device class
 @ "generic" Keyboard or serial line
-@ "keyboard" Keyboard
-@ "serial" Serial line
 @ "none" No input device
-! [MACHINE!=msim&MACHINE!=ski&MACHINE!=serengeti] CONFIG_HID_IN (choice)
-
-% Input device class
-@ "serial" Serial line
-! [MACHINE=ski|MACHINE=serengeti] CONFIG_HID_IN (choice)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=mips32] CONFIG_HID_IN (choice)
+
+% Output device class
+@ "generic" Monitor or serial line
+@ "none" No output device
+! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=mips32&MACHINE=msim)] CONFIG_HID_OUT (choice)
 
 % Output device class
@@ -348,45 +346,59 @@
 @ "serial" Serial line
 @ "none" No output device
-! [MACHINE!=msim&MACHINE!=ski&MACHINE!=serengeti] CONFIG_HID_OUT (choice)
-
-% Output device class
-@ "serial" Serial line
-! [MACHINE=msim|MACHINE=ski&MACHINE=serengeti] CONFIG_HID_OUT (choice)
+! [PLATFORM=mips32&(MACHINE=bgxemul|MACHINE=lgxemul)] CONFIG_HID_OUT (choice)
+
+% PC keyboard support
+! [CONFIG_HID_IN=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
+
+% Support for msim/GXemul keyboard
+! [CONFIG_HID_IN=generic&PLATFORM=mips32] CONFIG_MIPS_KBD (y/n)
+
+% Support for msim/GXemul printer
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=mips32] CONFIG_MIPS_PRN (y/n)
 
 % i8042 controller support
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_I8042 (y/n)
-
-% i8042 controller support
-! [(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|(CONFIG_HID_IN=keyboard&PLATFORM=sparc64)|CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial] 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|CONFIG_HID_OUT=serial)&MACHINE=serengeti] CONFIG_SGCN (y/n)
-
-% PC keyboard support
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
-
-% PC keyboard support
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&MACHINE=i460GX] CONFIG_PC_KBD (y/n)
-
-% Sun keyboard support
-! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64] CONFIG_SUN_KBD (y/n)
+! [CONFIG_PC_KBD=y] CONFIG_I8042 (y)
+
+% Dummy serial line input
+! [CONFIG_MIPS_KBD=y] CONFIG_DSRLNIN (y)
+
+% Dummy serial line output
+! [CONFIG_MIPS_PRN=y] CONFIG_DSRLNOUT (y)
 
 % Serial line input module
-! [CONFIG_HID_IN=generic|CONFIG_HID_IN=serial] CONFIG_SRLN (y/n)
+! [CONFIG_DSRLNIN=y] CONFIG_SRLN (y)
+
+#% i8042 controller support
+#! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&MACHINE=i460GX] CONFIG_I8042 (y/n)
+
+#% Support for NS16550 controller
+#! [(CONFIG_HID_IN=keyboard&PLATFORM=sparc64)|(CONFIG_HID_IN=serial&PLATFORM=ia64)] 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|CONFIG_HID_OUT=serial)&MACHINE=serengeti] CONFIG_SGCN (y/n)
+
+#% PC keyboard support
+#! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&MACHINE=i460GX] CONFIG_PC_KBD (y/n)
+
+#% Sun keyboard support
+#! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64] CONFIG_SUN_KBD (y/n)
 
 % EGA support
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_EGA (y/n)
-
-% EGA support
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&MACHINE=i460GX] CONFIG_EGA (y/n)
+! [CONFIG_HID_OUT=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_EGA (y/n)
+
+#% EGA support
+#! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&MACHINE=i460GX] CONFIG_EGA (y/n)
 
 % Framebuffer support
-! [CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor] CONFIG_FB (y/n)
+! [CONFIG_HID_OUT=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_FB (y/n)
+
+% Framebuffer support
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FB (y/n)
+
+% Framebuffer support
+! [CONFIG_HID_OUT=none] CONFIG_FB (n)
 
 % Framebuffer width
