Remove some static.

5 files changed, 72 insertions, 75 deletions

diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c
index a76c557be7f..30006863de2 100644
--- a/sys/dev/wscons/wsdisplay_compat_usl.c
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay_compat_usl.c,v 1.4 2001/02/10 19:42:06 mickey Exp $ */
+/* $OpenBSD: wsdisplay_compat_usl.c,v 1.5 2001/04/14 04:48:00 aaron Exp $ */
 /* $NetBSD: wsdisplay_compat_usl.c,v 1.12 2000/03/23 07:01:47 thorpej Exp $ */
 
 /*
@@ -63,20 +63,18 @@ struct usl_syncdata {
 	struct timeout s_detach_ch;
 };
 
-static int usl_sync_init __P((struct wsscreen *, struct usl_syncdata **,
-			      struct proc *, int, int, int));
-static void usl_sync_done __P((struct usl_syncdata *));
-static int usl_sync_check __P((struct usl_syncdata *));
-static struct usl_syncdata *usl_sync_get __P((struct wsscreen *));
-
-static int usl_detachproc __P((void *, int,
-			       void (*)(void *, int, int), void *));
-static int usl_detachack __P((struct usl_syncdata *, int));
-static void usl_detachtimeout __P((void *));
-static int usl_attachproc __P((void *, int,
-			       void (*)(void *, int, int), void *));
-static int usl_attachack __P((struct usl_syncdata *, int));
-static void usl_attachtimeout __P((void *));
+int usl_sync_init __P((struct wsscreen *, struct usl_syncdata **,
+		       struct proc *, int, int, int));
+void usl_sync_done __P((struct usl_syncdata *));
+int usl_sync_check __P((struct usl_syncdata *));
+struct usl_syncdata *usl_sync_get __P((struct wsscreen *));
+
+int usl_detachproc __P((void *, int, void (*)(void *, int, int), void *));
+int usl_detachack __P((struct usl_syncdata *, int));
+void usl_detachtimeout __P((void *));
+int usl_attachproc __P((void *, int, void (*)(void *, int, int), void *));
+int usl_attachack __P((struct usl_syncdata *, int));
+void usl_attachtimeout __P((void *));
 
 static const struct wscons_syncops usl_syncops = {
 	usl_detachproc,
@@ -92,7 +90,7 @@ static const struct wscons_syncops usl_syncops = {
 #endif
 static int wscompat_usl_synctimeout = WSCOMPAT_USL_SYNCTIMEOUT;
 
-static int
+int
 usl_sync_init(scr, sdp, p, acqsig, relsig, frsig)
 	struct wsscreen *scr;
 	struct usl_syncdata **sdp;
@@ -123,7 +121,7 @@ usl_sync_init(scr, sdp, p, acqsig, relsig, frsig)
 	return (0);
 }
 
-static void
+void
 usl_sync_done(sd)
 	struct usl_syncdata *sd;
 {
@@ -139,7 +137,7 @@ usl_sync_done(sd)
 	free(sd, M_DEVBUF);
 }
 
-static int
+int
 usl_sync_check(sd)
 	struct usl_syncdata *sd;
 {
@@ -150,7 +148,7 @@ usl_sync_check(sd)
 	return (0);
 }
 
-static struct usl_syncdata *
+struct usl_syncdata *
 usl_sync_get(scr)
 	struct wsscreen *scr;
 {
@@ -161,7 +159,7 @@ usl_sync_get(scr)
 	return (sd);
 }
 
-static int
+int
 usl_detachproc(cookie, waitok, callback, cbarg)
 	void *cookie;
 	int waitok;
@@ -191,7 +189,7 @@ usl_detachproc(cookie, waitok, callback, cbarg)
 	return (EAGAIN);
 }
 
-static int
+int
 usl_detachack(sd, ack)
 	struct usl_syncdata *sd;
 	int ack;
@@ -210,7 +208,7 @@ usl_detachack(sd, ack)
 	return (0);
 }
 
-static void
+void
 usl_detachtimeout(arg)
 	void *arg;
 {
@@ -231,7 +229,7 @@ usl_detachtimeout(arg)
 	(void) usl_sync_check(sd);
 }
 
-static int
+int
 usl_attachproc(cookie, waitok, callback, cbarg)
 	void *cookie;
 	int waitok;
@@ -256,7 +254,7 @@ usl_attachproc(cookie, waitok, callback, cbarg)
 	return (EAGAIN);
 }
 
-static int
+int
 usl_attachack(sd, ack)
 	struct usl_syncdata *sd;
 	int ack;
@@ -275,7 +273,7 @@ usl_attachack(sd, ack)
 	return (0);
 }
 
-static void
+void
 usl_attachtimeout(arg)
 	void *arg;
 {
diff --git a/sys/dev/wscons/wsemul_sun.c b/sys/dev/wscons/wsemul_sun.c
index 524bd5b8fe3..c851e625a70 100644
--- a/sys/dev/wscons/wsemul_sun.c
+++ b/sys/dev/wscons/wsemul_sun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_sun.c,v 1.2 2001/03/07 17:51:29 aaron Exp $ */
+/* $OpenBSD: wsemul_sun.c,v 1.3 2001/04/14 04:48:00 aaron Exp $ */
 /* $NetBSD: wsemul_sun.c,v 1.11 2000/01/05 11:19:36 drochner Exp $ */
 
 /*
@@ -95,13 +95,11 @@ struct wsemul_sun_emuldata {
 #endif
 };
 
-static u_int	wsemul_sun_output_normal __P((struct wsemul_sun_emuldata *,
-		    u_char, int));
-static u_int	wsemul_sun_output_haveesc __P((struct wsemul_sun_emuldata *,
-		    u_char));
-static u_int	wsemul_sun_output_control __P((struct wsemul_sun_emuldata *,
-		    u_char));
-static void	wsemul_sun_control __P((struct wsemul_sun_emuldata *, u_char));
+u_int wsemul_sun_output_normal __P((struct wsemul_sun_emuldata *, u_char,
+				    int));
+u_int wsemul_sun_output_haveesc __P((struct wsemul_sun_emuldata *, u_char));
+u_int wsemul_sun_output_control __P((struct wsemul_sun_emuldata *, u_char));
+void wsemul_sun_control __P((struct wsemul_sun_emuldata *, u_char));
 
 struct wsemul_sun_emuldata wsemul_sun_console_emuldata;
 
@@ -225,7 +223,7 @@ wsemul_sun_attach(console, type, cookie, ccol, crow, cbcookie, defattr)
 	return (edp);
 }
 
-static inline u_int
+inline u_int
 wsemul_sun_output_normal(edp, c, kernel)
 	struct wsemul_sun_emuldata *edp;
 	u_char c;
@@ -328,7 +326,7 @@ wsemul_sun_output_normal(edp, c, kernel)
 	return (newstate);
 }
 
-static inline u_int
+inline u_int
 wsemul_sun_output_haveesc(edp, c)
 	struct wsemul_sun_emuldata *edp;
 	u_char c;
@@ -351,7 +349,7 @@ wsemul_sun_output_haveesc(edp, c)
 	return (newstate);
 }
 
-static inline void
+inline void
 wsemul_sun_control(edp, c)
 	struct wsemul_sun_emuldata *edp;
 	u_char c;
@@ -475,7 +473,7 @@ setattr:
 	}
 }
 
-static inline u_int
+inline u_int
 wsemul_sun_output_control(edp, c)
 	struct wsemul_sun_emuldata *edp;
 	u_char c;
diff --git a/sys/dev/wscons/wsemul_vt100.c b/sys/dev/wscons/wsemul_vt100.c
index 77023084a2a..3ebff9cee96 100644
--- a/sys/dev/wscons/wsemul_vt100.c
+++ b/sys/dev/wscons/wsemul_vt100.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_vt100.c,v 1.5 2001/03/07 17:51:29 aaron Exp $ */
+/* $OpenBSD: wsemul_vt100.c,v 1.6 2001/04/14 04:48:01 aaron Exp $ */
 /* $NetBSD: wsemul_vt100.c,v 1.13 2000/04/28 21:56:16 mycroft Exp $ */
 
 /*
@@ -66,14 +66,14 @@ const struct wsemul_ops wsemul_vt100_ops = {
 
 struct wsemul_vt100_emuldata wsemul_vt100_console_emuldata;
 
-static void wsemul_vt100_init __P((struct wsemul_vt100_emuldata *,
-				   const struct wsscreen_descr *,
-				   void *, int, int, long));
+void wsemul_vt100_init __P((struct wsemul_vt100_emuldata *,
+			    const struct wsscreen_descr *, void *, int, int,
+			    long));
 
-static void wsemul_vt100_output_normal __P((struct wsemul_vt100_emuldata *,
-					    u_char, int));
-static void wsemul_vt100_output_c0c1 __P((struct wsemul_vt100_emuldata *,
-					  u_char, int));
+void wsemul_vt100_output_normal __P((struct wsemul_vt100_emuldata *, u_char,
+				     int));
+void wsemul_vt100_output_c0c1 __P((struct wsemul_vt100_emuldata *, u_char,
+				   int));
 typedef u_int vt100_handler __P((struct wsemul_vt100_emuldata *, u_char));
 static vt100_handler
 wsemul_vt100_output_esc,
@@ -118,7 +118,7 @@ vt100_handler *vt100_output[] = {
 	wsemul_vt100_output_dcs_dollar,
 };
 
-static void
+void
 wsemul_vt100_init(edp, type, cookie, ccol, crow, defattr)
 	struct wsemul_vt100_emuldata *edp;
 	const struct wsscreen_descr *type;
@@ -307,7 +307,7 @@ wsemul_vt100_reset(edp)
  * now all the state machine bits
  */
 
