Get prototypes through cons_decl(), so that they are always right.

5 files changed, 20 insertions, 41 deletions

diff --git a/sys/arch/amd64/amd64/wscons_machdep.c b/sys/arch/amd64/amd64/wscons_machdep.c
index 47d05e7e942..7ab21166f10 100644
--- a/sys/arch/amd64/amd64/wscons_machdep.c
+++ b/sys/arch/amd64/amd64/wscons_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wscons_machdep.c,v 1.1 2004/01/28 01:39:39 mickey Exp $ */
+/*	$OpenBSD: wscons_machdep.c,v 1.2 2004/10/05 14:33:15 miod Exp $ */
 
 /*
  * Copyright (c) 2001 Aaron Campbell
@@ -80,11 +80,7 @@
 #include <dev/usb/ukbdvar.h>
 #endif
 
-void wscnprobe(struct consdev *);
-void wscninit(struct consdev *);
-void wscnputc(dev_t, char);
-int wscngetc(dev_t);
-void wscnpollc(dev_t, int);
+cons_decl(ws);
 
 void
 wscnprobe(cp)
@@ -148,9 +144,9 @@ dokbd:
 void
 wscnputc(dev, i)
 	dev_t dev;
-	char i;
+	int i;
 {
-	wsdisplay_cnputc(dev, (int)i);
+	wsdisplay_cnputc(dev, i);
 }
 
 int
diff --git a/sys/arch/i386/i386/wscons_machdep.c b/sys/arch/i386/i386/wscons_machdep.c
index 78f9cdc150d..b016193ea46 100644
--- a/sys/arch/i386/i386/wscons_machdep.c
+++ b/sys/arch/i386/i386/wscons_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wscons_machdep.c,v 1.10 2003/06/04 19:36:33 deraadt Exp $ */
+/*	$OpenBSD: wscons_machdep.c,v 1.11 2004/10/05 14:33:16 miod Exp $ */
 
 /*
  * Copyright (c) 2001 Aaron Campbell
@@ -75,11 +75,7 @@
 #include <dev/usb/ukbdvar.h>
 #endif
 
-void wscnprobe(struct consdev *);
-void wscninit(struct consdev *);
-void wscnputc(dev_t, char);
-int wscngetc(dev_t);
-void wscnpollc(dev_t, int);
+cons_decl(ws);
 
 void
 wscnprobe(cp)
@@ -143,9 +139,9 @@ dokbd:
 void
 wscnputc(dev, i)
 	dev_t dev;
-	char i;
+	int i;
 {
-	wsdisplay_cnputc(dev, (int)i);
+	wsdisplay_cnputc(dev, i);
 }
 
 int
diff --git a/sys/arch/macppc/macppc/wscons_machdep.c b/sys/arch/macppc/macppc/wscons_machdep.c
index 54e26ad33f7..7c51e2d0838 100644
--- a/sys/arch/macppc/macppc/wscons_machdep.c
+++ b/sys/arch/macppc/macppc/wscons_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wscons_machdep.c,v 1.4 2003/10/15 17:50:16 drahn Exp $ */
+/*	$OpenBSD: wscons_machdep.c,v 1.5 2004/10/05 14:33:16 miod Exp $ */
 
 /*
  * Copyright (c) 2001 Aaron Campbell
@@ -43,11 +43,7 @@
 #endif
 #include <dev/wscons/wskbdvar.h>
 
-void wscnprobe(struct consdev *);
-void wscninit(struct consdev *);
-void wscnputc(dev_t, char);
-int wscngetc(dev_t);
-void wscnpollc(dev_t, int);
+cons_decl(ws);
 
 void
 wscnprobe(struct consdev *cp)
@@ -76,9 +72,9 @@ wscninit(struct consdev *cp)
 }
 
 void
-wscnputc(dev_t dev, char i)
+wscnputc(dev_t dev, int i)
 {
-	wsdisplay_cnputc(dev, (int)i);
+	wsdisplay_cnputc(dev, i);
 }
 
 int
diff --git a/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c b/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c
index 25bea65dab3..d55fea10a6f 100644
--- a/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/wscons_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wscons_machdep.c,v 1.3 2003/06/04 19:36:33 deraadt Exp $ */
+/*	$OpenBSD: wscons_machdep.c,v 1.4 2004/10/05 14:33:17 miod Exp $ */
 
 /*
  * Copyright (c) 2001 Aaron Campbell
@@ -42,11 +42,7 @@
 #include <dev/wscons/wsdisplayvar.h>
 #endif
 
-void wscnprobe(struct consdev *);
-void wscninit(struct consdev *);
-void wscnputc(dev_t, char);
-int wscngetc(dev_t);
-void wscnpollc(dev_t, int);
+cons_decl(ws);
 
 void
 wscnprobe(cp)
@@ -79,9 +75,9 @@ wscninit(cp)
 void
 wscnputc(dev, i)
 	dev_t dev;
-	char i;
+	int i;
 {
-	wsdisplay_cnputc(dev, (int)i);
+	wsdisplay_cnputc(dev, i);
 }
 
 int
diff --git a/sys/arch/sgi/dev/wscons_machdep.c b/sys/arch/sgi/dev/wscons_machdep.c
index 25a181f9a67..102b2c50fbd 100644
--- a/sys/arch/sgi/dev/wscons_machdep.c
+++ b/sys/arch/sgi/dev/wscons_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wscons_machdep.c,v 1.1 2004/08/06 21:12:18 pefo Exp $ */
+/*	$OpenBSD: wscons_machdep.c,v 1.2 2004/10/05 14:33:17 miod Exp $ */
 
 /*
  * Copyright (c) 2001 Aaron Campbell
@@ -55,12 +55,7 @@
 #include <dev/wscons/wsconsio.h>
 #include <dev/usb/ukbdvar.h>
 
-void wscnprobe(struct consdev *);
-void wscninit(struct consdev *);
-void wscnputc(dev_t, char);
-int wscngetc(dev_t);
-void wscnpollc(dev_t, int);
-
+cons_decl(ws);
 
 void
 wscnprobe(cp)
@@ -105,9 +100,9 @@ static int initted;
 void
 wscnputc(dev, i)
 	dev_t dev;
-	char i;
+	int i;
 {
-	wsdisplay_cnputc(dev, (int)i);
+	wsdisplay_cnputc(dev, i);
 }
 
 int