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, 21 insertions, 18 deletions

diff --git a/sys/arch/hp300/dev/grf_rb.c b/sys/arch/hp300/dev/grf_rb.c
index 68beb5b2dce..ff57dfb2091 100644
--- a/sys/arch/hp300/dev/grf_rb.c
+++ b/sys/arch/hp300/dev/grf_rb.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: grf_rb.c,v 1.5 1997/02/05 16:01:14 downsj Exp $	*/
-/*	$NetBSD: grf_rb.c,v 1.10 1997/01/30 09:18:48 thorpej Exp $	*/
+/*	$OpenBSD: grf_rb.c,v 1.6 1997/04/16 11:56:04 downsj Exp $	*/
+/*	$NetBSD: grf_rb.c,v 1.11 1997/03/31 07:34:17 scottr Exp $	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.
@@ -48,13 +48,13 @@
  * Graphics routines for the Renaissance, HP98720 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>
@@ -84,6 +84,10 @@ void	rbox_intio_attach __P((struct device *, struct device *, void *));
 int	rbox_dio_match __P((struct device *, void *, void *));
 void	rbox_dio_attach __P((struct device *, struct device *, void *));
 
+int	rbox_console_scan __P((int, caddr_t, void *));
+void	rboxcnprobe __P((struct consdev *cp));
+void	rboxcninit __P((struct consdev *cp));
+
 struct cfattach rbox_intio_ca = {
 	sizeof(struct grfdev_softc), rbox_intio_match, rbox_intio_attach
 };
@@ -210,10 +214,9 @@ rb_init(gp, scode, addr)
 	int scode;
 	caddr_t addr;
 {
-	register struct rboxfb *rbp;
+	struct rboxfb *rbp;
 	struct grfinfo *gi = &gp->g_display;
 	int fboff;
-	extern caddr_t iomap();
 
 	/*
 	 * If the console has been initialized, and it was us, there's
@@ -236,7 +239,7 @@ rb_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;
@@ -265,17 +268,17 @@ rb_init(gp, scode, addr)
  */
 int
 rb_mode(gp, cmd, data)
-	register struct grf_data *gp;
+	struct grf_data *gp;
 	int cmd;
 	caddr_t data;
 {
-	register struct rboxfb *rbp;
+	struct rboxfb *rbp;
 	int error = 0;
 
 	rbp = (struct rboxfb *) gp->g_regkva;
 	switch (cmd) {
 	/*
-	 * The minimal register info here is from the Renaissance X driver.
+	 * The minimal info here is from the Renaissance X driver.
 	 */
 	case GM_GRFON:
 	case GM_GRFOFF:
@@ -362,7 +365,7 @@ void
 rbox_init(ip)
 	struct ite_data *ip;
 {
-	register int i;
+	int i;
 
 	/* XXX */
 	if (ip->regbase == 0) {
@@ -469,7 +472,7 @@ rbox_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);
 	
 	rbox_windowmove(ip, charY(ip, c), charX(ip, c),
 			dy * ip->ftheight, dx * ip->ftwidth,
@@ -507,10 +510,10 @@ rbox_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;
@@ -542,7 +545,7 @@ rbox_windowmove(ip, sy, sx, dy, dx, h, w, func)
 	struct ite_data *ip;
 	int sy, sx, dy, dx, h, w, func;
 {
-	register struct rboxfb *rp = REGBASE;
+	struct rboxfb *rp = REGBASE;
 	if (h == 0 || w == 0)
 		return;