-static void
+void
 wsemul_vt100_output_normal(edp, c, kernel)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -351,7 +351,7 @@ wsemul_vt100_output_normal(edp, c, kernel)
 		edp->flags |= VTFL_LASTCHAR;
 }
 
-static void
+void
 wsemul_vt100_output_c0c1(edp, c, kernel)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -441,7 +441,7 @@ wsemul_vt100_output_c0c1(edp, c, kernel)
 	}
 }
 
-static u_int
+u_int
 wsemul_vt100_output_esc(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -574,7 +574,7 @@ wsemul_vt100_output_esc(edp, c)
 	return (newstate);
 }
 
-static u_int
+u_int
 wsemul_vt100_output_scs94(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -610,7 +610,7 @@ wsemul_vt100_output_scs94(edp, c)
 	return (newstate);
 }
 
-static u_int
+u_int
 wsemul_vt100_output_scs94_percent(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -629,7 +629,7 @@ wsemul_vt100_output_scs94_percent(edp, c)
 	return (VT100_EMUL_STATE_NORMAL);
 }
 
-static u_int
+u_int
 wsemul_vt100_output_scs96(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -685,7 +685,7 @@ setnrc:
 	return (newstate);
 }
 
-static u_int
+u_int
 wsemul_vt100_output_scs96_percent(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -703,7 +703,7 @@ wsemul_vt100_output_scs96_percent(edp, c)
 	return (VT100_EMUL_STATE_NORMAL);
 }
 
