Compile kernel with -Wall, and fix a few issues for this to work.

ok hugh@

2 files changed, 12 insertions, 8 deletions

diff --git a/sys/arch/vax/vsa/dz_ibus.c b/sys/arch/vax/vsa/dz_ibus.c
index 510ce2c3a03..0be9c27a6d7 100644
--- a/sys/arch/vax/vsa/dz_ibus.c
+++ b/sys/arch/vax/vsa/dz_ibus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dz_ibus.c,v 1.5 2001/05/16 22:15:19 hugh Exp $	*/
+/*	$OpenBSD: dz_ibus.c,v 1.6 2001/06/15 22:45:34 miod Exp $	*/
 /*	$NetBSD: dz_ibus.c,v 1.15 1999/08/27 17:50:42 ragge Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
@@ -87,6 +87,8 @@ static volatile struct ss_dz {/* base address of DZ-controller: 0x200A0000 */
 cons_decl(dz);
 cdev_decl(dz);
 
+extern int getmajor __P((void *));	/* conf.c */
+
 #if NDZKBD > 0 || NDZMS > 0
 static int
 dz_print(void *aux, const char *name)
diff --git a/sys/arch/vax/vsa/smg.c b/sys/arch/vax/vsa/smg.c
index 2b1ea710842..29c534470a8 100644
--- a/sys/arch/vax/vsa/smg.c
+++ b/sys/arch/vax/vsa/smg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smg.c,v 1.3 2001/05/16 22:15:19 hugh Exp $	*/
+/*	$OpenBSD: smg.c,v 1.4 2001/06/15 22:45:34 miod Exp $	*/
 /*	$NetBSD: smg.c,v 1.21 2000/03/23 06:46:44 thorpej Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden.
@@ -198,6 +198,8 @@ struct	smg_screen {
 static	struct smg_screen smg_conscreen;
 static	struct smg_screen *curscr;
 
+extern int getmajor __P((void *));	/* conf.c */
+
 int
 smg_match(struct device *parent, struct cfdata *match, void *aux)
 {
@@ -427,14 +429,14 @@ setcursor(struct wsdisplay_cursor *v)
 	}
 	if (v->which & WSDISPLAY_CURSOR_DOCMAP) {
 		/* First background */
-		red = fusword(v->cmap.red);
-		green = fusword(v->cmap.green);
-		blue = fusword(v->cmap.blue);
+		red = fuswintr(v->cmap.red);
+		green = fuswintr(v->cmap.green);
+		blue = fuswintr(v->cmap.blue);
 		bgmask = (((30L * red + 59L * green + 11L * blue) >> 8) >=
 		    (((1<<8)-1)*50)) ? ~0 : 0;
-		red = fusword(v->cmap.red+2);
-		green = fusword(v->cmap.green+2);
-		blue = fusword(v->cmap.blue+2);
+		red = fuswintr(v->cmap.red+2);
+		green = fuswintr(v->cmap.green+2);
+		blue = fuswintr(v->cmap.blue+2);
 		fgmask = (((30L * red + 59L * green + 11L * blue) >> 8) >=
 		    (((1<<8)-1)*50)) ? ~0 : 0;
 	}