Switch OpenBSD/hp300 to wscons, still using on-board ROM fonts for now.

Main features:
- MI hil drivers, allowing live plug/unplug of devices, and the keyboard
  does not need to be at id 1 anymore.
- SGC bus support on 4xx models. SGC frame buffers are supported too, but
  not as console, though you can use them as a regular glass terminal if
  you run a getty on ttyC0. Currently not compiled-in, awaiting for an sti(4)
  fix to be commited.
- HP-UX compatibility interfaces are removed. grfinfo and hilinfo are removed.

X11 support is currently broken by these changes; X.org X11R6 support will
be available very soon.

Tested on hyperion and 4 different flavours of catseye/topcat/kathmandu; other,
older frame buffers (davinci, gatorbox and renaissance) could not been tested
but should work; please report any regression.

4 files changed, 165 insertions, 141 deletions

diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS
index 3265a9993df..98d71469011 100644
--- a/sys/arch/hp300/conf/DISKLESS
+++ b/sys/arch/hp300/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$OpenBSD: DISKLESS,v 1.24 2004/09/16 09:14:03 mickey Exp $
+#	$OpenBSD: DISKLESS,v 1.25 2005/01/14 22:39:23 miod Exp $
 #	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
 #
 # Generic kernel - one size fits all.
@@ -10,15 +10,15 @@ machine hp300 m68k
 include "../../../conf/GENERIC"
 
 # Support for various CPU types
-option	 	HP320
-option	 	HP330		# includes 318, 319
-option	 	HP340
+option		HP320
+option		HP330		# includes 318, 319
+option		HP340
 option		HP345
-option	 	HP350
-option	 	HP360
-option	 	HP370
-option	 	HP375
-option	 	HP380
+option		HP350
+option		HP360
+option		HP370
+option		HP375
+option		HP380
 option		HP385
 option		HP400
 option		HP425
@@ -28,23 +28,16 @@ option		HP433
 maxusers	16
 
 # Options for HP hardware
-option	 	USELEDS		# make the lights twinkle
+option		USELEDS		# make the lights twinkle
 #option		CONSCODE="9"	# force console at this select code
-option	 	UK_KEYBOARD	# include United Kingdom HIL keymap
-option	 	SE_KEYBOARD	# include Swedish HIL keymap
 
-#
-# HP-UX binary compatibility.
-# NOTE: THIS IS STILL VERY EXPERIMENTAL.  YOUR MILEAGE MAY VARY.
-#
-option	 	COMPAT_HPUX	# HP-UX binary compatibility
-
-option	 	COMPAT_M68K4K	# compat. with NetBSD/m68k4k binaries
+option		COMPAT_HPUX	# HP-UX binary compatibility
+option		COMPAT_M68K4K	# compat. with NetBSD/m68k4k binaries
 option		COMPAT_SUNOS	# SunOS/sun3 binaries
 
 # Verbose descriptions of unconfigured DIO devices
 # (Warning: this compiles in a large string table)
-option	 	DIOVERBOSE	# recognize "unknown" DIO devices
+option		DIOVERBOSE	# recognize "unknown" DIO devices
 
 config		bsd swap generic
 
@@ -52,6 +45,15 @@ mainbus0	at root		# root "bus"
 
 intio0		at mainbus0	# internal i/o space
 dio0		at mainbus0	# DIO/DIO-II bus
+#sgc0		at mainbus0	# SGC bus on some 4xx models
+
+# Human Interface Loop devices
+hil0		at intio?	# HIL controller
+hilkbd*		at hil?		# keyboards
+wskbd*		at hilkbd? mux 1
+hilms*		at hil?		# mice, buttons and tablets
+wsmouse*	at hilms? mux 0
+hilid*		at hil?		# ID module
 
 # Frodo utility chip found on 4xx's
 frodo0		at intio?
@@ -63,35 +65,34 @@ apci*		at frodo?	# tty flavor
 # Davinci framebuffer
 dvbox*		at intio?
 dvbox*		at dio?
+wsdisplay*	at dvbox?
 
 # Gatorbox framebuffer
 gbox*		at intio?
 gbox*		at dio?
+wsdisplay*	at gbox?
 
 # Hyperion framebuffer
 hyper*		at dio?