-static u_int
+u_int
 wsemul_vt100_output_esc_spc(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -724,7 +724,7 @@ wsemul_vt100_output_esc_spc(edp, c)
 	return (VT100_EMUL_STATE_NORMAL);
 }
 
-static u_int
+u_int
 wsemul_vt100_output_string(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -734,7 +734,7 @@ wsemul_vt100_output_string(edp, c)
 	return (VT100_EMUL_STATE_STRING);
 }
 
-static u_int
+u_int
 wsemul_vt100_output_string_esc(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -746,7 +746,7 @@ wsemul_vt100_output_string_esc(edp, c)
 		return (VT100_EMUL_STATE_STRING);
 }
 
-static u_int
+u_int
 wsemul_vt100_output_dcs(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -797,7 +797,7 @@ wsemul_vt100_output_dcs(edp, c)
 	return (newstate);
 }
 
-static u_int
+u_int
 wsemul_vt100_output_dcs_dollar(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -838,7 +838,7 @@ wsemul_vt100_output_dcs_dollar(edp, c)
 	return (VT100_EMUL_STATE_STRING);
 }
 
-static u_int
+u_int
 wsemul_vt100_output_esc_hash(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
@@ -897,7 +897,7 @@ wsemul_vt100_output_esc_hash(edp, c)
 	return (VT100_EMUL_STATE_NORMAL);
 }
 
-static u_int
+u_int
 wsemul_vt100_output_csi(edp, c)
 	struct wsemul_vt100_emuldata *edp;
 	u_char c;
