diff options
| author | christos <christos@NetBSD.org> | 2014-03-24 18:39:57 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2014-03-24 18:39:57 +0000 |
| commit | 541ef57bc8ca4a673ef1c965bb25fb755de8911c (patch) | |
| tree | 6f0c2030562684d9d1c77d92eb3e6e7d2ef52329 /sys/arch/atari/dev | |
| parent | c1a7a9bb0085185e1d9f7429e9d5593dbbc9ac6c (diff) | |
- remove unused
- use cpu_{g,s}etmodel() (not committed yet)
Diffstat (limited to 'sys/arch/atari/dev')
| -rw-r--r-- | sys/arch/atari/dev/atari5380.c | 8 | ||||
| -rw-r--r-- | sys/arch/atari/dev/clock.c | 7 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ite.c | 16 | ||||
| -rw-r--r-- | sys/arch/atari/dev/kbd.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ncr5380.c | 9 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ser.c | 5 | ||||
| -rw-r--r-- | sys/arch/atari/dev/zs.c | 5 |
7 files changed, 22 insertions, 34 deletions
diff --git a/sys/arch/atari/dev/atari5380.c b/sys/arch/atari/dev/atari5380.c index 12a5feea04b..639b7e4aa8b 100644 --- a/sys/arch/atari/dev/atari5380.c +++ b/sys/arch/atari/dev/atari5380.c @@ -1,4 +1,4 @@ -/* $NetBSD: atari5380.c,v 1.59 2012/02/12 16:34:07 matt Exp $ */ +/* $NetBSD: atari5380.c,v 1.60 2014/03/24 18:39:57 christos Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.59 2012/02/12 16:34:07 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.60 2014/03/24 18:39:57 christos Exp $"); #include "opt_atariscsi.h" @@ -325,10 +325,8 @@ scsi_tt_idisable(void) static inline void scsi_tt_clr_ipend(void) { - int tmp; - SCSI_DMA->s_dma_ctrl = 0; - tmp = GET_TT_REG(NCR5380_IRCV); + GET_TT_REG(NCR5380_IRCV); if (machineid & ATARI_TT) MFP2->mf_iprb = (uint8_t)~IB_SCDM; MFP2->mf_ipra = (uint8_t)~IA_SCSI; diff --git a/sys/arch/atari/dev/clock.c b/sys/arch/atari/dev/clock.c index d84887ac10c..6b7dce8e3a9 100644 --- a/sys/arch/atari/dev/clock.c +++ b/sys/arch/atari/dev/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.56 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: clock.c,v 1.57 2014/03/24 18:39:57 christos Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.56 2014/03/16 05:20:23 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.57 2014/03/24 18:39:57 christos Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -511,13 +511,10 @@ rtcclose(dev_t dev, int flag, int mode, struct lwp *l) int rtcread(dev_t dev, struct uio *uio, int flags) { - struct clock_softc *sc; mc_todregs clkregs; int s, length; char buffer[16 + 1]; - sc = device_lookup_private(&clock_cd, minor(dev)); - s = splhigh(); MC146818_GETTOD(RTC, &clkregs); splx(s); diff --git a/sys/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c index f8a58067c00..ff4bd31e094 100644 --- a/sys/arch/atari/dev/ite.c +++ b/sys/arch/atari/dev/ite.c @@ -1,4 +1,4 @@ -/* $NetBSD: ite.c,v 1.73 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: ite.c,v 1.74 2014/03/24 18:39:57 christos Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.73 2014/03/16 05:20:23 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.74 2014/03/24 18:39:57 christos Exp $"); #include "opt_ddb.h" @@ -593,12 +593,9 @@ void itestart(struct tty *tp) { struct clist *rbp; - struct ite_softc *sc; u_char buf[ITEBURST]; int s, len; - sc = getitesp(tp->t_dev); - KDASSERT(tp); s = spltty(); { @@ -629,9 +626,6 @@ void ite_on(dev_t dev, int flag) { struct ite_softc *sc; - int unit; - - unit = ITEUNIT(dev); sc = getitesp(dev); /* force ite active, overriding graphics mode */ @@ -758,13 +752,12 @@ ite_cnfilter(u_int c, enum caller caller) { struct key key; struct kbdmap *kbdmap; - u_char code, up, mask; + u_char code, up; int s; up = KBD_RELEASED(c); c = KBD_SCANCODE(c); code = 0; - mask = 0; kbdmap = (kbd_ite == NULL) ? &ascii_kbdmap : kbd_ite->kbdmap; s = spltty(); @@ -858,7 +851,7 @@ ite_filter(u_int c, enum caller caller) { struct tty *kbd_tty; struct kbdmap *kbdmap; - u_char code, *str, up, mask; + u_char code, *str, up; struct key key; int s, i; static bool again; @@ -878,7 +871,6 @@ ite_filter(u_int c, enum caller caller) up = KBD_RELEASED(c); c = KBD_SCANCODE(c); code = 0; - mask = 0; /* have to make sure we're at spltty in here */ s = spltty(); diff --git a/sys/arch/atari/dev/kbd.c b/sys/arch/atari/dev/kbd.c index ab1484e0a73..6a23127802a 100644 --- a/sys/arch/atari/dev/kbd.c +++ b/sys/arch/atari/dev/kbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd.c,v 1.43 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: kbd.c,v 1.44 2014/03/24 18:39:57 christos Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.43 2014/03/16 05:20:23 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.44 2014/03/24 18:39:57 christos Exp $"); #include "mouse.h" #include "ite.h" @@ -265,6 +265,7 @@ kbdenable(void) */ while (KBD->ac_cs & (A_IRQ|A_RXRDY)) code = KBD->ac_da; + __USE(code); /* * Enable interrupts from MFP */ @@ -401,6 +402,7 @@ kbdintr(int sr) } kbd_ring[kbd_rbput++ & KBD_RING_MASK] = KBD->ac_da; } + __USE(code); /* * If characters are waiting for transmit, send them. diff --git a/sys/arch/atari/dev/ncr5380.c b/sys/arch/atari/dev/ncr5380.c index 1ebb5eed64d..eb05ce4746f 100644 --- a/sys/arch/atari/dev/ncr5380.c +++ b/sys/arch/atari/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr5380.c,v 1.70 2012/10/27 17:17:43 chs Exp $ */ +/* $NetBSD: ncr5380.c,v 1.71 2014/03/24 18:39:57 christos Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.70 2012/10/27 17:17:43 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.71 2014/03/24 18:39:57 christos Exp $"); /* * Bit mask of targets you want debugging to be shown @@ -266,7 +266,6 @@ ncr5380_scsi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req, void *arg) { struct scsipi_xfer *xs; - struct scsipi_periph *periph; struct ncr_softc *sc; int sps; SC_REQ *reqp, *link, *tmp; @@ -277,7 +276,6 @@ ncr5380_scsi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req, switch (req) { case ADAPTER_REQ_RUN_XFER: xs = arg; - periph = xs->xs_periph; /* * We do not queue RESET commands @@ -1664,7 +1662,6 @@ static int reach_msg_out(struct ncr_softc *sc, u_long len) { uint8_t phase; - uint8_t data; u_long n = len; ncr_aprint(sc, "Trying to reach Message-out phase\n"); @@ -1684,7 +1681,7 @@ reach_msg_out(struct ncr_softc *sc, u_long len) if (((GET_5380_REG(NCR5380_IDSTAT) >> 2) & 7) != phase) break; if (PH_IN(phase)) { - data = GET_5380_REG(NCR5380_DATA); + GET_5380_REG(NCR5380_DATA); SET_5380_REG(NCR5380_ICOM, SC_A_ACK | SC_A_ATN); } else { SET_5380_REG(NCR5380_DATA, 0); diff --git a/sys/arch/atari/dev/ser.c b/sys/arch/atari/dev/ser.c index b68540a895a..0e5e438789f 100644 --- a/sys/arch/atari/dev/ser.c +++ b/sys/arch/atari/dev/ser.c @@ -1,4 +1,4 @@ -/* $NetBSD: ser.c,v 1.53 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: ser.c,v 1.54 2014/03/24 18:39:57 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -93,7 +93,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.53 2014/03/16 05:20:23 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.54 2014/03/24 18:39:57 christos Exp $"); #include "opt_ddb.h" #include "opt_mbtype.h" @@ -820,6 +820,7 @@ ser_iflush(struct ser_softc *sc) /* flush any pending I/O */ while (ISSET(MFP->mf_rsr, RSR_CIP|RSR_BFULL)) tmp = MFP->mf_udr; + __USE(tmp); } void diff --git a/sys/arch/atari/dev/zs.c b/sys/arch/atari/dev/zs.c index 9dea9e191ba..0523529b68f 100644 --- a/sys/arch/atari/dev/zs.c +++ b/sys/arch/atari/dev/zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.75 2014/03/16 05:20:23 dholland Exp $ */ +/* $NetBSD: zs.c,v 1.76 2014/03/24 18:39:57 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.75 2014/03/16 05:20:23 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.76 2014/03/24 18:39:57 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1334,5 +1334,6 @@ zs_loadchannelregs(struct zschan *zc, uint8_t *reg) ZS_WRITE(zc, 15, reg[15]); ZS_WRITE(zc, 3, reg[3]); ZS_WRITE(zc, 5, reg[5]); + __USE(i); } #endif /* NZS > 1 */ |