+wsdisplay*	at hyper?
 
 # Renaissance framebuffer
 rbox*		at intio?
 rbox*		at dio?
+wsdisplay*	at rbox?
 
 # Topcat/catseye framebuffers
 topcat*		at intio?
 topcat*		at dio?
+wsdisplay*	at topcat?
 
-# Framebuffer abstraction
-grf*		at dvbox?
-grf*		at gbox?
-grf*		at hyper?
-grf*		at rbox?
-grf*		at topcat?
-
-# Internal Terminal Emulator
-ite*		at grf?
+# SGC framebuffers
+#sti*		at sgc?
+#wsdisplay*	at sti?
 
-dca0		at dio? scode 9	flags 1	  # DCA serial interfaces
+dca0		at dio? scode 9 flags 1	# DCA serial interfaces
 dca*		at dio?
 
-dcm*		at dio?	flags 0xe # DCM 4- or 8-port serial interfaces
+dcm*		at dio? flags 0xe	# DCM 4- or 8-port serial interfaces
 
-le*		at dio?		# LANCE ethernet interfaces
+le*		at dio?			# LANCE ethernet interfaces
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 3612e23443f..d6b74fd9af3 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.33 2004/09/16 09:14:03 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.34 2005/01/14 22:39:23 miod Exp $
 #	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
 #
 # Generic kernel - one size fits all.
@@ -10,41 +10,34 @@ machine hp300 m68k
 include "../../../conf/GENERIC"
 
 # Support for various CPU types
-option	 	HP320
-option	 	HP330		# includes 318, 319
-option	 	HP340
+option		HP320
+option		HP330		# includes 318, 319
+option		HP340
 option		HP345
-option	 	HP350
-option	 	HP360
-option	 	HP370
-option	 	HP375
-option	 	HP380
-option	 	HP385
-option	 	HP400
-option	 	HP425
-option	 	HP433
+option		HP350
+option		HP360
+option		HP370
+option		HP375
+option		HP380
+option		HP385
+option		HP400
+option		HP425
+option		HP433
 
 # Need to set locally
 maxusers	32
 
 # Options for HP hardware
-option	 	USELEDS		# make the lights twinkle
+option		USELEDS		# make the lights twinkle
 #option		CONSCODE="9"	# force console at this select code
-option	 	UK_KEYBOARD	# include United Kingdom HIL keymap
-option	 	SE_KEYBOARD	# include Swedish HIL keymap
 
-#
-# HP-UX binary compatibility.
-# NOTE: THIS IS STILL VERY EXPERIMENTAL.  YOUR MILEAGE MAY VARY.
-#
-option	 	COMPAT_HPUX	# HP-UX binary compatibility
-
-option	 	COMPAT_M68K4K	# compat. with NetBSD/m68k4k binaries
+option		COMPAT_HPUX	# HP-UX binary compatibility
+option		COMPAT_M68K4K	# compat. with NetBSD/m68k4k binaries
 option		COMPAT_SUNOS	# SunOS/sun3 binaries
 
 # Verbose descriptions of unconfigured DIO devices
 # (Warning: this compiles in a large string table)
-option	 	DIOVERBOSE	# recognize "unknown" DIO devices
+option		DIOVERBOSE	# recognize "unknown" DIO devices
 
 config		bsd swap generic
 
@@ -52,6 +45,15 @@ mainbus0	at root		# root "bus"
 
 intio0		at mainbus0	# internal i/o space
 dio0		at mainbus0	# DIO/DIO-II bus
+#sgc0		at mainbus0	# SGC bus on some 4xx models
+
+# Human Interface Loop devices
+hil0		at intio?	# HIL controller
+hilkbd*		at hil?		# keyboards
+wskbd*		at hilkbd? mux 1
+hilms*		at hil?		# mice, buttons and tablets
+wsmouse*	at hilms? mux 0
+hilid*		at hil?		# ID module
 
 # Frodo utility chip found on 4xx's
 frodo0		at intio?
@@ -63,36 +65,35 @@ apci*		at frodo?	# tty flavor
 # Davinci framebuffer
 dvbox*		at intio?
 dvbox*		at dio?
+wsdisplay*	at dvbox?
 
 # Gatorbox framebuffer
 gbox*		at intio?
 gbox*		at dio?
