The first stage of console driver reorganization: activate new

keyboard and video card drivers.

Because of the changes, you are required to update your kernel
configuration file now!

The files in sys/dev/syscons are still i386-specific (but less so than
before), and won't compile for alpha and PC98 yet.

syscons still directly accesses the video card registers here and
there; this will be rectified in the later stages.

3 files changed, 59 insertions, 28 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 7e93763..80171ee 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.529 1999/01/09 18:12:07 wpaul Exp $
+#	$Id: LINT,v 1.531 1999/01/10 07:45:33 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -842,15 +842,35 @@ options		"NTIMECOUNTER=20"
 # configure cards from USERCONFIG.  See pnp(4) for more info.
 controller	pnp0
 
+# The keyboard controller; it controlls the keyboard and the PS/2 mouse.
+controller	atkbdc0	at isa? port IO_KBD tty
+
+# The AT keyboard
+device		atkbd0	at isa? tty irq 1
+
+# PS/2 mouse
+device		psm0	at isa? tty irq 12
+
+# Options for psm:
+options		PSM_HOOKAPM		#hook the APM resume event, useful
+					#for some laptops
+options		PSM_RESETAFTERSUSPEND	#reset the device at the resume event
+
+# The video card driver.
+device		vga0	at isa? port ? conflicts
+
+# Splash screen at start up!  Screen savers require this too.
+pseudo-device	splash
+
 # The pcvt console driver (vt220 compatible).
-device		vt0	at isa? port IO_KBD conflicts tty irq 1
+device		vt0	at isa? tty
 options		XSERVER			# support for running an X server.
 options		FAT_CURSOR		# start with block cursor
 # This PCVT option is for keyboards such as those used on IBM ThinkPad laptops
 options		PCVT_SCANSET=2 		# IBM keyboards are non-std
 
 # The syscons console driver (sco color console compatible).
-device		sc0	at isa? port IO_KBD conflicts tty irq 1
+device		sc0	at isa? tty
 options		MAXCONS=16		# number of virtual consoles
 options		SLOW_VGA		# do byte-wide i/o's to TS and GDC regs
 options		"STD8X16FONT"		# Compile font in
@@ -1050,7 +1070,7 @@ disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
 
 #
-# Other standard PC hardware: `lpt', `mse', `psm', `sio', etc.
+# Other standard PC hardware: `lpt', `mse', `sio', etc.
 #
 # lpt: printer port
 #	lpt specials:
@@ -1059,18 +1079,11 @@ disk		fd1	at fdc0 drive 1
 #		The irq clause may be omitted.  This will force the port
 #		into polling mode.
 # mse: Logitech and ATI InPort bus mouse ports
-# psm: PS/2 mouse port [note: conflicts with sc0/vt0, thus "conflicts" keywd]
 # sio: serial ports (see sio(4))
 
 device		lpt0	at isa? port? tty irq 7
 device		lpt1	at isa? port "IO_LPT3" tty irq 5
 device		mse0	at isa? port 0x23c tty irq 5
-device		psm0	at isa? port IO_KBD conflicts tty irq 12
-
-# Options for psm:
-options		PSM_HOOKAPM		#hook the APM resume event, useful
-					#for some laptops
-options		PSM_RESETAFTERSUSPEND	#reset the device at the resume event
 
 device		sio0	at isa? port "IO_COM1" tty flags 0x10 irq 4
 
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index f955863..9aa97d4 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.216 1998/12/31 08:17:08 luigi Exp $
+#	$Id: files.i386,v 1.217 1999/01/01 08:09:58 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -24,6 +24,17 @@ font8x16.o			optional	std8x16font		\
 	no-implicit-rule before-depend \
 	clean		"${STD8X16FONT}-8x16 font8x16.c" 
 #
+dev/fb/fb.c			optional	fb	device-driver
+dev/fb/fb.c			optional	vga	device-driver
+dev/fb/splash.c			optional	splash
+dev/kbd/atkbd.c			optional	atkbd	device-driver
+dev/kbd/atkbdc.c		optional	atkbdc	device-driver
+dev/kbd/kbd.c			optional	atkbd	device-driver
+dev/kbd/kbd.c			optional	kbd	device-driver
+#dev/kbd/kbd.c			optional	ukbd	device-driver
+dev/syscons/syscons.c		optional	sc	device-driver
+dev/syscons/scvidctl.c		optional	sc	device-driver
+dev/syscons/scvesactl.c		optional	sc	device-driver
 i386/apm/apm.c			optional	apm	device-driver
 i386/apm/apm_setup.s		optional	apm
 i386/eisa/dpt_eisa.c		optional	eisa dpt device-driver
