Clean up -Wunused warnings.

Reviewed by:		bde

18 files changed, 47 insertions, 51 deletions

diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 5447efc..33a2378 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: aha1542.c,v 1.57 1996/03/31 18:19:38 gibbs Exp $
+ *      $Id: aha1542.c,v 1.58 1996/04/07 17:32:08 bde Exp $
  */
 
 /*
@@ -325,7 +325,10 @@ static struct aha_data {
 
 static u_int32_t	aha_adapter_info __P((int unit));
 static int	ahaattach __P((struct isa_device *dev));
+#ifdef	TUNE_1542
 static int	aha_bus_speed_check __P((struct aha_data *aha, int speed));
+static int	aha_set_bus_speed __P((struct aha_data *aha));
+#endif
 static int	aha_cmd __P((struct aha_data *aha, int icnt, int ocnt, int wait,
 			     u_char *retval, u_char opcode, ...));
 static void	aha_done __P((struct aha_data *aha, struct aha_ccb *ccb));
@@ -341,7 +344,6 @@ static int	aha_poll __P((struct aha_data *aha, struct scsi_xfer *xs,
 static int	ahaprobe __P((struct isa_device *dev));
 static void	aha_registerdev __P((struct isa_device *id));
 static int32_t	aha_scsi_cmd __P((struct scsi_xfer *xs));
-static int	aha_set_bus_speed __P((struct aha_data *aha));
 static timeout_t
 		aha_timeout;
 static char	*board_rev __P((struct aha_data *aha, int type));
diff --git a/sys/i386/isa/b004.c b/sys/i386/isa/b004.c
index 5b56a34..f0079a1 100644
--- a/sys/i386/isa/b004.c
+++ b/sys/i386/isa/b004.c
@@ -66,9 +66,6 @@
 #include <i386/isa/isa_device.h>
 
 
-static u_char d_inb(u_int port);
-static void d_outb(u_int port, u_char data);
-
 static struct kern_devconf kdc_bqu[NBQU] = { {
 	0, 0, 0,		/* filled in by dev_attach */
 	"bqu", 0, { MDDT_ISA, 0 },