+wsdisplay*	at gbox?
 
 # Hyperion framebuffer
 hyper*		at dio?
+wsdisplay*	at hyper?
 
 # Renaissance framebuffer
 rbox*		at intio?
 rbox*		at dio?
+wsdisplay*	at rbox?
 
 # Topcat/catseye framebuffers
 topcat*		at intio?
 topcat*		at dio?
+wsdisplay*	at topcat?
 
-# Framebuffer abstraction
-grf*		at dvbox?
-grf*		at gbox?
-grf*		at hyper?
-grf*		at rbox?
-grf*		at topcat?
-
-# Internal Terminal Emulator
-ite*		at grf?
+# SGC framebuffers
+#sti*		at sgc?
+#wsdisplay*	at sti?
 
-dca0		at dio? scode 9	flags 1	# DCA serial interfaces
+dca0		at dio? scode 9 flags 1	# DCA serial interfaces
 dca*		at dio?
 
-dcm*		at dio? flags 0xe # DCM 4- or 8-port serial interfaces
+dcm*		at dio? flags 0xe	# DCM 4- or 8-port serial interfaces
 
 le*		at dio?			# LANCE ethernet interfaces
 
@@ -119,3 +120,5 @@ cd*		at scsibus?			# SCSI CD-ROMs
 ch*		at scsibus?			# SCSI changer devices
 ss*		at scsibus?			# SCSI scanners
 uk*		at scsibus?			# unknown SCSI devices
+
+pseudo-device	wsmux	2	# mouse and keyboard multiplexor
diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK
index fe70f074e83..aed467ba746 100644
--- a/sys/arch/hp300/conf/RAMDISK
+++ b/sys/arch/hp300/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.20 2004/09/16 09:14:03 mickey Exp $
+#	$OpenBSD: RAMDISK,v 1.21 2005/01/14 22:39:23 miod Exp $
 #
 # Ram disk kernel.
 #
@@ -6,19 +6,19 @@
 machine hp300 m68k
 
 # Support for various CPU types
-option	 	HP320
-option	 	HP330		# includes 318, 319
-option	 	HP340
+option		HP320
+option		HP330		# includes 318, 319
+option		HP340
 option		HP345
-option	 	HP350
-option	 	HP360
-option	 	HP370
-option	 	HP375
-option	 	HP380
+option		HP350
+option		HP360
+option		HP370
+option		HP375
+option		HP380
 option		HP385
-option	 	HP400
-option	 	HP425
-option	 	HP433
+option		HP400
+option		HP425
+option		HP433
 
 maxusers	32
 
@@ -41,14 +41,12 @@ option		INET		# IP + ICMP + TCP + UDP
 option		BOOT_CONFIG	# add support for boot -c
 
 # Options for HP hardware
-option	 	USELEDS		# make the lights twinkle
+option		USELEDS		# make the lights twinkle
 #option		CONSCODE="9"	# force console at this select code
-option	 	UK_KEYBOARD	# include United Kingdom HIL keymap
-option	 	SE_KEYBOARD	# include Swedish HIL keymap
 
 # Verbose descriptions of unconfigured DIO devices
 # (Warning: this compiles in a large string table)
-option	 	DIOVERBOSE	# recognize "unknown" DIO devices
+option		DIOVERBOSE	# recognize "unknown" DIO devices
 
 # Options for the ramdisk.
 option		MINIROOTSIZE=4096
@@ -60,6 +58,15 @@ mainbus0	at root		# root "bus"
 
 intio0		at mainbus0	# internal i/o space
 dio0		at mainbus0	# DIO/DIO-II bus
+#sgc0		at mainbus0	# SGC bus on some 4xx models
+
+# Human Interface Loop devices
+hil0		at intio?	# HIL controller
+hilkbd*		at hil?		# keyboards
+wskbd*		at hilkbd? mux 1
+#hilms*		at hil?		# mice, buttons and tablets
+#wsmouse*	at hilms? mux 0
+#hilid*		at hil?		# ID module
 
 # Frodo utility chip found on 4xx's
 frodo0		at intio?
@@ -71,31 +78,30 @@ apci*		at frodo?		# tty flavor
 # Davinci framebuffer
 dvbox*		at intio?
 dvbox*		at dio?
