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.

1 files changed, 20 insertions, 17 deletions

diff --git a/sys/arch/hp300/dev/grf_dv.c b/sys/arch/hp300/dev/grf_dv.c
index 80b80f40679..85b2bcfc0d9 100644
--- a/sys/arch/hp300/dev/grf_dv.c
+++ b/sys/arch/hp300/dev/grf_dv.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: grf_dv.c,v 1.5 1997/02/05 16:01:09 downsj Exp $	*/
-/*	$NetBSD: grf_dv.c,v 1.10 1997/01/30 09:18:45 thorpej Exp $	*/
+/*	$OpenBSD: grf_dv.c,v 1.6 1997/04/16 11:56:02 downsj Exp $	*/
+/*	$NetBSD: grf_dv.c,v 1.11 1997/03/31 07:34:14 scottr Exp $	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.
@@ -48,13 +48,13 @@
  * Graphics routines for the DaVinci, HP98730/98731 Graphics system.
  */
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/device.h>
 #include <sys/errno.h>
-#include <sys/proc.h>
 #include <sys/ioctl.h>
+#include <sys/proc.h>
 #include <sys/tty.h>
-#include <sys/systm.h>
-#include <sys/device.h>
 
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
@@ -85,6 +85,10 @@ void	dvbox_intio_attach __P((struct device *, struct device *, void *));
 int	dvbox_dio_match __P((struct device *, void *, void *));
 void	dvbox_dio_attach __P((struct device *, struct device *, void *));
 
+int	dvbox_console_scan __P((int, caddr_t, void *));
+void	dvboxcnprobe __P((struct consdev *cp));
+void	dvboxcninit __P((struct consdev *cp));
+
 struct cfattach dvbox_intio_ca = {
 	sizeof(struct grfdev_softc), dvbox_intio_match, dvbox_intio_attach
 };
@@ -211,10 +215,9 @@ dv_init(gp, scode, addr)
 	int scode;
 	caddr_t addr;
 {
-	register struct dvboxfb *dbp;
+	struct dvboxfb *dbp;
 	struct grfinfo *gi = &gp->g_display;
 	int fboff;
-	extern caddr_t iomap();
 
 	/*
 	 * If the console has been initialized, and it was us, there's
@@ -237,7 +240,7 @@ dv_init(gp, scode, addr)
 			 * For DIO II space the fbaddr just computed is
 			 * the offset from the select code base (regaddr)
 			 * of the framebuffer.  Hence it is also implicitly
-			 * the size of the register set.
+			 * the size of the set.
 			 */
 			gi->gd_regsize = (int) gi->gd_fbaddr;
 			gi->gd_fbaddr += (int) gi->gd_regaddr;
@@ -323,7 +326,7 @@ dv_mode(gp, cmd, data)
 	int cmd;
 	caddr_t data;
 {
-	register struct dvboxfb *dbp;
+	struct dvboxfb *dbp;
 	int error = 0;
 
 	dbp = (struct dvboxfb *) gp->g_regkva;
@@ -412,7 +415,7 @@ dv_mode(gp, cmd, data)
 
 void
 dvbox_init(ip)
-	register struct ite_data *ip;
+	struct ite_data *ip;
 {
 	int i;
 	
@@ -509,7 +512,7 @@ dvbox_init(ip)
 
 void
 dvbox_deinit(ip)
-	register struct ite_data *ip;
+	struct ite_data *ip;
 {
 	dvbox_windowmove(ip, 0, 0, 0, 0, ip->fbheight, ip->fbwidth, RR_CLEAR);
 	db_waitbusy(ip->regbase);
@@ -522,7 +525,7 @@ dvbox_putc(ip, c, dy, dx, mode)
 	struct ite_data *ip;
         int dy, dx, c, mode;
 {
-        register int wrr = ((mode == ATTR_INV) ? RR_COPYINVERTED : RR_COPY);
+        int wrr = ((mode == ATTR_INV) ? RR_COPYINVERTED : RR_COPY);
 	
 	dvbox_windowmove(ip, charY(ip, c), charX(ip, c),
 			 dy * ip->ftheight, dx * ip->ftwidth,
@@ -560,10 +563,10 @@ dvbox_scroll(ip, sy, sx, count, dir)
         struct ite_data *ip;
         int sy, count, dir, sx;
 {
-	register int dy;
-	register int dx = sx;
-	register int height = 1;
-	register int width = ip->cols;
+	int dy;
+	int dx = sx;
+	int height = 1;
+	int width = ip->cols;
 
 	if (dir == SCROLL_UP) {
 		dy = sy - count;
@@ -595,7 +598,7 @@ dvbox_windowmove(ip, sy, sx, dy, dx, h, w, func)
 	struct ite_data *ip;
 	int sy, sx, dy, dx, h, w, func;
 {
-	register struct dvboxfb *dp = REGBASE;
+	struct dvboxfb *dp = REGBASE;
 	if (h == 0 || w == 0)
 		return;