@@ -93,6 +90,9 @@ static struct kern_devconf kdc_bqu[NBQU] = { {
 #undef B004_DEBUG_2
 
 #ifdef B004_DEBUG
+static u_char d_inb(u_int port);
+static void d_outb(u_int port, u_char data);
+
 #define out(port,data)	d_outb(port, data)
 #define in(a)		d_inb(((u_int)a))
 #else
@@ -150,7 +150,7 @@ b004_base_addresses[B004_CHANCE] = {
     0x150, 0x190, 0, 0, 0, 0, 0, 0
 };
 
-
+#ifdef B004_DEBUG
 static void
 d_outb(u_int port, u_char data)
 {
@@ -159,13 +159,15 @@ d_outb(u_int port, u_char data)
 	outb(port,data);
 }
 
-static u_char d_inb(u_int port)
+static u_char
+d_inb(u_int port)
 {
 u_char ap;
 	ap=inb(port);
 	printf("INPUT 0x%x FROM 0x%x\n",ap,port);
 	return(ap);
 }
+#endif
 
 static int
 detected(int base)
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 5ebc51a..a4b8034 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,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: cy.c,v 1.31 1996/03/27 20:03:23 bde Exp $
+ *	$Id: cy.c,v 1.32 1996/05/02 09:34:34 phk Exp $
  */
 
 #include "cy.h"
@@ -343,7 +343,9 @@ static	int	sioattach	__P((struct isa_device *dev));
 static	void	cd1400_channel_cmd __P((cy_addr iobase, int cmd));
 static	timeout_t siodtrwakeup;
 static	void	comhardclose	__P((struct com_s *com));
+#if 0
 static	void	siointr1	__P((struct com_s *com));
+#endif
 static	int	commctl		__P((struct com_s *com, int bits, int how));
 static	int	comparam	__P((struct tty *tp, struct termios *t));
 static	int	sioprobe	__P((struct isa_device *dev));
@@ -1352,11 +1354,13 @@ cont:
 	schedsofttty();
 }
 
+#if 0
 static void
 siointr1(com)
 	struct com_s	*com;
 {
 }
+#endif
 
 static int
 sioioctl(dev, cmd, data, flag, p)
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index 430a44b..8e98fc2 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -484,7 +484,6 @@ gscattach(struct isa_device *isdp)
 {
   int unit = isdp->id_unit;
   struct gsc_unit *scu = unittab + unit;
-  char	name[32];
 
   scu->flags |= FLAG_DEBUG;
 
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index aecba9b..a6a24df 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.43 1996/02/28 17:19:03 gibbs Exp $
+ *  $Id: if_ep.c,v 1.44 1996/05/24 15:22:36 gibbs Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -196,7 +196,7 @@ static struct ep_board *
 ep_look_for_board_at(is)
     struct isa_device *is;
 {
-    int data, i, j, io_base, id_port = ELINK_ID_PORT;
+    int data, i, j, id_port = ELINK_ID_PORT;
     int count = 0;
 
     if (ep_current_tag == (EP_LAST_TAG + 1)) {
@@ -364,7 +364,6 @@ ep_isa_probe(is)
     struct ep_softc *sc;
     struct ep_board *epb;
     u_short k;
-    int i;
 
     if(( epb=ep_look_for_board_at(is) )==0)
 	return (0);
@@ -573,7 +572,7 @@ epinit(sc)
     struct ep_softc *sc;
 {
     register struct ifnet *ifp = &sc->arpcom.ac_if;
-    int s, i, j;
+    int s, i;
 
 	/*
     if (ifp->if_addrlist == (struct ifaddr *) 0)
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 073379f..eb7ec89 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.13 1996/04/07 17:50:09 bde Exp $
+ * $Id: if_fe.c,v 1.14 1996/04/23 18:36:55 nate Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -2632,7 +2632,6 @@ fe_write_mbufs ( struct fe_softc *sc, struct mbuf *m )
 {
 	u_short addr_bmpr8 = sc->ioaddr[ FE_BMPR8 ];
 	u_short length, len;
-	short pad;
 	struct mbuf *mp;
 	u_char *data;
 	u_short savebyte;	/* WARNING: Architecture dependent!  */
diff --git a/sys/i386/isa/if_ix.c b/sys/i386/isa/if_ix.c
index 9f081cc..9a33ebd 100644
--- a/sys/i386/isa/if_ix.c
+++ b/sys/i386/isa/if_ix.c
@@ -28,7 +28,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: if_ix.c,v 1.18 1996/01/26 09:27:27 phk Exp $
+ *	$Id: if_ix.c,v 1.19 1996/02/06 18:50:46 wollman Exp $
  */
 
 #include "ix.h"
@@ -567,8 +567,6 @@ ixattach(struct isa_device *dvp) {
 	int 			unit = dvp->id_unit;
 	ix_softc_t		*sc = &ix_softc[unit];
 	struct ifnet		*ifp = &sc->arpcom.ac_if;
-	struct ifaddr		*ifa;
-	struct sockaddr_dl	*sdl;
 
 	DEBUGBEGIN(DEBUGATTACH)
 	DEBUGDO(printf("ixattach:");)
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 5371061..513ea29 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -21,7 +21,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: if_le.c,v 1.30 1996/02/06 18:50:47 wollman Exp $
+ * $Id: if_le.c,v 1.31 1996/03/23 19:34:12 fenner Exp $
  */
 
 /*
@@ -390,7 +390,6 @@ le_attach(
 {
     le_softc_t *sc = &le_softc[dvp->id_unit];
     struct ifnet *ifp = &sc->le_if;
-    struct ifaddr *ifa = ifp->if_addrlist;
 
     ifp->if_softc = sc;
     ifp->if_mtu = ETHERMTU;
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 3e060a4..46afc70 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -126,7 +126,9 @@ static struct lnc_softc {
 	LNCSTATS_STRUCT
 } lnc_softc[NLNC];
 
+#ifdef LNC_MULTICAST
 static void lnc_setladrf __P((struct lnc_softc *sc));
+#endif
 static void lnc_stop __P((int unit));
 static void lnc_reset __P((int unit));
 static void lnc_free_mbufs __P((struct lnc_softc *sc));
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 53330a0..45d6315 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.28 1996/01/26 09:27:33 phk Exp $
+ * $Id: if_ze.c,v 1.29 1996/02/06 18:50:50 wollman Exp $
  */
 
 #include "ze.h"
@@ -581,8 +581,6 @@ ze_attach(isa_dev)
 {
 	struct ze_softc *sc = &ze_softc[isa_dev->id_unit];
 	struct ifnet *ifp = &sc->arpcom.ac_if;
-	struct ifaddr *ifa;
-	struct sockaddr_dl *sdl;
 	int pl;
 
 	/* PCMCIA card can be offlined. Reconfiguration is required */
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index 242e27e..f5d53fe 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.18 1996/03/23 21:32:39 nate Exp $
+ *	$Id: if_zp.c,v 1.19 1996/06/04 21:41:01 nate Exp $
  */
 /*-
  * TODO:
@@ -477,8 +477,6 @@ zpattach(isa_dev)
 	struct zp_softc *sc = &zp_softc[isa_dev->id_unit];
 	struct ifnet *ifp = &sc->arpcom.ac_if;
 	u_short i;
-	struct ifaddr *ifa;
-	struct sockaddr_dl *sdl;
 	int     pl;
 
 	/* PCMCIA card can be offlined. Reconfiguration is required */
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 96eccec..f13b72a 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,9 +40,9 @@
  * 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.78 1996/05/03 16:49:02 phk Exp $
+ *	$Id: mcd.c,v 1.79 1996/06/08 09:18:21 bde Exp $
  */
-static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
+static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
 #if NMCD > 0
diff --git a/sys/i386/isa/qcam.c b/sys/i386/isa/qcam.c
index 2ff00c6..837b391d 100644
--- a/sys/i386/isa/qcam.c
+++ b/sys/i386/isa/qcam.c
@@ -154,9 +154,6 @@ qcam_registerdev (struct isa_device *id)
 static int
 qcam_probe (struct isa_device *devp)
 {
-	u_char reg, last;
-	int i, transitions = 0;
-
 	switch (devp->id_iobase) {	/* don't probe weird ports */
 	case IO_LPT1:
 	case IO_LPT2:
diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c
index f2f51a9..8944a9d 100644
--- a/sys/i386/isa/random_machdep.c
+++ b/sys/i386/isa/random_machdep.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id: random_machdep.c,v 1.6 1996/04/07 18:16:26 bde Exp $
+ * $Id: random_machdep.c,v 1.7 1996/06/08 08:18:00 bde Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
@@ -98,7 +98,9 @@ static u_int32_t random_pool[POOLWORDS];
 static struct timer_rand_state keyboard_timer_state;
 static struct timer_rand_state extract_timer_state;
 static struct timer_rand_state irq_timer_state[ICU_LEN];
+#ifdef notyet
 static struct timer_rand_state blkdev_timer_state[MAX_BLKDEV];
+#endif
 static struct wait_queue *random_wait;
 
 inthand2_t *sec_intr_handler[ICU_LEN];
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index d05b423..b9bd2c4 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -152,7 +152,7 @@ static int rc_scheduled_event = 0;
 
 /* for pstat -t */
 static struct tty rc_tty[NRC * CD180_NCHAN];
-static int        nrc_tty = NRC * CD180_NCHAN;
+static const int  nrc_tty = NRC * CD180_NCHAN;
 
 /* Flags */
 #define RC_DTR_OFF      0x0001          /* DTR wait, for close/open     */
@@ -258,7 +258,7 @@ static int
 rcattach(dvp)
 	struct  isa_device      *dvp;
 {
-	register int            i, chan, nec = dvp->id_iobase;
+	register int            chan, nec = dvp->id_iobase;
 	struct rc_softc         *rcb = &rc_softc[dvp->id_unit];
 	struct rc_chans         *rc  = &rc_chans[dvp->id_unit * CD180_NCHAN];
 	static int              rc_wakeup_started = 0;
@@ -595,9 +595,8 @@ void rcpoll()
 	register struct rc_chans *rc;
 	register struct rc_softc *rcb;
 	register u_char        *tptr, *eptr;
-	register int            s;
 	register struct tty    *tp;
-	register int            chan, icnt, c, nec, unit;
+	register int            chan, icnt, nec, unit;
 
 	if (rc_scheduled_event == 0)
 		return;
@@ -1110,7 +1109,7 @@ static void rc_reinit(rcb)
 struct rc_softc         *rcb;
 {
 	register struct rc_chans       *rc, *rce;
-	register int                    i, nec;
+	register int                    nec;
 
 	nec = rcb->rcb_addr;
 	rc_hwreset(rcb->rcb_unit, nec, RC_FAKEID);
@@ -1272,7 +1271,7 @@ int rc_test(nec, unit)
 	register int    nec;
 	int             unit;
 {
-	int     chan = 0, nopt = 0;
+	int     chan = 0;
 	int     i = 0, rcnt, old_level;
 	unsigned int    iack, chipid;
 	unsigned short  divs;
@@ -1482,8 +1481,6 @@ static void
 rc_wakeup(chan)
 	void	*chan;
 {
-	int		unit;
-
 	timeout(rc_wakeup, (caddr_t)NULL, 1);
 
 	if (rc_scheduled_event != 0) {
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index b9498c4..076f12e 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -30,13 +30,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.41 1996/05/30 23:41:35 peter Exp $
+ *	$Id: si.c,v 1.42 1996/06/08 10:18:12 peter Exp $
  */
 
 #ifndef lint
-static char si_copyright1[] =  "@(#) (C) Specialix International, 1990,1992",
-            si_copyright2[] =  "@(#) (C) Andy Rutter 1993",
-            si_copyright3[] =  "@(#) (C) Peter Wemm 1995";
+static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,1992",
+                  si_copyright2[] =  "@(#) (C) Andy Rutter 1993",
+                  si_copyright3[] =  "@(#) (C) Peter Wemm 1995";
 #endif	/* not lint */
 
 #include <sys/param.h>
@@ -234,7 +234,6 @@ static int si_pollrate;			/* in addition to irq */
 SYSCTL_INT(_machdep, OID_AUTO, si_pollrate, CTLFLAG_RD, &si_pollrate, 0, "");
 		 
 static int init_finished = 0;
-static int fastpoll = 0;
 static void si_poll __P((void *));
 #endif
 
@@ -494,9 +493,6 @@ siattach(id)
 	struct speedtab *spt;
 	int nmodule, nport, x, y;
 	int uart_type;
-#ifdef DEVFS
-	char	name[32];
-#endif
 
 	DPRINT((0, DBG_AUTOBOOT, "si%d: siattach\n", id->id_unit));
 
diff --git a/sys/i386/isa/sound/dmabuf.c b/sys/i386/isa/sound/dmabuf.c
index b0a6d1f..bb64d7d 100644
--- a/sys/i386/isa/sound/dmabuf.c
+++ b/sys/i386/isa/sound/dmabuf.c
@@ -678,8 +678,9 @@ DMAbuf_start_dma (int dev, unsigned long physaddr, int count, int dma_mode)
 {
   int             chan = audio_devs[dev]->dmachan;
   struct dma_buffparms *dmap = audio_devs[dev]->dmap;
+#ifdef linux
   unsigned long   flags;
-
+#endif
   /*
    * This function is not as portable as it should be.
    */
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index d508982..df8b99b 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.108 1996/05/03 14:57:27 phk Exp $
+ *	$Id: wd.c,v 1.109 1996/06/08 10:03:35 bde Exp $
  */
 
 /* TODO:
@@ -282,7 +282,9 @@ static int wdcontrol(struct buf *bp);
 static int wdcommand(struct disk *du, u_int cylinder, u_int head,
 		     u_int sector, u_int count, u_int command);
 static int wdsetctlr(struct disk *du);
+#if 0
 static int wdwsetctlr(struct disk *du);
+#endif
 static int wdgetctlr(struct disk *du);
 static void wderror(struct buf *bp, struct disk *du, char *mesg);
 static void wdflushirq(struct disk *du, int old_ipl);
@@ -731,7 +733,6 @@ wdstart(int ctrlr)
 	if (wdtab[ctrlr].b_active)
 		return;
 #endif
-loop:
 	/* is there a drive for the controller to do a transfer with? */
 	bp = wdtab[ctrlr].controller_queue.tqh_first;
 	if (bp == NULL) {
@@ -1452,6 +1453,7 @@ wdsetctlr(struct disk *du)
 	return (0);
 }
 
+#if 0
 /*
  * Wait until driver is inactive, then set up controller.
  */
@@ -1468,6 +1470,7 @@ wdwsetctlr(struct disk *du)
 	splx(x);
 	return (stat);
 }
+#endif
 
 /*
  * issue READP to drive to ask it what it is.