Staticize.

5 files changed, 59 insertions, 51 deletions

diff --git a/sys/gnu/i386/fpemul/fpu_proto.h b/sys/gnu/i386/fpemul/fpu_proto.h
index a6e9c02..c44a026 100644
--- a/sys/gnu/i386/fpemul/fpu_proto.h
+++ b/sys/gnu/i386/fpemul/fpu_proto.h
@@ -1,6 +1,6 @@
 /*
  *
- *    $Id: fpu_proto.h,v 1.3 1995/03/16 18:11:11 bde Exp $
+ *    $Id: fpu_proto.h,v 1.4 1995/12/14 09:50:23 phk Exp $
  *
  */
 
@@ -58,7 +58,6 @@ extern int math_emulate(struct trapframe * info);
 /* fpu_etc.c */
 extern void fp_etc(void);
 /* fpu_trig.c */
-extern void convert_l2reg(long *arg, FPU_REG * dest);
 extern void trig_a(void);
 extern void trig_b(void);
 /* get_address.c */
diff --git a/sys/gnu/i386/fpemul/fpu_trig.c b/sys/gnu/i386/fpemul/fpu_trig.c
index ca32f91..4dc8101 100644
--- a/sys/gnu/i386/fpemul/fpu_trig.c
+++ b/sys/gnu/i386/fpemul/fpu_trig.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_trig.c,v 1.3 1994/04/29 21:16:25 gclarkii Exp $
+ *    $Id: fpu_trig.c,v 1.4 1994/06/10 07:44:27 rich Exp $
  *
  */
 
@@ -73,6 +73,8 @@
 #include "reg_constant.h"
 #include "control_w.h"
 
