From c4230de699d71859db5b1469d9c4fc26e5ef49fc Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 14 Jan 2005 22:39:15 +0000
Subject: [PATCH] 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.
---
 src/etc/MAKEDEV.common       |  5 +---
 src/etc/Makefile             | 13 ++++-----
 src/etc/etc.hp300/MAKEDEV.md | 52 ++++++------------------------------
 src/etc/etc.hp300/fbtab      |  2 +-
 src/etc/etc.hp300/ttys       | 13 +++++----
 5 files changed, 23 insertions(+), 62 deletions(-)

diff --git a/src/etc/MAKEDEV.common b/src/etc/MAKEDEV.common
index cc3338b8..78dfc00a 100644
--- a/src/etc/MAKEDEV.common
+++ b/src/etc/MAKEDEV.common
@@ -1,4 +1,4 @@
-vers(a, {-$OpenBSD: MAKEDEV.common,v 1.13 2005/01/10 07:53:57 dlg Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.common,v 1.14 2005/01/14 22:39:11 miod Exp $-})dnl
 divert(1)dnl
 dnl
 dnl Common device definitions.
@@ -470,8 +470,6 @@ _mkdev(fdesc, fd, {-RMlist="mkdir -p fd;$RMlist" n=0
 	while [ $n -lt 64 ];do M fd/$n c major_fdesc_c $n;n=Add($n, 1);done
 	MKlist="$MKlist;chmod 555 fd"-})dnl
 __devitem(grf_mac, grf*, Raw interface to the mac68k graphics devices,grf)dnl
-__devitem(ite, ite*, Terminal emulator interface to HP300 graphics devices)dnl
-__devitem({-hil-}, {-hil-}, HP-HIL input devices)dnl
 __devitem(oppr, openprom,PROM settings,openprom)dnl
 _cdev(oppr, openprom, 70, 0)dnl
 __devitem(cry, crypto, Hardware crypto access driver,crypto)dnl
@@ -534,7 +532,6 @@ __devitem(bpp, bpp*, Parallel port)dnl
 _mkdev(bpp, {-bpp*-}, {-M bpp$U c major_bpp_c $U 600-}, 600)dnl
 __devitem(xfs, xfs*, XFS filesystem node, mount_xfs 8)dnl
 _mcdev(xfs, xfs*, xfs, {-major_xfs_c-}, 600)dnl
-__devitem(hil, hil, HP-HIL input devices)dnl
 __devitem(rmidi, rmidi*, Raw MIDI devices,midi)dnl
 _mcdev(rmidi, rmidi*, rmidi, {-major_rmidi_c-}, 666)dnl
 __devtitle(plat, Platform-specific devices)dnl
diff --git a/src/etc/Makefile b/src/etc/Makefile
index 340ff6ec..749293f4 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.213 2005/01/13 19:27:13 drahn Exp $
+#	$OpenBSD: Makefile,v 1.214 2005/01/14 22:39:12 miod Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -21,10 +21,11 @@ BIN1=	changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \
 	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf
 
 .if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "cats" || ${MACHINE} == "hppa" || \
-    ${MACHINE} == "i386" || ${MACHINE} == "luna88k" || \
-    ${MACHINE} == "macppc" || ${MACHINE} == "sparc" || \
-    ${MACHINE} == "sparc64" || ${MACHINE} == "zaurus"
+    ${MACHINE} == "cats" || ${MACHINE} == "hp300" || \
+    ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
+    ${MACHINE} == "luna88k" || ${MACHINE} == "macppc" || \
+    ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" || \
+    ${MACHINE} == "zaurus"
 BIN1+=	wsconsctl.conf
 .endif
 
@@ -374,7 +375,7 @@ distrib:
 DHSIZE=1024 1536 2048 3072 4096
 update-moduli:
 	( \
-		echo '#    $$OpenBSD: Makefile,v 1.213 2005/01/13 19:27:13 drahn Exp $$'; \
+		echo '#    $$OpenBSD: Makefile,v 1.214 2005/01/14 22:39:12 miod Exp $$'; \
 		echo '# Time Type Tests Tries Size Generator Modulus'; \
 		( for i in ${DHSIZE}; do \
 			ssh-keygen -b $$i -G /dev/stdout; \
diff --git a/src/etc/etc.hp300/MAKEDEV.md b/src/etc/etc.hp300/MAKEDEV.md
index cab4c45e..1a16a0a6 100644
--- a/src/etc/etc.hp300/MAKEDEV.md
+++ b/src/etc/etc.hp300/MAKEDEV.md
@@ -1,5 +1,5 @@
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.22 2004/08/03 21:46:46 miod Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.23 2005/01/14 22:39:15 miod Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>
@@ -41,7 +41,6 @@ _mkdev(ct, ct*|mt*,
 		echo bad unit for tape in: $1
 		;;
 	esac-})dnl
-__devitem(grf, grf*, Raw interface to HP300 graphics devices)dnl
 dnl
 dnl
 _TITLE(make)
@@ -71,14 +70,17 @@ _DEV(ptm, 52)
 _DEV(pty, 5)
 _DEV(tty, 4)
 _TITLE(cons)
-_DEV(grf, 10)
-_DEV(ite)
+_DEV(wscons)
+_DEV(wsdisp, 40)
+_DEV(wskbd, 41)
+_DEV(wsmux, 43)
+_TITLE(point)
+_DEV(wsmouse, 42)
 _TITLE(prn)
 _DEV(ppi, 11)
 _TITLE(spec)
 _DEV(bpf, 22)
 _DEV(fdesc, 21)
-_DEV(hil, 14)
 _DEV(lkm, 24)
 _DEV(pf, 33)
 _DEV(rnd, 32)
@@ -93,7 +95,7 @@ dnl
 ramdisk)
 	_recurse std ct0 ct1 st0 st1 hd0 hd1 hd2 hd3 hd4
 	_recurse sd0 sd1 sd2 sd3 sd4 cd0 cd1 rd0 pty0