+wsdisplay*	at dvbox?
 
 # Gatorbox framebuffer
 gbox*		at intio?
 gbox*		at dio?
+wsdisplay*	at gbox?
 
 # Hyperion framebuffer
 hyper*		at dio?
+wsdisplay*	at hyper?
 
 # Renaissance framebuffer
 rbox*		at intio?
 rbox*		at dio?
+wsdisplay*	at rbox?
 
 # Topcat/catseye framebuffers
 topcat*		at intio?
 topcat*		at dio?
+wsdisplay*	at topcat?
 
-# Framebuffer abstraction
-grf*		at dvbox?
-grf*		at gbox?
-grf*		at hyper?
-grf*		at rbox?
-grf*		at topcat?
-
-# Internal Terminal Emulator
-ite*		at grf?
+# SGC framebuffers
+#sti*		at sgc?
+#wsdisplay*	at sti?
 
 dca0		at dio? scode 9	flags 1	# DCA serial interfaces
 dca*		at dio?
diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300
index fcf0af9ae68..c9bb0aa76ee 100644
--- a/sys/arch/hp300/conf/files.hp300
+++ b/sys/arch/hp300/conf/files.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hp300,v 1.24 2004/10/08 13:04:36 grange Exp $
+#	$OpenBSD: files.hp300,v 1.25 2005/01/14 22:39:23 miod Exp $
 #	$NetBSD: files.hp300,v 1.28 1997/05/12 08:23:28 thorpej Exp $
 #
 # hp300-specific configuration info
@@ -32,6 +32,14 @@ attach	dio at mainbus
 file	arch/hp300/dev/dio.c		dio
 
 #
+# SGC bus
+#
+
+device	sgc {[ slot = -1]}
+attach	sgc at mainbus
+file	arch/hp300/dev/sgc.c		sgc	needs-flag
+
+#
 # Devices in Internal i/o space
 #
 
@@ -40,68 +48,63 @@ device	frodo {[offset = -1]}
 attach	frodo at intio
 file	arch/hp300/dev/frodo.c		frodo
 
+# Apollo Keyboard and mouse
+device	dnkbd
+attach	dnkbd at frodo
+file	arch/hp300/dev/dnkbd.c		dnkbd	needs-flag
+
 # Apollo APCI 8250-like UARTs
 device	apci
 attach	apci at frodo
-file	arch/hp300/dev/apci.c		apci needs-flag
+file	arch/hp300/dev/apci.c		apci	needs-flag
 
-# Frame buffer attribute
-define	grfdev { }
+# "workstation console" routines
+include	"dev/wscons/files.wscons"
+file	arch/hp300/hp300/wscons_machdep.c	wsdisplay
 
+#
 # Frame buffer devices
-device	dvbox: grfdev
-file	arch/hp300/dev/grf_dv.c		dvbox needs-flag
-
-device	gbox: grfdev
-file	arch/hp300/dev/grf_gb.c		gbox needs-flag
-
-device	hyper: grfdev
-file	arch/hp300/dev/grf_hy.c		hyper needs-flag
-
-device	rbox: grfdev
-file	arch/hp300/dev/grf_rb.c		rbox needs-flag
+#
+define	diofb
+file	arch/hp300/dev/diofb.c		diofb
 
-device	topcat: grfdev
-file	arch/hp300/dev/grf_tc.c		topcat needs-flag
+device	dvbox: wsemuldisplaydev, diofb
+attach	dvbox at intio with dvbox_intio
+attach	dvbox at dio with dvbox_dio
+file	arch/hp300/dev/dvbox.c		dvbox	needs-flag
 
-# `grf' framebuffer abstraction
-device	grf { }
-attach	grf at grfdev
-file	arch/hp300/dev/grf.c		grf needs-flag
-file	arch/hp300/dev/grf_subr.c	grf
+device	gbox: wsemuldisplaydev, diofb
+attach	gbox at intio with gbox_intio
+attach	gbox at dio with gbox_dio
+file	arch/hp300/dev/gbox.c		gbox	needs-flag
 
-# Internal Terminal Emulator
-device	ite
-attach	ite at grf
-file	arch/hp300/dev/ite.c		ite needs-flag
-file	arch/hp300/dev/ite_subr.c	ite
+device	hyper: wsemuldisplaydev, diofb
+attach	hyper at dio with hyper_dio
+file	arch/hp300/dev/hyper.c		hyper	needs-flag
 
