Staticize and cleanup.

19 files changed, 191 insertions, 204 deletions

diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 10c923a..114b181 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.1.1.1 1995/11/21 02:32:04 peter Exp $
+ * $Id: if_ar.c,v 1.2 1995/12/05 02:00:33 davidg Exp $
  */
 
 /*
@@ -145,10 +145,10 @@ struct ar_softc {
 	struct kern_devconf kdc;
 };
 
-struct ar_softc *ar_sc_ind[NAR*NPORT];
+static struct ar_softc *ar_sc_ind[NAR*NPORT];
 
-int arprobe(struct isa_device *id);
-int arattach(struct isa_device *id);
+static int arprobe(struct isa_device *id);
+static int arattach(struct isa_device *id);
 
 /*
  * This translate from irq numbers to
@@ -199,9 +199,9 @@ static struct kern_devconf kdc_arc_template = {
 	DC_CLS_NETIF
 };
 
-void arstart(struct ifnet *ifp);
-int arioctl(struct ifnet *ifp, int cmd, caddr_t data);
-void arwatchdog(struct ifnet *ifp);
+static void arstart(struct ifnet *ifp);
+static int arioctl(struct ifnet *ifp, int cmd, caddr_t data);
+static void arwatchdog(struct ifnet *ifp);
 
 static void ar_up(struct ar_softc *sc);
 static void ar_down(struct ar_softc *sc);
@@ -244,7 +244,8 @@ static inline void arc_registerdev(struct isa_device *dvp)
  * Probe to see if it is there.
  * Get its information and fill it in.
  */