-	_recurse hil grf0 apci0 ite0 dca0 dcm0 dcm1
+	_recurse apci0 dca0 dcm0 dcm1
 	_recurse bpf0 bpf1 tun0 tun1 lkm random
 	;;
 
@@ -160,37 +162,6 @@ ppi*)
 	esac
 	;;
 
-ite*)
-	case $U in
-	0|1|2|3)
-		M ttye$U c 13 $U 600
-		;;
-	*)
-		echo bad unit for ite in: $i
-		;;
-	esac
-	;;
-
-grf*)
-	case $U in
-	0|1|2|3)
-		M grf$U c major_grf_c $U 600
-		;;
-	*)
-		echo bad unit for grf in: $i
-		;;
-	esac
-	;;
-
-hil)
-	for U in 0 1 2 3 4 5 6 7
-	do
-		M hil$U c 14 $U 600
-	done
-	MKlist="$MKlist;ln hil1 keyboard"
-	MKlist="$MKlist;ln hil3 locator"
-	RMlist="$RMlist keyboard locator"
-	;;
 dnl
 target(all, ses, 0)dnl
 target(all, ch, 0)dnl
@@ -209,14 +180,10 @@ target(all, st, 0, 1)dnl
 target(all, uk, 0)dnl
 target(all, vnd, 0, 1, 2, 3)dnl
 target(all, ccd, 0, 1, 2, 3)dnl
-target( all, grf, 0)dnl
-dnl XXX target( all, hil, 0, 1, 2, 3, 4, 5, 6, 7)dnl
-target( all, hil, )dnl
 target( all, dca, 0, 1)dnl
 target( all, dcm, 0, 1, 2, 3)dnl
 target( all, hd, 0, 1, 2)dnl
 target( all, ct, 0, 1)dnl
-target( all, ite, 0)dnl
 target( all, ttye, 0, 1, 2, 3, 4, 5, 6)dnl
 target(ramd, cd, 0, 1)dnl
 target(ramd, ct, 0, 1)dnl
@@ -225,10 +192,7 @@ target(ramd, sd, 0, 1, 2)dnl
 target(ramd, st, 0, 1)dnl
 target(ramd, rd, 0, 1)dnl
 target(ramd, pty, 0)dnl
-target(ramd, hil, )dnl
-target(ramd, grf, 0)dnl
 target(ramd, apci, 0)dnl
-target(ramd, ite, 0)dnl
 target(ramd, dca, 0)dnl
 target(ramd, dcm, 0, 1)dnl
 target(ramd, bpf, 0, 1)dnl
diff --git a/src/etc/etc.hp300/fbtab b/src/etc/etc.hp300/fbtab
index 32fb4f35..d0c58313 100644
--- a/src/etc/etc.hp300/fbtab
+++ b/src/etc/etc.hp300/fbtab
@@ -1 +1 @@
-/dev/console	0600	/dev/grf0:/dev/hil0:/dev/hil1:/dev/hil2:/dev/hil3:/dev/hil4:/dev/hil5:/dev/hil6:/dev/hil7
+/dev/console	0600	/dev/ttyC0:/dev/wskbd:/dev/wskbd0:/dev/wsmouse:/dev/wsmouse0:/dev/ttyCcfg
diff --git a/src/etc/etc.hp300/ttys b/src/etc/etc.hp300/ttys
index 71c3d707..356f59b9 100644
--- a/src/etc/etc.hp300/ttys
+++ b/src/etc/etc.hp300/ttys
@@ -1,14 +1,13 @@
 #
-#	$OpenBSD: ttys,v 1.6 2002/06/09 06:15:14 todd Exp $
+#	$OpenBSD: ttys,v 1.7 2005/01/14 22:39:15 miod Exp $
 #
 # name	getty				type	status		comments
 #
-# If the console is marked insecure, single-user requires
-# the root password.
-console "/usr/libexec/getty Pc"		hp300h	on  secure
-
-# Hardwired lines are marked off, by default, so getty(8)
-# is quiet when they don't exist.
+# main console device
+console "/usr/libexec/getty std.9600"	vt220	on  secure
+# graphics console
+ttyC0	"/usr/libexec/getty std.9600"	vt220	off secure
+# serial lines
 tty00	"/usr/libexec/getty std.9600"	unknown off secure
 tty01	"/usr/libexec/getty std.9600"	unknown off secure
 tty02	"/usr/libexec/getty std.9600"	unknown off secure