diff options
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/ccd/ccd.c | 17 | ||||
-rw-r--r-- | sys/dev/cy/cy.c | 6 | ||||
-rw-r--r-- | sys/dev/cy/cy_isa.c | 6 | ||||
-rw-r--r-- | sys/dev/dgb/dgb.c | 22 | ||||
-rw-r--r-- | sys/dev/dgb/dgreg.h | 4 | ||||
-rw-r--r-- | sys/dev/eisa/eisaconf.c | 4 | ||||
-rw-r--r-- | sys/dev/ep/if_ep.c | 7 | ||||
-rw-r--r-- | sys/dev/ep/if_ep_eisa.c | 4 | ||||
-rw-r--r-- | sys/dev/fe/if_fe.c | 3 | ||||
-rw-r--r-- | sys/dev/lnc/if_lnc.c | 2 | ||||
-rw-r--r-- | sys/dev/mcd/mcd.c | 4 | ||||
-rw-r--r-- | sys/dev/rc/rc.c | 13 | ||||
-rw-r--r-- | sys/dev/si/si.c | 12 |
13 files changed, 40 insertions, 64 deletions
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index f56b78b..05451a9 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -1,4 +1,4 @@ -/* $Id: ccd.c,v 1.11 1996/05/13 08:38:15 asami Exp $ */ +/* $Id: ccd.c,v 1.12 1996/05/13 09:17:42 asami Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ @@ -215,7 +215,9 @@ static void ccdmakedisklabel __P((struct ccd_softc *)); static int ccdlock __P((struct ccd_softc *)); static void ccdunlock __P((struct ccd_softc *)); +#ifdef CCD_DEBUG static void loopdelay __P((void)); +#endif #ifdef DEBUG static void printiinfo __P((struct ccdiinfo *)); @@ -701,8 +703,7 @@ ccdstrategy(bp) { register int unit = ccdunit(bp->b_dev); register struct ccd_softc *cs = &ccd_softc[unit]; - register daddr_t bn; - register int sz, s; + register int s; int wlabel; struct disklabel *lp; @@ -1076,6 +1077,7 @@ ccdwrite(dev, uio, flags) return (physio(ccdstrategy, NULL, dev, B_WRITE, minphys, uio)); } +#ifdef CCD_DEBUG static void loopdelay() { @@ -1087,6 +1089,7 @@ loopdelay() for (k = 0; k < 100; k++) l = i * j * k; } +#endif int ccdioctl(dev, cmd, data, flag, p) @@ -1480,14 +1483,9 @@ ccdgetdisklabel(dev) struct ccd_softc *cs = &ccd_softc[unit]; char *errstring; struct disklabel *lp = &cs->sc_dkdev.dk_label; -/* struct cpu_disklabel *clp = &cs->sc_dkdev.dk_cpulabel; */ struct ccdgeom *ccg = &cs->sc_geom; - struct dos_partition dos_partdummy; - struct dkbad dkbaddummy; - bzero(lp, sizeof(*lp)); -/* bzero(clp, sizeof(*clp)); */ lp->d_secperunit = cs->sc_size; lp->d_secsize = ccg->ccg_secsize; @@ -1519,8 +1517,7 @@ ccdgetdisklabel(dev) * Call the generic disklabel extraction routine. */ if (errstring = readdisklabel(CCDLABELDEV(dev), ccdstrategy, - &cs->sc_dkdev.dk_label/*, &dos_partdummy, &dkbaddummy*/)) - /*, &cs->sc_dkdev.dk_cpulabel)) */ + &cs->sc_dkdev.dk_label)) ccdmakedisklabel(cs); #ifdef DEBUG diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 5ebc51a..a4b8034 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/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/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 5ebc51a..a4b8034 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.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/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c index a73fb53..243c424 100644 --- a/sys/dev/dgb/dgb.c +++ b/sys/dev/dgb/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id: dgb.c,v 1.16 1996/03/28 14:27:26 scrappy Exp $ + * dgb.c $Id: dgb.c,v 1.17 1996/03/29 11:39:08 bde Exp $ * * Digiboard driver. * @@ -168,7 +168,6 @@ static struct tty dgb_tty[NDGBPORTS]; */ /* Interrupt handling entry points. */ -static void dgbintr __P((int unit)); static void dgbpoll __P((void *unit_c)); /* Device switch entry points. */ @@ -211,8 +210,6 @@ static struct cdevsw dgb_cdevsw = ttselect, nommap, NULL, "dgb", NULL, -1 }; static speed_t dgbdefaultrate = TTYDEF_SPEED; -static u_int dgb_events; /* input chars + weighted output completions */ -static int dgbmajor; static struct speedtab dgbspeedtab[] = { 0, 0, /* old (sysV-like) Bx codes */ @@ -240,9 +237,6 @@ static int dgbdebug=0; SYSCTL_INT(_debug, OID_AUTO, dgb_debug, CTLFLAG_RW, &dgbdebug, 0, ""); - -static int polltimeout=0; - static int setwin __P((struct dgb_softc *sc, unsigned addr)); static int setinitwin __P((struct dgb_softc *sc, unsigned addr)); static void hidewin __P((struct dgb_softc *sc)); @@ -305,10 +299,8 @@ dgbprobe(dev) struct isa_device *dev; { struct dgb_softc *sc= &dgb_softc[dev->id_unit]; - int i, v, t; + int i, v; u_long win_size; /* size of vizible memory window */ - u_char *mem; - int addr; int unit=dev->id_unit; sc->unit=dev->id_unit; @@ -451,7 +443,6 @@ dgbattach(dev) int addr; struct dgb_p *port; struct board_chan *bc; - struct global_data *gd; int shrinkmem; int nfails; ushort *pstat; @@ -1127,7 +1118,6 @@ dgbhardclose(port) { struct dgb_softc *sc=&dgb_softc[port->unit]; struct board_chan *bc=port->brdchan; - int s; setwin(sc,0); @@ -1424,12 +1414,6 @@ dgbpoll(unit_c) timeout(dgbpoll, unit_c, hz/25); } -static void -dgbintr(unit) - int unit; -{ -} - static int dgbioctl(dev, cmd, data, flag, p) dev_t dev; @@ -1680,7 +1664,6 @@ static int dgbdrain(port) struct dgb_p *port; { - struct tty *tp=port->tty; struct dgb_softc *sc=&dgb_softc[port->unit]; struct board_chan *bc=port->brdchan; int error; @@ -1787,7 +1770,6 @@ dgbparam(tp, t) struct termios *t; { int dev=tp->t_dev; - int mynor=minor(dev); int unit=MINOR_TO_UNIT(dev); int pnum=MINOR_TO_PORT(dev); struct dgb_softc *sc=&dgb_softc[unit]; diff --git a/sys/dev/dgb/dgreg.h b/sys/dev/dgb/dgreg.h index 93f327d..3864d07 100644 --- a/sys/dev/dgb/dgreg.h +++ b/sys/dev/dgb/dgreg.h @@ -1,5 +1,5 @@ /*- - * dgreg.h $Id: dgreg.h,v 1.2 1995/10/04 21:51:26 jkh Exp $ + * dgreg.h $Id: dgreg.h,v 1.3 1995/12/22 16:08:15 bde Exp $ * * Digiboard driver. * @@ -253,7 +253,7 @@ struct board_chan { #define PCXE 1 #define PCXEVE 2 -static char *board_desc[] = { +static char * const board_desc[] = { "PC/Xi (64K)", "PC/Xe (64K)", "PC/Xe (8K) ", diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c index 37f1697..7a71910 100644 --- a/sys/dev/eisa/eisaconf.c +++ b/sys/dev/eisa/eisaconf.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: eisaconf.c,v 1.18 1996/04/07 17:03:12 bde Exp $ + * $Id: eisaconf.c,v 1.19 1996/04/20 21:21:49 gibbs Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -673,8 +673,6 @@ eisa_registerdev(e_dev, driver, kdc_template) struct eisa_driver *driver; struct kern_devconf *kdc_template; { - resvaddr_t *node; - e_dev->driver = driver; /* Driver now owns this device */ e_dev->kdc = (struct kern_devconf *)malloc(sizeof(struct kern_devconf), M_DEVBUF, M_NOWAIT); diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index aecba9b..a6a24df 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.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/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c index bd1955f..43b317d 100644 --- a/sys/dev/ep/if_ep_eisa.c +++ b/sys/dev/ep/if_ep_eisa.c @@ -19,7 +19,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: 3c5x9.c,v 1.1 1996/02/26 01:01:37 gibbs Exp $ + * $Id: 3c5x9.c,v 1.2 1996/02/28 17:18:55 gibbs Exp $ */ #include "eisa.h" @@ -127,7 +127,6 @@ ep_eisa_probe(void) { u_long iobase; struct eisa_device *e_dev = NULL; - int stat = 0; int count; count = 0; @@ -204,7 +203,6 @@ ep_eisa_attach(e_dev) resvaddr_t *ioport; resvaddr_t *eisa_ioport; u_char level_intr; - u_short conf; int i; /* diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c index 073379f..eb7ec89 100644 --- a/sys/dev/fe/if_fe.c +++ b/sys/dev/fe/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/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c index 3e060a4..46afc70 100644 --- a/sys/dev/lnc/if_lnc.c +++ b/sys/dev/lnc/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/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 96eccec..f13b72a 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/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/dev/rc/rc.c b/sys/dev/rc/rc.c index d05b423..b9bd2c4 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/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/dev/si/si.c b/sys/dev/si/si.c index b9498c4..076f12e 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/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)); |