-int arprobe(struct isa_device *id)
+static int
+arprobe(struct isa_device *id)
 {
 	struct ar_hardc *hc = &ar_hardc[id->id_unit];
 	u_int tmp;
@@ -337,7 +338,8 @@ int arprobe(struct isa_device *id)
  * Fill in the info for each port.
  * Attach each port to sppp and bpf.
  */
-int arattach(struct isa_device *id)
+static int
+arattach(struct isa_device *id)
 {
 	struct ar_hardc *hc = &ar_hardc[id->id_unit];
 	struct ar_softc *sc;
@@ -431,7 +433,6 @@ void arintr(int unit)
 	sca_regs *sca = hc->sca;
 	u_char isr0, isr1, isr2, arisr;
 	int scano;
-	static int intno = 0;
 
 	arisr = inb(hc->iobase + AR_ISTAT);
 
@@ -497,7 +498,8 @@ void arintr(int unit)
  * that clears that should ensure that the transmitter and it's DMA is
  * in a "good" idle state.
  */
-void arstart(struct ifnet *ifp)
+static void
+arstart(struct ifnet *ifp)
 {
 	struct ar_softc *sc = ARUNIT2SC(ifp->if_unit);
 	int i, len, tlen;
@@ -612,7 +614,8 @@ void arstart(struct ifnet *ifp)
 	ARC_SET_OFF(sc->hc->iobase);
 }
 
-int arioctl(struct ifnet *ifp, int cmd, caddr_t data)
+static int
+arioctl(struct ifnet *ifp, int cmd, caddr_t data)
 {
 	int s, error;
 	int was_up, should_be_up;
@@ -664,7 +667,8 @@ int arioctl(struct ifnet *ifp, int cmd, caddr_t data)
 /*
  * This is to catch lost tx interrupts.
  */
-void arwatchdog(struct ifnet *ifp)
+static void
+arwatchdog(struct ifnet *ifp)
 {
 	struct ar_softc *sc = ARUNIT2SC(ifp->if_unit);
 
@@ -1078,7 +1082,8 @@ void ar_init_tx_dmac(struct ar_softc *sc)
  * Return the length and status of the packet.
  * Return nonzero if there is a packet available.
  */
-int ar_packet_avail(struct ar_softc *sc,
+static int
+ar_packet_avail(struct ar_softc *sc,
 		    int *len,
 		    u_char *rxstat)
 {
@@ -1120,7 +1125,8 @@ int ar_packet_avail(struct ar_softc *sc,
  * Take into account that buffers wrap and that a packet may
  * be larger than a buffer.
  */
-void ar_copy_rxbuf(struct mbuf *m,
+static void 
+ar_copy_rxbuf(struct mbuf *m,
 		   struct ar_softc *sc,
 		   int len)
 {
@@ -1164,7 +1170,8 @@ void ar_copy_rxbuf(struct mbuf *m,
 /*
  * Just eat a packet. Update pointers to point to the next packet.
  */
-void ar_eat_packet(struct ar_softc *sc)
+static void
+ar_eat_packet(struct ar_softc *sc)
 {
 	sca_descriptor *rxdesc;
 	sca_descriptor *endp;
@@ -1203,7 +1210,8 @@ void ar_eat_packet(struct ar_softc *sc)
  * While there is packets available in the rx buffer, read them out
  * into mbufs and ship them off.
  */
-void ar_get_packets(struct ar_softc *sc)
+static void
+ar_get_packets(struct ar_softc *sc)
 {
 	sca_descriptor *rxdesc;
 	struct mbuf *m = NULL;
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 10c923a..114b181 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.1.1.1 1995/11/21 02:32:04 peter Exp $
+ * $Id: if_ar.c,v 1.2 1995/12/05 02:00:33 davidg Exp $
  */
 
 /*
@@ -145,10 +145,10 @@ struct ar_softc {
 	struct kern_devconf kdc;
 };
 
-struct ar_softc *ar_sc_ind[NAR*NPORT];
+static struct ar_softc *ar_sc_ind[NAR*NPORT];
 
-int arprobe(struct isa_device *id);
-int arattach(struct isa_device *id);
+static int arprobe(struct isa_device *id);
+static int arattach(struct isa_device *id);
 
 /*
  * This translate from irq numbers to
@@ -199,9 +199,9 @@ static struct kern_devconf kdc_arc_template = {
 	DC_CLS_NETIF
 };
 
-void arstart(struct ifnet *ifp);
-int arioctl(struct ifnet *ifp, int cmd, caddr_t data);
-void arwatchdog(struct ifnet *ifp);
+static void arstart(struct ifnet *ifp);
+static int arioctl(struct ifnet *ifp, int cmd, caddr_t data);
+static void arwatchdog(struct ifnet *ifp);
 
 static void ar_up(struct ar_softc *sc);
 static void ar_down(struct ar_softc *sc);
@@ -244,7 +244,8 @@ static inline void arc_registerdev(struct isa_device *dvp)
  * Probe to see if it is there.
  * Get its information and fill it in.
  */
-int arprobe(struct isa_device *id)
+static int
+arprobe(struct isa_device *id)
 {
 	struct ar_hardc *hc = &ar_hardc[id->id_unit];
 	u_int tmp;
@@ -337,7 +338,8 @@ int arprobe(struct isa_device *id)
  * Fill in the info for each port.
  * Attach each port to sppp and bpf.
  */
-int arattach(struct isa_device *id)
+static int
+arattach(struct isa_device *id)
 {
 	struct ar_hardc *hc = &ar_hardc[id->id_unit];
 	struct ar_softc *sc;
@@ -431,7 +433,6 @@ void arintr(int unit)
 	sca_regs *sca = hc->sca;
 	u_char isr0, isr1, isr2, arisr;
 	int scano;
-	static int intno = 0;
 
 	arisr = inb(hc->iobase + AR_ISTAT);
 
@@ -497,7 +498,8 @@ void arintr(int unit)
  * that clears that should ensure that the transmitter and it's DMA is
  * in a "good" idle state.
  */
-void arstart(struct ifnet *ifp)
+static void
+arstart(struct ifnet *ifp)
 {
 	struct ar_softc *sc = ARUNIT2SC(ifp->if_unit);
 	int i, len, tlen;
@@ -612,7 +614,8 @@ void arstart(struct ifnet *ifp)
 	ARC_SET_OFF(sc->hc->iobase);
 }
 
-int arioctl(struct ifnet *ifp, int cmd, caddr_t data)
+static int
+arioctl(struct ifnet *ifp, int cmd, caddr_t data)
 {
 	int s, error;
 	int was_up, should_be_up;
@@ -664,7 +667,8 @@ int arioctl(struct ifnet *ifp, int cmd, caddr_t data)
 /*
  * This is to catch lost tx interrupts.
  */
-void arwatchdog(struct ifnet *ifp)
+static void
+arwatchdog(struct ifnet *ifp)
 {
 	struct ar_softc *sc = ARUNIT2SC(ifp->if_unit);
 
@@ -1078,7 +1082,8 @@ void ar_init_tx_dmac(struct ar_softc *sc)
  * Return the length and status of the packet.
  * Return nonzero if there is a packet available.
  */
-int ar_packet_avail(struct ar_softc *sc,
+static int
+ar_packet_avail(struct ar_softc *sc,
 		    int *len,
 		    u_char *rxstat)
 {
@@ -1120,7 +1125,8 @@ int ar_packet_avail(struct ar_softc *sc,
  * Take into account that buffers wrap and that a packet may
  * be larger than a buffer.
  */
-void ar_copy_rxbuf(struct mbuf *m,
+static void 
+ar_copy_rxbuf(struct mbuf *m,
 		   struct ar_softc *sc,
 		   int len)
 {
@@ -1164,7 +1170,8 @@ void ar_copy_rxbuf(struct mbuf *m,
 /*
  * Just eat a packet. Update pointers to point to the next packet.
  */
-void ar_eat_packet(struct ar_softc *sc)
+static void
+ar_eat_packet(struct ar_softc *sc)
 {
 	sca_descriptor *rxdesc;
 	sca_descriptor *endp;
@@ -1203,7 +1210,8 @@ void ar_eat_packet(struct ar_softc *sc)
  * While there is packets available in the rx buffer, read them out
  * into mbufs and ship them off.
  */
-void ar_get_packets(struct ar_softc *sc)
+static void
+ar_get_packets(struct ar_softc *sc)
 {
 	sca_descriptor *rxdesc;
 	struct mbuf *m = NULL;
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 9dee324..b3d8f03 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.88 1995/12/05 02:00:43 davidg Exp $
+ *	$Id: if_ed.c,v 1.89 1995/12/05 13:01:33 davidg Exp $
  */
 
 /*
@@ -92,7 +92,7 @@
 /*
  * ed_softc: per line info and status
  */
-struct ed_softc {
+static struct ed_softc {
 	struct arpcom arpcom;	/* ethernet common */
 
 	char   *type_str;	/* pointer to type string */
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 54536f6..8df642f 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.34 1995/11/04 17:07:26 bde Exp $
+ *  $Id: if_ep.c,v 1.35 1995/12/05 02:00:52 davidg Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -112,17 +112,17 @@ static int epioctl __P((struct ifnet * ifp, int, caddr_t));
 static void epmbuffill __P((caddr_t, int));
 static void epmbufempty __P((struct ep_softc *));
 
-void epinit __P((int));
-void epread __P((struct ep_softc *));
+static void epinit __P((int));
+static void epread __P((struct ep_softc *));
 void epreset __P((int));
-void epstart __P((struct ifnet *));
-void epstop __P((int));
-void epwatchdog __P((struct ifnet *));
+static void epstart __P((struct ifnet *));
+static void epstop __P((int));
+static void epwatchdog __P((struct ifnet *));
 
 static int send_ID_sequence __P((int));
 static int get_eeprom_data __P((int, int));
 
-struct ep_softc ep_softc[NEP];
+static struct ep_softc ep_softc[NEP];
 
 #define ep_ftst(f) (sc->stat&(f))
 #define ep_fset(f) (sc->stat|=(f))
@@ -156,9 +156,9 @@ ep_registerdev(struct isa_device *id)
       dev_attach(&kdc_ep[id->id_unit]);
 }
 
-int ep_current_tag = EP_LAST_TAG + 1;
+static int ep_current_tag = EP_LAST_TAG + 1;
 
-struct {
+static struct {
 	int epb_addr;	/* address of this board */
 	char epb_used;	/* was this entry already used for configuring ? */
 	}
@@ -488,7 +488,7 @@ epattach(is)
  * The order in here seems important. Otherwise we may not receive
  * interrupts. ?!
  */
-void
+static void
 epinit(unit)
     int unit;
 {
@@ -648,7 +648,7 @@ epinit(unit)
 
 static const char padmap[] = {0, 3, 2, 1};
 
-void
+static void
 epstart(ifp)
     struct ifnet *ifp;
 {
@@ -872,7 +872,7 @@ rescan:
     splx(x);
 }
 
-void
+static void
 epread(sc)
     register struct ep_softc *sc;
 {
@@ -1243,7 +1243,7 @@ epioctl(ifp, cmd, data)
     return (error);
 }
 
-void
+static void
 epwatchdog(ifp)
     struct ifnet *ifp;
 {
@@ -1259,7 +1259,7 @@ epwatchdog(ifp)
     epintr(ifp->if_unit);
 }
 
-void
+static void
 epstop(unit)
     int unit;
 {
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 4e9c091..e394e13 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.74 1995/12/08 23:20:26 phk Exp $
+ *	$Id: fd.c,v 1.75 1995/12/09 09:10:12 julian Exp $
  *
  */
 
@@ -200,7 +200,7 @@ fd_goaway(struct kern_devconf *kdc, int force)
 #define FD_360in5_25    14
 
 
-struct fd_type fd_types[NUMTYPES] =
+static struct fd_type fd_types[NUMTYPES] =
 {
 { 21,2,0xFF,0x04,82,3444,1,FDC_500KBPS,2,0x0C,2 }, /* 1.72M in HD 3.5in */
 { 18,2,0xFF,0x1B,82,2952,1,FDC_500KBPS,2,0x6C,1 }, /* 1.48M in HD 3.5in */
@@ -230,7 +230,7 @@ struct fdc_data fdc_data[NFDC];
 * Per drive structure.							*
 * N per controller  (DRVS_PER_CTLR)					*
 \***********************************************************************/
-struct fd_data {
+static struct fd_data {
 	struct	fdc_data *fdc;	/* pointer to controller structure */
 	int	fdsu;		/* this units number on this controller */
 	int	type;		/* Drive type (FD_1440...) */
@@ -360,7 +360,7 @@ static struct cdevsw fd_cdevsw =
 	  seltrue,	nommap,		fdstrategy,	"fd",
 	  &fd_bdevsw,	-1 };
 
-struct isa_device *fdcdevs[NFDC];
+static struct isa_device *fdcdevs[NFDC];
 
 /*
  * Provide hw.devconf information.
@@ -393,7 +393,7 @@ fdc_err(fdcu_t fdcu, const char *s)
  * # of input bytes, input bytes as ints ...
  */
 
-int
+static int
 fd_cmd(fdcu_t fdcu, int n_out, ...)
 {
 	u_char cmd;
@@ -433,7 +433,7 @@ fd_cmd(fdcu_t fdcu, int n_out, ...)
 	return 0;
 }
 
-int
+static int
 fd_sense_drive_status(fdc_p fdc, int *st3p)
 {
 	int st3;
@@ -448,7 +448,7 @@ fd_sense_drive_status(fdc_p fdc, int *st3p)
 	return 0;
 }
 
-int
+static int
 fd_sense_int(fdc_p fdc, int *st0p, int *cylp)
 {
 	int st0, cyl;
@@ -485,7 +485,7 @@ fd_sense_int(fdc_p fdc, int *st0p, int *cylp)
 }
 
 
-int
+static int
 fd_read_status(fdc_p fdc, int fdsu)
 {
 	int i, ret;
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index a366f05..b043a6e 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -191,7 +191,7 @@ static struct fe_filter const fe_filter_all     = { FE_FILTER_ALL };
 /*
  * fe_softc: per line info and status
  */
-struct fe_softc {
+static struct fe_softc {
 
 	/* Used by "common" codes.  */
 	struct arpcom arpcom;	/* ethernet common */
@@ -246,13 +246,13 @@ struct fe_softc {
 #define IFNET2SOFTC(P)	( ( struct fe_softc * )(P) )
 
 /* Standard driver entry points.  These can be static.  */
-int		fe_probe	( struct isa_device * );
-int		fe_attach	( struct isa_device * );
-void		fe_init		( int );
-int		fe_ioctl	( struct ifnet *, int, caddr_t );
-void		fe_start	( struct ifnet * );
-void		fe_reset	( int );
-void		fe_watchdog	( struct ifnet * );
+static int		fe_probe	( struct isa_device * );
+static int		fe_attach	( struct isa_device * );
+static void		fe_init		( int );
+static int		fe_ioctl	( struct ifnet *, int, caddr_t );
+static void		fe_start	( struct ifnet * );
+static void		fe_reset	( int );
+static void		fe_watchdog	( struct ifnet * );
 
 /* Local functions.  Order of declaration is confused.  FIXME.  */
 static int	fe_probe_fmv	( struct isa_device *, struct fe_softc * );
@@ -385,7 +385,7 @@ static struct fe_probe_list const fe_probe_list [] =
  *	or number of i/o addresses used (if found)
  */
 
-int
+static int
 fe_probe ( struct isa_device * isa_dev )
 {
 	struct fe_softc * sc, * u;
@@ -1052,7 +1052,7 @@ fe_init_mbh ( struct fe_softc * sc )
 /*
  * Install interface into kernel networking data structures
  */
-int
+static int
 fe_attach ( struct isa_device *isa_dev )
 {
 	struct fe_softc *sc = &fe_softc[isa_dev->id_unit];
@@ -1170,7 +1170,7 @@ fe_attach ( struct isa_device *isa_dev )
 /*
  * Reset interface.
  */
-void
+static void
 fe_reset ( int unit )
 {
 	/*
@@ -1186,7 +1186,7 @@ fe_reset ( int unit )
  * All buffered packets, both transmitting and receiving,
  * if any, will be lost by stopping the interface.
  */
-void
+static void
 fe_stop ( int unit )
 {
 	struct fe_softc *sc = &fe_softc[unit];
@@ -1243,7 +1243,7 @@ fe_stop ( int unit )
  * Device timeout/watchdog routine. Entered if the device neglects to
  * generate an interrupt after a transmit has been started on it.
  */
-void
+static void
 fe_watchdog ( struct ifnet *ifp )
 {
 	struct fe_softc *sc = (struct fe_softc *)ifp;
@@ -1271,7 +1271,7 @@ fe_watchdog ( struct ifnet *ifp )
 /*
  * Initialize device.
  */
-void
+static void
 fe_init ( int unit )
 {
 	struct fe_softc *sc = &fe_softc[unit];
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 069867a..b825f70 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.29 1995/11/18 08:35:49 bde Exp $
+ *	$Id: if_ie.c,v 1.30 1995/12/05 02:01:08 davidg Exp $
  */
 
 /*
@@ -161,7 +161,7 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff.
 #include <net/bpfdesc.h>
 #endif
 
-extern int check_ie_present __P((int unit, caddr_t where, unsigned size));
+static int check_ie_present __P((int unit, caddr_t where, unsigned size));
 
 static struct mbuf *last_not_for_us;
 
@@ -234,7 +234,7 @@ enum ie_hardware {
   IE_UNKNOWN
 };
 
-const char *ie_hardware_names[] = {
+static const char *ie_hardware_names[] = {
   "StarLAN 10",
   "EN100",
   "StarLAN Fiber",
@@ -274,7 +274,7 @@ both transmit and receive buffers.
 /*
  * Ethernet status, per interface.
  */
-struct ie_softc {
+static struct ie_softc {
   struct arpcom arpcom;
   void (*ie_reset_586)(int);
   void (*ie_chan_attn)(int);
@@ -1358,7 +1358,8 @@ iestart(ifp)
 /*
  * Check to see if there's an 82586 out there.
  */
-int check_ie_present(unit, where, size)
+static int
+check_ie_present(unit, where, size)
      int unit;
      caddr_t where;
      unsigned size;
diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c
index 99008ad..351c456 100644
--- a/sys/dev/joy/joy.c
+++ b/sys/dev/joy/joy.c
@@ -81,7 +81,8 @@ static struct {
 
 extern int timer0_max_count;
 
-int joyprobe (struct isa_device *), joyattach (struct isa_device *);
+static int joyprobe (struct isa_device *);
+static int joyattach (struct isa_device *);
 
 struct isa_driver joydriver = {joyprobe, joyattach, "joy"};
 
@@ -99,7 +100,7 @@ static struct cdevsw joy_cdevsw =
 static int get_tick ();
 
 
-int
+static int
 joyprobe (struct isa_device *dev)
 {
 #ifdef WANT_JOYSTICK_CONNECTED
@@ -111,7 +112,7 @@ joyprobe (struct isa_device *dev)
 #endif
 }
 
-int
+static int
 joyattach (struct isa_device *dev)
 {
     int	unit = dev->id_unit;
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index a761053..9130c78 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -25,13 +25,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: kbdtables.h,v 1.28 1995/03/27 19:41:11 sos Exp $
+ *	$Id: kbdtables.h,v 1.29 1995/03/28 21:30:13 sos Exp $
  */
 
 #define SET8 0x80       	/* set eight bit on */
 
 #ifdef DKKEYMAP
-keymap_t key_map = { 0x6C,	/* DK iso8859 keymap */
+static keymap_t key_map = { 0x6C,	/* DK iso8859 keymap */
 /*                                                            alt
  * scan                          cntrl          alt    alt   cntrl
  * code     base   shift  cntrl  shift   alt   shift  cntrl  shift  spcl  flgs
@@ -149,7 +149,7 @@ keymap_t key_map = { 0x6C,	/* DK iso8859 keymap */
 #endif
 
 #ifdef UKKEYMAP
-keymap_t key_map = { 0x6C,	/* uk iso8859 keymap */
+static keymap_t key_map = { 0x6C,	/* uk iso8859 keymap */
 /*                                                            alt
  * scan                          cntrl          alt    alt   cntrl
  * code     base   shift  cntrl  shift   alt   shift  cntrl  shift  spcl  flgs
@@ -267,7 +267,7 @@ keymap_t key_map = { 0x6C,	/* uk iso8859 keymap */
 #endif
 
 #ifdef GRKEYMAP
-keymap_t key_map = { 0x6C,	/* german iso8859 keymap */
+static keymap_t key_map = { 0x6C,	/* german iso8859 keymap */
 /*                                                            alt
  * scan                          cntrl          alt    alt   cntrl
  * code     base   shift  cntrl  shift   alt   shift  cntrl  shift  spcl  flgs
@@ -385,7 +385,7 @@ keymap_t key_map = { 0x6C,	/* german iso8859 keymap */
 #endif
 
 #ifdef SWKEYMAP
-keymap_t key_map = { 0x6C,	/* swedish iso8859 keymap */
+static keymap_t key_map = { 0x6C,	/* swedish iso8859 keymap */
 /*                                                            alt
  * scan                          cntrl          alt    alt   cntrl
  * code     base   shift  cntrl  shift   alt   shift  cntrl  shift  spcl  flgs
@@ -503,7 +503,7 @@ keymap_t key_map = { 0x6C,	/* swedish iso8859 keymap */
 #endif
 
 #ifdef RUKEYMAP
-keymap_t key_map = { 0xEC,        /* keys number */
+static keymap_t key_map = { 0xEC,        /* keys number */
 /*                                                                          alt
  * scan                          cntrl                alt        alt       cntrl
  * code     base   shift  cntrl  shift     alt       shift      cntrl      shift    spcl  flgs
@@ -751,7 +751,7 @@ keymap_t key_map = { 0xEC,        /* keys number */
 #endif
 
 #if !defined(DKKEYMAP) && !defined(UKKEYMAP) && !defined(GRKEYMAP) && !defined(SWKEYMAP) && !defined(RUKEYMAP)
-keymap_t key_map = { 0x6C,	/* US iso8859 keymap */
+static keymap_t key_map = { 0x6C,	/* US iso8859 keymap */
 /*                                                            alt
  * scan                          cntrl          alt    alt   cntrl
  * code     base   shift  cntrl  shift   alt   shift  cntrl  shift  spcl  flgs
@@ -869,7 +869,7 @@ keymap_t key_map = { 0x6C,	/* US iso8859 keymap */
 
 #endif
 
-fkeytab_t fkey_tab[96] = {
+static fkeytab_t fkey_tab[96] = {
 /* 01-04 */	{"\033[M", 3}, {"\033[N", 3}, {"\033[O", 3}, {"\033[P", 3},
 /* 05-08 */	{"\033[Q", 3}, {"\033[R", 3}, {"\033[S", 3}, {"\033[T", 3},
 /* 09-12 */	{"\033[U", 3}, {"\033[V", 3}, {"\033[W", 3}, {"\033[X", 3},
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index ffc57a7..c3f12c5 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -100,7 +100,7 @@
 #include <i386/isa/isa_device.h>
 #include <i386/isa/if_lnc.h>
 
-struct lnc_softc {
+static struct lnc_softc {
 	struct arpcom arpcom;	            /* see ../../netinet/if_ether.h */
 	struct nic_info nic;	            /* NIC specific info */
 	int nrdre;
diff --git a/sys/dev/lnc/if_lncvar.h b/sys/dev/lnc/if_lncvar.h
index 5f4dd32..20966a6 100644
--- a/sys/dev/lnc/if_lncvar.h
+++ b/sys/dev/lnc/if_lncvar.h
@@ -100,19 +100,6 @@
 #define TRANS_MD3 \
 	"\20\6BUFF\5UFLO\4RES\3LCOL\2LCAR\1RTRY"
 
-static char *nic_ident[] = {"Unknown",
-                     "BICC",
-                     "NE2100",
-                     "DEPCA"};
-
-static char *ic_ident[] =  {"Unknown",
-                     "LANCE, Am7990",
-                     "C-LANCE, Am79C90",
-                     "PCnet-ISA, Am79C960",
-                     "PCnet-ISA+, Am79C961",
-                     "PCnet-32, Am79C965",
-                     "PCnet-PCI, Am79C970"};
-
 struct nic_info {
 	int ident;         /* Type of card */
 	int ic;            /* Type of ic, Am7990, Am79C960 etc. */
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 8bd2782..c7c973d 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.52 1995/12/08 11:14:34 julian Exp $
+ *	$Id: mcd.c,v 1.53 1995/12/08 23:20:34 phk Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -138,7 +138,7 @@ struct mcd_mbx {
 	short           mode;
 };
 
-struct mcd_data {
+static struct mcd_data {
 	short	type;
 	char	*name;
 	short	config;
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 2196a4c..768387e 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.20 1995/12/08 11:14:40 julian Exp $
+ * $Id: mse.c,v 1.21 1995/12/08 23:20:35 phk Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -90,7 +90,7 @@ static struct cdevsw mse_cdevsw =
  * sc_disablemouse() and sc_getmouse() routines must be called spl'd().
  */
 #define	PROTOBYTES	5
-struct mse_softc {
+static struct mse_softc {
 	int	sc_flags;
 	int	sc_mousetype;
 	struct	selinfo sc_selp;
@@ -188,7 +188,7 @@ static void mse_enableati(), mse_disableati(), mse_getati();
  * Keep the Logitech last, since I haven't figured out how to probe it
  * properly yet. (Someday I'll have the documentation.)
  */
-struct mse_types {
+static struct mse_types {
 	int	m_type;		/* Type of bus mouse */
 	int	(*m_probe)();	/* Probe routine to test for it */
 	void	(*m_enable)();	/* Start routine */
@@ -425,7 +425,6 @@ mseintr(unit)
 	int unit;
 {
 	register struct mse_softc *sc = &mse_sc[unit];
-	pid_t p;
 
 #ifdef DEBUG
 	static int mse_intrcnt = 0;
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 206b38f..71d4fc0 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -62,8 +62,8 @@
 
 
 /* Prototypes */
-int     rcprobe         __P((struct isa_device *));
-int     rcattach        __P((struct isa_device *));
+static int     rcprobe         __P((struct isa_device *));
+static int     rcattach        __P((struct isa_device *));
 
 /*-
  * This space intentionally left blank to stop __LINE__ from screwing up
@@ -151,8 +151,8 @@ static struct rc_chans  {
 static int rc_scheduled_event = 0;
 
 /* for pstat -t */
-struct tty rc_tty[NRC * CD180_NCHAN];
-int        nrc_tty = NRC * CD180_NCHAN;
+static struct tty rc_tty[NRC * CD180_NCHAN];
+static int        nrc_tty = NRC * CD180_NCHAN;
 
 /* Flags */
 #define RC_DTR_OFF      0x0001          /* DTR wait, for close/open     */
@@ -199,7 +199,8 @@ static void rc_wait0            __P((int nec, int unit, int chan, int line));
 /**********************************************/
 
 /* Quick device probing */
-int rcprobe(dvp)
+static int
+rcprobe(dvp)
 	struct  isa_device      *dvp;
 {
 	int             irq = ffs(dvp->id_irq) - 1;
@@ -253,7 +254,8 @@ rc_registerdev(id)
 	dev_attach(&kdc_rc[unit]);
 }
 
-int rcattach(dvp)
+static int
+rcattach(dvp)
 	struct  isa_device      *dvp;
 {
 	register int            i, chan, nec = dvp->id_iobase;
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 1e930c3..9fe26bb 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.23 1995/12/08 11:15:05 julian Exp $
+ *	$Id: si.c,v 1.24 1995/12/08 23:20:41 phk Exp $
  */
 
 #ifndef lint
@@ -102,11 +102,11 @@ static void si_disc_optim __P((struct tty *tp, struct termios *t,
 static void sihardclose __P((struct si_port *pp));
 static void sidtrwakeup __P((void *chan));
 
-int	siparam __P((struct tty *, struct termios *));
+static int	siparam __P((struct tty *, struct termios *));
 
-extern	void	si_registerdev __P((struct isa_device *id));
-extern	int	siprobe __P((struct isa_device *id));
-extern	int	siattach __P((struct isa_device *id));
+static	void	si_registerdev __P((struct isa_device *id));
+static	int	siprobe __P((struct isa_device *id));
+static	int	siattach __P((struct isa_device *id));
 static	void	si_modem_state __P((struct si_port *pp, struct tty *tp, int hi_ip));
 
 struct isa_driver sidriver =
@@ -171,7 +171,7 @@ struct si_softc {
 	} devfs_token[32]; /* what is the max per card? */
 #endif
 };
-struct si_softc si_softc[NSI];		/* up to 4 elements */
+static struct si_softc si_softc[NSI];		/* up to 4 elements */
 
 #ifndef B2000	/* not standard, but the hardware knows it. */
 # define B2000 2000
@@ -258,7 +258,7 @@ static struct kern_devconf si_kdc[NSI] = { {
 	DC_CLS_SERIAL,		/* class */
 } };
 
-void
+static void
 si_registerdev(id)
 	struct isa_device *id;
 {
@@ -272,7 +272,7 @@ si_registerdev(id)
 }
 
 /* Look for a valid board at the given mem addr */
-int
+static int
 siprobe(id)
 	struct isa_device *id;
 {
@@ -473,7 +473,7 @@ bad_irq:
 /*
  * Attach the device.  Initialize the card.
  */
-int
+static int
 siattach(id)
 	struct isa_device *id;
 {
@@ -1412,7 +1412,7 @@ out:
  *	this may sleep, does not flush, nor wait for drain, nor block writes
  *	caller must arrange this if it's important..
  */
-int
+static int
 siparam(tp, t)
 	register struct tty *tp;
 	register struct termios *t;
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 61cd485..b3a01b9 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,11 +31,10 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.125 1995/12/08 11:15:12 julian Exp $
+ *	$Id: sio.c,v 1.126 1995/12/08 23:20:44 phk Exp $
  */
 
 #include "sio.h"
-#if NSIO > 0
 /*
  * Serial driver, based on 386BSD-0.1 com driver.
  * Mostly rewritten to use pseudo-DMA.
@@ -174,8 +173,6 @@ struct com_s {
 	bool_t  active_out;	/* nonzero if the callout device is open */
 	u_char	cfcr_image;	/* copy of value written to CFCR */
 	u_char	ftl;		/* current rx fifo trigger level */
-	u_char	ftl_init;	/* ftl_max for next open() */
-	u_char	ftl_max;	/* maximum ftl for curent open() */
 	bool_t	hasfifo;	/* nonzero for 16550 UARTs */
 	bool_t	loses_outints;	/* nonzero if device loses output interrupts */
 	u_char	mcr_image;	/* copy of value written to MCR */
@@ -320,7 +317,6 @@ static struct cdevsw sio_cdevsw =
 static	int	comconsole = -1;
 static	speed_t	comdefaultrate = TTYDEF_SPEED;
 static	u_int	com_events;	/* input chars + weighted output completions */
-static	int	commajor;
 static	int	sio_timeout;
 static	int	sio_timeouts_until_log;
 #if 0 /* XXX */
@@ -376,8 +372,8 @@ static struct kern_devconf kdc_sio[NSIO] = { {
  *	PC-Card (PCMCIA) specific code.
  */
 static int card_intr(struct pccard_dev *);	/* Interrupt handler */
-void siounload(struct pccard_dev *);	/* Disable driver */
-void siosuspend(struct pccard_dev *);	/* Suspend driver */
+static void siounload(struct pccard_dev *);	/* Disable driver */
+static void siosuspend(struct pccard_dev *);	/* Suspend driver */
 static int sioinit(struct pccard_dev *, int);	/* init device */
 
 static struct pccard_drv sio_info =
@@ -398,7 +394,7 @@ static struct pccard_drv sio_info =
  * sioinit with first=0. This is called when the user suspends
  * the system, or the APM code suspends the system.
  */
-void
+static void
 siosuspend(struct pccard_dev *dp)
 {
 	printf("sio%d: suspending\n", dp->isahd.id_unit);
@@ -451,12 +447,10 @@ sioinit(struct pccard_dev *dp, int first)
  *	and ensure that any driver entry points such as
  *	read and write do not hang.
  */
-void
+static void
 siounload(struct pccard_dev *dp)
 {
 	struct com_s	*com;
-	struct tty	*tp;
-	int	s,unit,nowhere;
 
 	com = com_addr(dp->isahd.id_unit);
 	if (!com->iobase) {
@@ -815,37 +809,60 @@ sioattach(isdp)
 			goto determined_type;
 		}
 	}
-	outb(iobase + com_fifo, FIFO_ENABLE | FIFO_TRIGGER_14);
+	outb(iobase + com_fifo, FIFO_ENABLE | FIFO_RX_HIGH);
 	DELAY(100);
 	switch (inb(com->int_id_port) & IIR_FIFO_MASK) {
-	case FIFO_TRIGGER_1:
+	case FIFO_RX_LOW:
 		printf(" 16450");
 		kdc_sio[unit].kdc_description =
 		  "Serial port: National 16450 or compatible";
 		break;
-	case FIFO_TRIGGER_4:
+	case FIFO_RX_MEDL:
 		printf(" 16450?");
 		kdc_sio[unit].kdc_description =
 		  "Serial port: maybe National 16450";
 		break;
-	case FIFO_TRIGGER_8:
+	case FIFO_RX_MEDH:
 		printf(" 16550?");
 		kdc_sio[unit].kdc_description =
 		  "Serial port: maybe National 16550";
 		break;
-	case FIFO_TRIGGER_14:
-		printf(" 16550A");
+	case FIFO_RX_HIGH:
 		if (COM_NOFIFO(isdp)) {
 			printf(" fifo disabled");
 			kdc_sio[unit].kdc_description =
 			  "Serial port: National 16550A, FIFO disabled";
 		} else {
 			com->hasfifo = TRUE;
-			com->ftl_init = FIFO_TRIGGER_14;
 			com->tx_fifo_size = 16;
 			kdc_sio[unit].kdc_description =
 			  "Serial port: National 16550A or compatible";
 		}
+		/*
+		 * Check for the Startech ST16C650 chip.
+		 * it has a shadow register under the com_iir,
+		 * which can only be accessed when cfcr == 0xff
+		 */
+		{
+		u_char i, j;
+
+		i = inb(iobase + com_iir);
+		outb(iobase + com_cfcr, 0xff);
+		outb(iobase + com_iir, 0x0);
+		outb(iobase + com_cfcr, CFCR_8BITS);
+		j = inb(iobase + com_iir);
+		outb(iobase + com_iir, i);
+		if (i != j) {
+			printf(" 16550A");
+		} else {
+			com->tx_fifo_size = 32;
+			printf(" 16650");
+			kdc_sio[unit].kdc_description =
+			  "Serial port: Startech 16C650 or similar";
+		}
+		if (!com->tx_fifo_size)
+			printf(" fifo disabled");
+		}
 		break;
 	}
 	outb(iobase + com_fifo, 0);
@@ -867,7 +884,7 @@ determined_type: ;
 	kdc_sio[unit].kdc_state = (unit == comconsole) ? DC_BUSY : DC_IDLE;
 
 #ifdef KGDB
-	if (kgdb_dev == makedev(commajor, unit)) {
+	if (kgdb_dev == makedev(CDEV_MAJOR, unit)) {
 		if (unit == comconsole)
 			kgdb_dev = -1;	/* can't debug over console port */
 		else {
@@ -1018,7 +1035,6 @@ open_top:
 		tp->t_termios = mynor & CALLOUT_MASK
 				? com->it_out : com->it_in;
 		(void)commctl(com, TIOCM_DTR | TIOCM_RTS, DMSET);
-		com->ftl_max = com->ftl_init;
 		com->poll = com->no_irq;
 		com->poll_output = com->loses_outints;
 		++com->wopeners;
@@ -1045,8 +1061,7 @@ open_top:
 			 */
 			while (TRUE) {
 				outb(iobase + com_fifo,
-				     FIFO_RCV_RST | FIFO_XMT_RST
-				     | FIFO_ENABLE | com->ftl);
+				     FIFO_RCV_RST | FIFO_XMT_RST | com->ftl);
 				DELAY(100);
 				if (!(inb(com->line_status_port) & LSR_RXRDY))
 					break;
@@ -1161,7 +1176,7 @@ comhardclose(com)
 	outb(iobase + com_cfcr, com->cfcr_image &= ~CFCR_SBREAK);
 #ifdef KGDB
 	/* do not disable interrupts or hang up if debugging */
-	if (kgdb_dev != makedev(commajor, unit))
+	if (kgdb_dev != makedev(CDEV_MAJOR, unit))
 #endif
 	{
 		outb(iobase + com_ier, 0);
@@ -1373,7 +1388,7 @@ siointr1(com)
 			if (recv_data == FRAME_END
 			    && (   com->tp == NULL
 				|| !(com->tp->t_state & TS_ISOPEN))
-			    && kgdb_dev == makedev(commajor, unit)) {
+			    && kgdb_dev == makedev(CDEV_MAJOR, unit)) {
 				kgdb_connect(0);
 				continue;
 			}
@@ -1882,10 +1897,8 @@ comparam(tp, t)
 		 * latencies are larger.
 		 */
 		com->ftl = t->c_ospeed <= 4800
-			   ? FIFO_TRIGGER_1 : FIFO_TRIGGER_14;
-		if (com->ftl > com->ftl_max)
-			com->ftl = com->ftl_max;
-		outb(iobase + com_fifo, FIFO_ENABLE | com->ftl);
+			   ? 0 : FIFO_ENABLE | FIFO_RX_HIGH;
+		outb(iobase + com_fifo, com->ftl);
 	}
 
 	/*
@@ -2252,30 +2265,6 @@ comwakeup(chan)
 			log(LOG_ERR, "sio%d: %u more %s%s (total %lu)\n",
 			    unit, delta, error_desc[errnum],
 			    delta == 1 ? "" : "s", total);
-#if 0
-			/*
-			 * XXX if we resurrect this then we should move
-			 * the dropping of the ftl to somewhere with less
-			 * latency.
-			 */
-			if (errnum == CE_OVERRUN && com->hasfifo
-			    && com->ftl > FIFO_TRIGGER_1) {
-				static	u_char	ftl_in_bytes[] =
-					{ 1, 4, 8, 14, };
-
-				com->ftl_init = FIFO_TRIGGER_8;
-#define	FIFO_TRIGGER_DELTA	FIFO_TRIGGER_4
-				com->ftl_max =
-				com->ftl -= FIFO_TRIGGER_DELTA;
-				outb(com->iobase + com_fifo,
-				     FIFO_ENABLE | com->ftl);
-				log(LOG_DEBUG,
-				    "sio%d: reduced fifo trigger level to %d\n",
-				    unit,
-				    ftl_in_bytes[com->ftl
-						 / FIFO_TRIGGER_DELTA]);
-			}
-#endif
 		}
 	}
 }
@@ -2403,12 +2392,6 @@ siocnprobe(cp)
 {
 	int	unit;
 
-	/* locate the major number */
-	/* XXX - should be elsewhere since KGDB uses it */
-	for (commajor = 0; commajor < nchrdev; commajor++)
-		if (cdevsw[commajor].d_open == sioopen)
-			break;
-
 	/* XXX: ick */
 	unit = DEV_TO_UNIT(CONUNIT);
 	siocniobase = CONADDR;
@@ -2416,7 +2399,7 @@ siocnprobe(cp)
 	/* make sure hardware exists?  XXX */
 
 	/* initialize required fields */
-	cp->cn_dev = makedev(commajor, unit);
+	cp->cn_dev = makedev(CDEV_MAJOR, unit);
 #ifdef COMCONSOLE
 	cp->cn_pri = CN_REMOTE;		/* Force a serial port console */
 #else
@@ -2625,4 +2608,3 @@ static void 	sio_drvinit(void *unused)
 
 SYSINIT(siodev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,sio_drvinit,NULL)
 
-#endif /* NSIO > 0 */
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index d43bcdf..bc77dd6 100644
--- a/sys/dev/sio/sioreg.h
+++ b/sys/dev/sio/sioreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- *	$Id: sioreg.h,v 1.2 1993/10/16 19:17:18 rgrimes Exp $
+ *	$Id: sioreg.h,v 1.3 1995/01/20 07:34:18 wpaul Exp $
  */
 
 
@@ -59,10 +59,10 @@
 #define	FIFO_RCV_RST	0x02
 #define	FIFO_XMT_RST	0x04
 #define	FIFO_DMA_MODE	0x08
-#define	FIFO_TRIGGER_1	0x00
-#define	FIFO_TRIGGER_4	0x40
-#define	FIFO_TRIGGER_8	0x80
-#define	FIFO_TRIGGER_14	0xc0
+#define	FIFO_RX_LOW	0x00
+#define	FIFO_RX_MEDL	0x40
+#define	FIFO_RX_MEDH	0x80
+#define	FIFO_RX_HIGH	0xc0
 
 /* character format control register */
 #define	CFCR_DLAB	0x80
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index db7c92d..6c3634d 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.134 1995/12/07 12:46:08 davidg Exp $
+ *  $Id: syscons.c,v 1.135 1995/12/08 11:15:28 julian Exp $
  */
 
 #include "sc.h"
@@ -109,7 +109,6 @@ static  const u_int     n_fkey_tab = sizeof(fkey_tab) / sizeof(*fkey_tab);
 static  int     	delayed_next_scr = FALSE;
 static  long        	scrn_blank_time = 0;    /* screen saver timeout value */
 	int     	scrn_blanked = FALSE;   /* screen saver active flag */
-static  int     	scrn_saver = 0;    	/* screen saver routine */
 static  long       	scrn_time_stamp;
 	u_char      	scr_map[256];
 static  char        	*video_mode_ptr = NULL;
@@ -126,10 +125,15 @@ static  u_short mouse_or_mask[16] = {
 	0x0c00, 0x0c00, 0x0600, 0x0600, 0x0000, 0x0000, 0x0000, 0x0000
 };
 
-extern	void    none_saver(int blank);
-void    none_saver(int blank) { }
+static void    none_saver(int blank) { }
+
 void    (*current_saver) __P((int blank)) = none_saver;
 
+static int scattach(struct isa_device *dev);
+static int scparam(struct tty *tp, struct termios *t);
+static int scprobe(struct isa_device *dev);
+static void scstart(struct tty *tp);
+
 /* OS specific stuff */
 #ifdef not_yet_done
 #define VIRTUAL_TTY(x)  (sccons[x] = ttymalloc(sccons[x]))
@@ -138,8 +142,7 @@ struct  tty         	*sccons[MAXCONS+1];
 #else
 #define VIRTUAL_TTY(x)  &sccons[x]
 #define CONSOLE_TTY 	&sccons[MAXCONS]
-struct  tty         	sccons[MAXCONS+1];
-int			nsccons = MAXCONS+1;
+static struct tty     	sccons[MAXCONS+1];
 #endif
 #define MONO_BUF    	pa_to_va(0xB0000)
 #define CGA_BUF     	pa_to_va(0xB8000)
@@ -195,7 +198,7 @@ mask2attr(struct term_stat *term)
     return attr;
 }
 
-int
+static int
 scprobe(struct isa_device *dev)
 {
     int i, retries = 5;
@@ -284,7 +287,7 @@ scresume(void *dummy)
 }
 #endif
 
-int
+static int
 scattach(struct isa_device *dev)
 {
     scr_stat	*scp;
@@ -528,7 +531,7 @@ scintr(int unit)
     }
 }
 
-int
+static int
 scparam(struct tty *tp, struct termios *t)
 {
     tp->t_ispeed = t->c_ispeed;
@@ -1147,7 +1150,7 @@ set_mouse_pos:
     return(ENOTTY);
 }
 
-void
+static void
 scstart(struct tty *tp)
 {
     struct clist *rbp;
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index ab928ac..6c895e2 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.12 1995/11/04 17:07:52 bde Exp $
+ *	$Id: syscons.h,v 1.13 1995/11/28 00:17:32 ache Exp $
  */
 
 #ifndef _I386_ISA_SYSCONS_H_
@@ -177,10 +177,6 @@ typedef struct default_attr {
 } default_attr;
 
 /* function prototypes */
-int scprobe(struct isa_device *dev);
-int scattach(struct isa_device *dev);
-int scparam(struct tty *tp, struct termios *t);
-void scstart(struct tty *tp);
 static void scinit(void);
 static u_int scgetc(int noblock);
 static scr_stat *get_scr_stat(dev_t dev);