Sync with changes from NetBSD, up to 970705.

This includes all of the new frodo drivers, from Michael Smith, hacked up
by Jason R. Thorpe; other changes, mostly configuration and/or m68k
abstraction related, from Thorpe.  A few others of my own.

This compiles and runs, have not yet tested Domain kbd or apci ports.

4 files changed, 89 insertions, 32 deletions

diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS
index 038ecd0d569..b2f28c67b1c 100644
--- a/sys/arch/hp300/conf/DISKLESS
+++ b/sys/arch/hp300/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$OpenBSD: DISKLESS,v 1.14 1997/02/24 01:16:06 downsj Exp $
+#	$OpenBSD: DISKLESS,v 1.15 1997/07/06 08:01:41 downsj Exp $
 #	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
 #
 # Generic kernel - one size fits all.
@@ -13,11 +13,15 @@ include "../../../conf/GENERIC"
 option	 	HP320
 option	 	HP330		# includes 318, 319
 option	 	HP340
+option		HP345
 option	 	HP350
 option	 	HP360
 option	 	HP370
-option	 	HP375		# includes 345, 400t, 400s
-option	 	HP380		# includes 425t, 425s, 433s
+option	 	HP375
+option	 	HP380
+option		HP400
+option		HP425
+option		HP433
 
 # Need to set locally
 maxusers	8
@@ -54,6 +58,13 @@ mainbus0	at root		# root "bus"
 intio0		at mainbus0	# internal i/o space
 dio0		at mainbus0	# DIO/DIO-II bus
 
+# Frodo utility chip found on 4xx's
+frodo0		at intio?
+
+# 8250-like serial ports found on Frodo ASIC
+#dnkbd0		at frodo? offset 0x0	# Domain keyboard flavor
+apci*		at frodo? offset ?	# tty flavor
+
 # Davinci framebuffer
 dvbox*		at intio?
 dvbox*		at dio? scode ?
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 197df929ca3..00472befa90 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.20 1997/04/17 08:21:54 downsj Exp $
+#	$OpenBSD: GENERIC,v 1.21 1997/07/06 08:01:42 downsj Exp $
 #	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
 #
 # Generic kernel - one size fits all.
@@ -13,11 +13,15 @@ include "../../../conf/GENERIC"
 option	 	HP320
 option	 	HP330		# includes 318, 319
 option	 	HP340
+option		HP345
 option	 	HP350
 option	 	HP360
 option	 	HP370
-option	 	HP375		# includes 345, 400t, 400s
-option	 	HP380		# includes 425t, 425s, 433s
+option	 	HP375
+option	 	HP380
+option	 	HP400
+option	 	HP425
+option	 	HP433
 
 # Need to set locally
 maxusers	32
@@ -54,6 +58,13 @@ mainbus0	at root		# root "bus"
 intio0		at mainbus0	# internal i/o space
 dio0		at mainbus0	# DIO/DIO-II bus
 
+# Frodo utility chip found on 4xx's
+frodo0		at intio?
+
+# 8250-like serial ports found on Frodo ASIC
+#dnkbd0		at frodo? offset 0x0	# Domain keyboard flavor
+apci*		at frodo? offset ?	# tty flavor
+
 # Davinci framebuffer
 dvbox*		at intio?
 dvbox*		at dio? scode ?
diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK
index 8636f12a9f8..27ec677bbb3 100644
--- a/sys/arch/hp300/conf/RAMDISK
+++ b/sys/arch/hp300/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.3 1997/04/17 08:21:55 downsj Exp $
+#	$OpenBSD: RAMDISK,v 1.4 1997/07/06 08:01:43 downsj Exp $
 #
 # Ram disk kernel.
 #
@@ -19,7 +19,7 @@ option	 	HP375		# includes 345, 400t, 400s
 option	 	HP380		# includes 425t, 425s, 433s
 
 # Need to set locally
-maxusers	16
+maxusers	8
 
 # Options for HP hardware
 option	 	FPSP		# floating point interface for 68040
diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300
index fc63b482565..1f6fe815e06 100644
--- a/sys/arch/hp300/conf/files.hp300
+++ b/sys/arch/hp300/conf/files.hp300
@@ -1,5 +1,5 @@
-#	$OpenBSD: files.hp300,v 1.9 1997/04/16 11:55:55 downsj Exp $
-#	$NetBSD: files.hp300,v 1.25 1997/04/14 02:28:53 thorpej Exp $
+#	$OpenBSD: files.hp300,v 1.10 1997/07/06 08:01:43 downsj Exp $
+#	$NetBSD: files.hp300,v 1.28 1997/05/12 08:23:28 thorpej Exp $
 #
 # hp300-specific configuration info
 
@@ -8,9 +8,63 @@ maxpartitions 16
 
 maxusers 2 8 64
 
+# SPU configuration options.
+defopt	HP320
+defopt	HP330
+defopt	HP340
+defopt	HP345
+defopt	HP350
+defopt	HP360
+defopt	HP370
+defopt	HP375
+defopt	HP380
+defopt	HP400
+defopt	HP425
+defopt	HP433
+
+# Misc. options.
+defopt	USELEDS		# make the lights twinkle
+
 # NOTE!  The order of these lines is significant!  Don't change them
 # unless you absolutely know what you're doing!
 
+#
+# Mainbus
+#
+
+device	mainbus { }
+attach	mainbus at root
+
+#
+# Internal i/o space
+#
+
+device	intio { }
+attach	intio at mainbus
+file	arch/hp300/dev/intio.c		intio
+
+#
+# DIO bus
+#
+
+device	dio { scode = -1 }
+attach	dio at mainbus
+file	arch/hp300/dev/dio.c		dio
+
+#
+# Devices in Internal i/o space
+#
+
+# Apollo Utilility Chip (a.k.a. "Frodo") found on 4xx workstations
+device	frodo { offset = -1 }
+attach	frodo at intio
+file	arch/hp300/dev/frodo.c		frodo
+
+# Apollo APCI 8250-like UARTs
+device	apci
+attach	apci at frodo
+file	arch/hp300/dev/apci.c		apci needs-flag
+
 # Frame buffer attribute
 define	grfdev { }
 
@@ -42,21 +96,6 @@ attach	ite at grf
 file	arch/hp300/dev/ite.c		ite needs-flag
 file	arch/hp300/dev/ite_subr.c	ite
 
-#
-# Mainbus
-#
-
-device	mainbus { }
-attach	mainbus at root
-
-#
-# Internal i/o space
-#
-
-device	intio { }
-attach	intio at mainbus
-file	arch/hp300/dev/intio.c		intio
-
 # Internal i/o framebuffer attachments
 attach	dvbox at intio with dvbox_intio
 attach	gbox at intio with gbox_intio
@@ -64,13 +103,9 @@ attach	rbox at intio with rbox_intio
 attach	topcat at intio with topcat_intio
 
 #
-# DIO bus
+# Devices on the DIO bus
 #
 
-device	dio { scode = -1 }
-attach	dio at mainbus
-file	arch/hp300/dev/dio.c		dio
-
 # DIO framebuffer attachments
 attach	dvbox at dio with dvbox_dio
 attach	gbox at dio with gbox_dio
@@ -167,10 +202,10 @@ 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/dkbad.c
-file	arch/hp300/hp300/kgdb_glue.c		kgdb compile-with "${NORMAL_C} -fno-defer-pop"
-file	arch/hp300/hp300/kgdb_stub.c		kgdb
+file	arch/hp300/hp300/kgdb_machdep.c		kgdb
 file	arch/hp300/hp300/machdep.c
 file	arch/hp300/hp300/intr.c
+file	arch/hp300/hp300/leds.c			useleds
 file	arch/hp300/hp300/mem.c
 file	arch/hp300/hp300/pmap.c
 file	arch/hp300/hp300/pmap_bootstrap.c