@@ -98,6 +109,8 @@ i386/isa/aha_isa.c		optional	aha	device-driver
 #i386/isa/aic6360.c              optional        aic     device-driver
 i386/isa/aic_isa.c              optional        aic     device-driver
 i386/isa/alog.c                 optional        alog    device-driver
+i386/isa/atkbd_isa.c		optional	atkbd	device-driver
+i386/isa/atkbdc_isa.c		optional	atkbdc	device-driver
 i386/isa/bt_isa.c		optional	bt	device-driver
 i386/isa/clock.c		standard
 i386/isa/cronyx.c		optional	cx	device-driver
@@ -133,9 +146,6 @@ i386/isa/intr_machdep.c		standard
 i386/isa/isa.c			optional	isa	device-driver
 i386/isa/istallion.c		optional	stli	device-driver
 i386/isa/joy.c			optional        joy     device-driver
-i386/isa/kbdio.c		optional        psm     device-driver
-i386/isa/kbdio.c		optional        sc      device-driver
-i386/isa/kbdio.c		optional        vt      device-driver
 i386/isa/loran.c		optional	loran	device-driver
 i386/isa/lpt.c			optional	lpt	device-driver
 i386/isa/labpc.c		optional	labpc	device-driver
@@ -235,11 +245,8 @@ i386/isa/sound/cs4232.c		optional	css	device-driver
 i386/isa/spigot.c		optional	spigot	device-driver
 i386/isa/spkr.c			optional	speaker	device-driver
 i386/isa/stallion.c		optional	stl	device-driver
-i386/isa/syscons.c		optional	sc	device-driver
-i386/isa/scvidctl.c		optional	sc	device-driver
-i386/isa/scvesactl.c		optional	sc	device-driver
-i386/isa/videoio.c		optional	sc	device-driver
-i386/isa/vesa.c			optional	sc	device-driver
+i386/isa/vesa.c			optional	vga	device-driver
+i386/isa/vga_isa.c		optional	vga	device-driver
 i386/isa/tw.c			optional	tw	device-driver
 i386/isa/wd.c			optional	wdc	device-driver
 i386/isa/wd.c			optional	wd	device-driver
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 1b844a6..2704d56 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.101 1999/01/01 08:09:58 peter Exp $
+#	$Id: options.i386,v 1.102 1999/01/10 17:41:33 nsouch Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -66,16 +66,26 @@ I486_CPU		opt_global.h
 I586_CPU		opt_global.h
 I686_CPU		opt_global.h
 
-SC_SPLASH_SCREEN	opt_syscons.h
 MAXCONS			opt_syscons.h
-SLOW_VGA		opt_syscons.h
+# obsolete, use VGA_SLOW_IOACCESS
+#SLOW_VGA		opt_syscons.h
 STD8X16FONT		opt_syscons.h
 SC_HISTORY_SIZE		opt_syscons.h
 SC_DISABLE_REBOOT	opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
-SC_ALT_SEQACCESS	opt_syscons.h
+# obsolete, use VGA_ALT_SEQACCESS
+#SC_ALT_SEQACCESS	opt_syscons.h
+
+FB_INSTALL_CDEV		opt_fb.h
+
+VGA_ALT_SEQACCESS	opt_vga.h
+VGA_DEBUG		opt_vga.h
+VGA_NO_FONT_LOADING	opt_vga.h
+VGA_NO_MODE_CHANGE	opt_vga.h
+VGA_SLOW_IOACCESS	opt_vga.h
 
 VESA			opt_vesa.h
+VESA_DEBUG		opt_vesa.h
 
 PSM_HOOKAPM		opt_psm.h
 PSM_RESETAFTERSUSPEND	opt_psm.h
@@ -83,10 +93,11 @@ PSM_DEBUG		opt_psm.h
 
 PCIC_RESUME_RESET	opt_pcic.h
 
-KBD_RESETDELAY		opt_kbdio.h
-KBD_MAXRETRY		opt_kbdio.h
-KBD_MAXWAIT		opt_kbdio.h
-KBDIO_DEBUG		opt_kbdio.h
+KBD_INSTALL_CDEV	opt_kbd.h
+KBD_MAXRETRY		opt_kbd.h
+KBD_MAXWAIT		opt_kbd.h
+KBD_RESETDELAY		opt_kbd.h
+KBDIO_DEBUG		opt_kbd.h
 
 ATAPI			opt_atapi.h
 ATAPI_STATIC		opt_atapi.h