Merge portions of NetBSD up to 970415.

This includes:
	* All of the prototyping and KNF changes.
	* The new interrupt system.
	* Portions of the Domain Keyboard support from Mike Smith.

This does not include:
	* m68k changes, namely generic dumps.

Various sundry changes and fixes by me.

4 files changed, 12 insertions, 14 deletions

diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 59aeeecf069..4354907d615 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.18 1997/02/24 01:16:07 downsj Exp $
+#	$OpenBSD: GENERIC,v 1.19 1997/04/16 11:55:53 downsj Exp $
 #	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
 #
 # Generic kernel - one size fits all.
@@ -109,5 +109,3 @@ oscsi*		at dio? scode ?		# Old HP SCSI
 sd*		at oscsi? target ? lun ?	# SCSI disks
 st*		at oscsi? target ? lun ?	# SCSI tapes
 ac*		at oscsi? target ? lun ?	# SCSI changers
-
-pseudo-device	rd 2
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index 5cbc7821b6c..751541bbf91 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile.hp300,v 1.14 1997/03/29 05:18:05 downsj Exp $
-#	$NetBSD: Makefile.hp300,v 1.45 1996/12/01 06:12:30 jonathan Exp $
+#	$OpenBSD: Makefile.hp300,v 1.15 1997/04/16 11:55:54 downsj Exp $
+#	$NetBSD: Makefile.hp300,v 1.54 1997/04/01 23:16:41 scottr Exp $
 
 # Makefile for OpenBSD
 #
@@ -35,7 +35,7 @@ HP300=	../..
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=	${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL \
 		-Dmc68020 -Dhp300
-CWARNFLAGS=	-Werror
+CWARNFLAGS=	-Werror -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS=		${DEBUG} ${COPTS} ${CWARNFLAGS} -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-n -Ttext 0 -e start
diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK
index fffe9f43d21..cbb42d2ba03 100644
--- a/sys/arch/hp300/conf/RAMDISK
+++ b/sys/arch/hp300/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.1 1997/02/23 01:19:08 downsj Exp $
+#	$OpenBSD: RAMDISK,v 1.2 1997/04/16 11:55:54 downsj Exp $
 #
 # Ram disk kernel.
 #
@@ -45,6 +45,10 @@ option	 	SE_KEYBOARD	# include Swedish HIL keymap
 # (Warning: this compiles in a large string table)
 option	 	DIOVERBOSE	# recognize "unknown" DIO devices
 
+# Options for the ramdisk.
+option		MINIROOTSIZE=4096
+option		RAMDISK_HOOKS
+
 config		bsd root rd0 swap rd0
 
 mainbus0	at root		# root "bus"
@@ -107,7 +111,3 @@ oscsi*		at dio? scode ?		# Old HP SCSI
 sd*		at oscsi? target ? lun ?	# SCSI disks
 st*		at oscsi? target ? lun ?	# SCSI tapes
 ac*		at oscsi? target ? lun ?	# SCSI changers
-
-option		MINIROOTSIZE=4096
-option		RAMDISK_HOOKS
-pseudo-device	rd 2
diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300
index 391bb1dab8f..fc63b482565 100644
--- a/sys/arch/hp300/conf/files.hp300
+++ b/sys/arch/hp300/conf/files.hp300
@@ -1,5 +1,5 @@
-#	$OpenBSD: files.hp300,v 1.8 1997/03/26 08:32:38 downsj Exp $
-#	$NetBSD: files.hp300,v 1.23 1997/03/17 19:46:43 gwr Exp $
+#	$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 $
 #
 # hp300-specific configuration info
 
@@ -170,7 +170,7 @@ 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/machdep.c
-file	arch/hp300/hp300/isr.c
+file	arch/hp300/hp300/intr.c
 file	arch/hp300/hp300/mem.c
 file	arch/hp300/hp300/pmap.c
 file	arch/hp300/hp300/pmap_bootstrap.c