+static void convert_l2reg(long *arg, FPU_REG * dest);
+
 static int
 trig_arg(FPU_REG * X)
 {
@@ -104,7 +106,7 @@ trig_arg(FPU_REG * X)
 
 
 /* Convert a long to register */
-void
+static void
 convert_l2reg(long *arg, FPU_REG * dest)
 {
 	long    num = *arg;
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 6dd2a25..e96cbc7 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.12 1995/12/10 15:54:01 bde Exp $
+ *  dgb.c $Id: dgb.c,v 1.13 1995/12/10 20:54:21 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -37,6 +37,7 @@
 #include <sys/file.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/devconf.h>
@@ -157,9 +158,9 @@ struct dgb_softc {
 	};
 	
 
-struct dgb_softc dgb_softc[NDGB];
-struct dgb_p dgb_ports[NDGBPORTS];
-struct tty dgb_tty[NDGBPORTS];
+static struct dgb_softc dgb_softc[NDGB];
+static struct dgb_p dgb_ports[NDGBPORTS];
+static struct tty dgb_tty[NDGBPORTS];
 
 /*
  * The public functions in the com module ought to be declared in a com-driver
@@ -167,8 +168,8 @@ struct tty dgb_tty[NDGBPORTS];
  */
 
 /* Interrupt handling entry points. */
-void	dgbintr		__P((int unit));
-void	dgbpoll		__P((void *unit_c));
+static void	dgbintr		__P((int unit));
+static void	dgbpoll		__P((void *unit_c));
 
 /* Device switch entry points. */
 #define	dgbreset	noreset
@@ -235,11 +236,10 @@ static	struct speedtab dgbspeedtab[] = {
 	-1,	-1
 };
 
-#ifdef DEBUG
-	int dgbdebug=1;
-#else
-	int dgbdebug=0;
-#endif
+static int dgbdebug=0;
+SYSCTL_INT(_debug, OID_AUTO, dgb_debug, CTLFLAG_RW,
+	&dgbdebug, 0, "");
+
 
 static int polltimeout=0;
 
@@ -1178,7 +1178,8 @@ dgbwrite(dev, uio, flag)
 	return error;
 }
 
-void dgbpoll(unit_c)
+static void
+dgbpoll(unit_c)
 	void *unit_c;
 {
 	int unit=(int)unit_c;
@@ -1399,7 +1400,7 @@ void dgbpoll(unit_c)
 	timeout(dgbpoll, unit_c, hz/25);
 }
 
-void
+static void
 dgbintr(unit)
 	int	unit;
 {
diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c
index d6edea3..27bd01b 100644
--- a/sys/gnu/i386/isa/nic3008.c
+++ b/sys/gnu/i386/isa/nic3008.c
@@ -1,6 +1,6 @@
-static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.12 1995/12/08 11:12:45 julian Exp $";
+static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.13 1995/12/08 23:19:29 phk Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.12 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.13 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,9 @@ static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.12 1995/12/08 11:12:45 juli
  *
  *******************************************************************************
  * $Log: nic3008.c,v $
+ * Revision 1.13  1995/12/08  23:19:29  phk
+ * Julian forgot to make the *devsw structures static.
+ *
  * Revision 1.12  1995/12/08  11:12:45  julian
  * Pass 3 of the great devsw changes
  * most devsw referenced functions are now static, as they are
@@ -138,17 +141,17 @@ extern int Isdn_Appl, Isdn_Ctrl, Isdn_Typ;
 
 static old_spy= 0;
 
-extern int	nicattach __P((struct isa_device *is));
-extern int	nicprobe __P((struct isa_device *is));
-extern int	nic_accept __P((int cn, int an, int rea));
-extern int	nic_connect __P((int cn, int ap, int b_channel, int inf_mask,
+static int	nicattach __P((struct isa_device *is));
+static int	nicprobe __P((struct isa_device *is));
+static int	nic_accept __P((int cn, int an, int rea));
+static int	nic_connect __P((int cn, int ap, int b_channel, int inf_mask,
 				 int out_serv, int out_serv_add,
 				 int src_subadr, unsigned ad_len,
 				 char *dest_addr, int spv));
-extern int	nic_disconnect __P((int cn, int rea));
-extern int	nic_listen __P((int cn, int ap, int inf_mask, int subadr_mask,
+static int	nic_disconnect __P((int cn, int rea));
+static int	nic_listen __P((int cn, int ap, int inf_mask, int subadr_mask,
 				int si_mask, int spv));
-extern int	nic_output __P((int cn));
+static int	nic_output __P((int cn));
 
 static short    bsintr;
 
@@ -183,7 +186,7 @@ typedef struct
 	char           *more_b;
 }               chan_t;
 
-struct nic_softc
+static struct nic_softc
 {
 	dpr_type       *sc_dpr;	/* card RAM virtual memory base */
 	u_short         sc_vector;	/* interrupt vector 		 */
@@ -414,7 +417,7 @@ badstate(mbx_type * mbx, int n, int mb, dpr_type *dpr)
 	printf("\n");
 }
 
-int
+static int
 nic_connect(int cn, int ap, int b_channel, int inf_mask, int out_serv
 	    ,int out_serv_add, int src_subadr, unsigned ad_len
 	    ,char *dest_addr, int spv)
@@ -437,7 +440,7 @@ nic_connect(int cn, int ap, int b_channel, int inf_mask, int out_serv
 	return (en_q_d(&nic_sc[isdn_ctrl[cn].unit], DD_CONN_REQ, MK_APPL(ap), ad_len + 10, buf));
 }
 
-int
+static int
 nic_listen(int cn, int ap, int inf_mask, int subadr_mask, int si_mask, int spv)
 {
 	u_short         sbuf[4];
@@ -448,7 +451,7 @@ nic_listen(int cn, int ap, int inf_mask, int subadr_mask, int si_mask, int spv)
 	return (en_q_d(&nic_sc[isdn_ctrl[cn].unit], DD_LISTEN_REQ, MK_APPL(ap), 8, (u_char *) sbuf));
 }
 
-int
+static int
 nic_disconnect(int cn, int rea)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
@@ -486,7 +489,7 @@ nic_disconnect(int cn, int rea)
 	return(err);
 }
 
-int
+static int
 nic_accept(int cn, int an, int rea)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
@@ -507,7 +510,7 @@ nic_accept(int cn, int an, int rea)
 	return(sel_b2_prot_req(sc, C_CHAN(cn), chan->plci, &appl->dlpd));
 }
 
-int
+static int
 nic_output(int cn)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c
index e4f4109..75d0440 100644
--- a/sys/gnu/i386/isa/nic3009.c
+++ b/sys/gnu/i386/isa/nic3009.c
@@ -1,6 +1,6 @@
-static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.12 1995/12/08 11:12:47 julian Exp $";
+static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.13 1995/12/08 23:19:30 phk Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.12 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.13 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,9 @@ static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.12 1995/12/08 11:12:47 juli
  *
  *******************************************************************************
  * $Log: nic3009.c,v $
+ * Revision 1.13  1995/12/08  23:19:30  phk
+ * Julian forgot to make the *devsw structures static.
+ *
  * Revision 1.12  1995/12/08  11:12:47  julian
  * Pass 3 of the great devsw changes
  * most devsw referenced functions are now static, as they are
@@ -133,18 +136,18 @@ extern int Isdn_Appl, Isdn_Ctrl, Isdn_Typ;
 
 static old_spy= 0;
 
-extern int	nnicattach __P((struct isa_device *is));
-extern int	nnicprobe __P((struct isa_device *is));
-extern int	nnic_accept __P((int cn, int an, int rea));
-extern int	nnic_connect __P((int cn, int ap, int b_channel, int inf_mask,
+static int	nnicattach __P((struct isa_device *is));
+static int	nnicprobe __P((struct isa_device *is));
+static int	nnic_accept __P((int cn, int an, int rea));
+static int	nnic_connect __P((int cn, int ap, int b_channel, int inf_mask,
 				  int out_serv, int out_serv_add,
 				  int src_subadr, unsigned ad_len,
 				  char *dest_addr, int spv));
-extern int	nnic_disconnect __P((int cn, int rea));
-extern int	nnic_listen __P((int cn, int ap, int inf_mask,
+static int	nnic_disconnect __P((int cn, int rea));
+static int	nnic_listen __P((int cn, int ap, int inf_mask,
 				 int subadr_mask, int si_mask, int spv));
-extern int	nnic_output __P((int cn));
-extern int	nnic_state __P((int cn));
+static int	nnic_output __P((int cn));
+static int	nnic_state __P((int cn));
 
 static	d_open_t	nnicopen;
 static	d_close_t	nnicclose;
@@ -181,7 +184,7 @@ typedef struct
 	char           *more_b;
 }               chan_t;
 
-struct nnic_softc
+static struct nnic_softc
 {
 	dpr_type       *sc_dpr;	/* card RAM virtual memory base */
 	u_short         sc_vector;	/* interrupt vector 		 */
@@ -213,7 +216,7 @@ static int	sel_b3_prot_req __P((int unit, int mb, u_short pl,
 				     ncpd_t *ncpd));
 static void	up_intr __P((unsigned unit, struct nnic_softc *sc));
 
-int
+static int
 nnicprobe(struct isa_device * is)
 {
 	register struct nnic_softc *sc = &nnic_sc[is->id_unit & 127];
@@ -262,7 +265,7 @@ nnic_reset(struct nnic_softc *sc, int reset)
 /*
  * nnicattach() Install device
  */
-int
+static int
 nnicattach(struct isa_device * is)
 {
 	struct nnic_softc *sc;
@@ -364,7 +367,7 @@ badstate(mbx_type * mbx, int n, int mb, dpr_type *dpr)
 	printf("\n");
 }
 
-int
+static int
 nnic_state(int cn)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
@@ -384,7 +387,7 @@ nnic_state(int cn)
 	return(0);
 }
 
-int
+static int
 nnic_output(int cn)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
@@ -504,7 +507,7 @@ con_b3_resp(int unit, int mb, u_short ncci, u_short pl, u_char reject)
 	return(en_q(unit, mb | BD_CONN_B3_RSP,0, pl, l, buf));
 }
 
-int
+static int
 nnic_connect(int cn, int ap, int b_channel, int inf_mask, int out_serv
 	    ,int out_serv_add, int src_subadr, unsigned ad_len
 	    ,char *dest_addr, int spv)
@@ -527,7 +530,7 @@ nnic_connect(int cn, int ap, int b_channel, int inf_mask, int out_serv
 	return (en_q(isdn_ctrl[cn].unit, DD_CONN_REQ, 0, MK_APPL(ap), ad_len + 10, buf));
 }
 
-int
+static int
 nnic_listen(int cn, int ap, int inf_mask, int subadr_mask, int si_mask, int spv)
 {
 	u_short         sbuf[4];
@@ -540,7 +543,7 @@ nnic_listen(int cn, int ap, int inf_mask, int subadr_mask, int si_mask, int spv)
 	return (en_q(isdn_ctrl[cn].unit, DD_LISTEN_REQ, 0, MK_APPL(ap), 8, (u_char *) sbuf));
 }
 
-int
+static int
 nnic_disconnect(int cn, int rea)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
@@ -568,7 +571,7 @@ nnic_disconnect(int cn, int rea)
 	return(err);
 }
 
-int
+static int
 nnic_accept(int cn, int an, int rea)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];