-# Internal i/o framebuffer attachments
-attach	dvbox at intio with dvbox_intio
-attach	gbox at intio with gbox_intio
+device	rbox: wsemuldisplaydev, diofb
 attach	rbox at intio with rbox_intio
+attach	rbox at dio with rbox_dio
+file	arch/hp300/dev/rbox.c		rbox	needs-flag
+
+device	topcat: wsemuldisplaydev, diofb
 attach	topcat at intio with topcat_intio
+attach	topcat at dio with topcat_dio
+file	arch/hp300/dev/topcat.c		topcat	needs-flag
 
 #
-# Devices on the DIO bus
+# Other devices on the DIO bus
 #
 
-# DIO framebuffer attachments
-attach	dvbox at dio with dvbox_dio
-attach	gbox at dio with gbox_dio
-attach	hyper at dio with hyper_dio
-attach	rbox at dio with rbox_dio
-attach	topcat at dio with topcat_dio
-
 # DCA serial interface
 device	dca: tty
 attach	dca at dio
-file	arch/hp300/dev/dca.c		dca needs-flag
+file	arch/hp300/dev/dca.c		dca	needs-flag
 
 # DCM serial interface
 device	dcm: tty
 attach	dcm at dio
-file	arch/hp300/dev/dcm.c		dcm needs-flag
+file	arch/hp300/dev/dcm.c		dcm	needs-flag
 
 # LANCE ethernet
 attach	le at dio
@@ -126,20 +129,20 @@ file	arch/hp300/dev/hpib.c		hpibbus
 # HP-IB devices
 device	ct: tape
 attach	ct at hpibbus
-file	arch/hp300/dev/ct.c		ct needs-flag
+file	arch/hp300/dev/ct.c		ct	needs-flag
 
 device	mt: tape
 attach	mt at hpibbus
-file	arch/hp300/dev/mt.c		mt needs-flag
+file	arch/hp300/dev/mt.c		mt	needs-flag
 
 device	hd: disk
 attach	hd at hpibbus
-file	arch/hp300/dev/hd.c		hd needs-flag
+file	arch/hp300/dev/hd.c		hd	needs-flag
 major	{hd = 2}
 
 device	ppi
 attach	ppi at hpibbus
-file	arch/hp300/dev/ppi.c		ppi needs-flag
+file	arch/hp300/dev/ppi.c		ppi	needs-flag
 
 # RAM disk
 major	{rd = 8}
@@ -155,19 +158,31 @@ file	arch/hp300/dev/mb89352.c	spc
 major	{sd = 4}
 major	{cd = 9}
 
-# Human (Hilarious) Interface Loop
-# XXX should be a real device
-file	arch/hp300/dev/hil.c
-file	arch/hp300/dev/hil_keymaps.c
+#
+# Devices on the SGC bus
+#
+
+attach	sti at sgc with sti_sgc
+file	arch/hp300/dev/sti_sgc.c	sti_sgc
+
+#
+# HIL Human Interface Loop devices
+#
+include	"dev/hil/files.hil"
+
+attach	hil at intio with hil_intio
+file	arch/hp300/dev/hil_intio.c	hil_intio
 
 #
 # Non-device files
 #
 
 file	arch/hp300/hp300/autoconf.c
+file	arch/hp300/hp300/bus_space.c
 file	arch/hp300/hp300/clock.c
 file	arch/hp300/hp300/conf.c
 file	arch/hp300/hp300/db_memrw.c		ddb | kgdb
+file	arch/hp300/hp300/disksubr.c
 file	arch/hp300/hp300/dkbad.c
 file	arch/hp300/hp300/kgdb_machdep.c		kgdb
 file	arch/hp300/hp300/machdep.c
@@ -179,7 +194,6 @@ file	arch/hp300/hp300/pmap_bootstrap.c
 file	arch/hp300/hp300/sys_machdep.c
 file	arch/hp300/hp300/trap.c
 file	arch/hp300/hp300/vm_machdep.c
-file	arch/hp300/hp300/disksubr.c
 file	arch/hp300/dev/dma.c
 
 file	dev/cninit.c