diff --git a/sys/dev/wscons/wsemul_vt100_subr.c b/sys/dev/wscons/wsemul_vt100_subr.c
index 1cd76b97820..d96bfe77f88 100644
--- a/sys/dev/wscons/wsemul_vt100_subr.c
+++ b/sys/dev/wscons/wsemul_vt100_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_vt100_subr.c,v 1.5 2001/03/14 02:49:23 mickey Exp $ */
+/* $OpenBSD: wsemul_vt100_subr.c,v 1.6 2001/04/14 04:48:01 aaron Exp $ */
 /* $NetBSD: wsemul_vt100_subr.c,v 1.7 2000/04/28 21:56:16 mycroft Exp $ */
 
 /*
@@ -42,10 +42,10 @@
 #include <dev/wscons/wsemulvar.h>
 #include <dev/wscons/wsemul_vt100var.h>
 
-static int vt100_selectattribute __P((struct wsemul_vt100_emuldata *,
-				      int, int, int, long *, long *));
-static int vt100_ansimode __P((struct wsemul_vt100_emuldata *, int, int));
-static int vt100_decmode __P((struct wsemul_vt100_emuldata *, int, int));
+int vt100_selectattribute __P((struct wsemul_vt100_emuldata *, int, int, int,
+			       long *, long *));
+int vt100_ansimode __P((struct wsemul_vt100_emuldata *, int, int));
+int vt100_decmode __P((struct wsemul_vt100_emuldata *, int, int));
 #define VTMODE_SET 33
 #define VTMODE_RESET 44
 #define VTMODE_REPORT 55
@@ -628,7 +628,7 @@ wsemul_vt100_handle_csi(edp, c)
  * try to find replacements if the desired appearance
  * is not supported
  */
-static int
+int
 vt100_selectattribute(edp, flags, fgcol, bgcol, attr, bkgdattr)
 	struct wsemul_vt100_emuldata *edp;
 	int flags, fgcol, bgcol;
@@ -748,7 +748,7 @@ wsemul_vt100_handle_dcs(edp)
 	edp->dcstype = 0;
 }
 
-static int
+int
 vt100_ansimode(edp, nr, op)
 	struct wsemul_vt100_emuldata *edp;
 	int nr, op;
@@ -784,7 +784,7 @@ vt100_ansimode(edp, nr, op)
 	return (res);
 }
 
-static int
+int
 vt100_decmode(edp, nr, op)
 	struct wsemul_vt100_emuldata *edp;
 	int nr, op;
diff --git a/sys/dev/wscons/wskbdutil.c b/sys/dev/wscons/wskbdutil.c
index 882441926d8..c278689d3c3 100644
--- a/sys/dev/wscons/wskbdutil.c
+++ b/sys/dev/wscons/wskbdutil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wskbdutil.c,v 1.1 2000/05/16 23:49:12 mickey Exp $	*/
+/*	$OpenBSD: wskbdutil.c,v 1.2 2001/04/14 04:48:01 aaron Exp $	*/
 /*	$NetBSD: wskbdutil.c,v 1.7 1999/12/21 11:59:13 drochner Exp $	*/
 
 /*-
@@ -183,11 +183,12 @@ static struct compose_tab_s {
 
 static int compose_tab_inorder = 0;
 
-static inline int compose_tab_cmp __P((struct compose_tab_s *, struct compose_tab_s *));
-static keysym_t ksym_upcase __P((keysym_t));
-static void fillmapentry __P((const keysym_t *, int, struct wscons_keymap *));
+inline int compose_tab_cmp __P((struct compose_tab_s *,
+				struct compose_tab_s *));
+keysym_t ksym_upcase __P((keysym_t));
+void fillmapentry __P((const keysym_t *, int, struct wscons_keymap *));
 
-static inline int
+inline int
 compose_tab_cmp(i, j)
 	struct compose_tab_s *i, *j;
 {
@@ -268,7 +269,7 @@ static const u_char latin1_to_upper[256] = {
 	0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0x00,		/* f */
 };
 
-static keysym_t
+keysym_t
 ksym_upcase(ksym)
 	keysym_t ksym;
 {
@@ -282,7 +283,7 @@ ksym_upcase(ksym)
 	return(ksym);
 }
 
-static void
+void
 fillmapentry(kp, len, mapentry)
 	const keysym_t *kp;
 	int len;