Module Name: src
Committed By: christos
Date: Mon Mar 24 18:39:57 UTC 2014
Modified Files:
src/sys/arch/atari/atari: autoconf.c machdep.c
src/sys/arch/atari/dev: atari5380.c clock.c ite.c kbd.c ncr5380.c ser.c
zs.c
Log Message:
- remove unused
- use cpu_{g,s}etmodel() (not committed yet)
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/atari/atari/autoconf.c
cvs rdiff -u -r1.175 -r1.176 src/sys/arch/atari/atari/machdep.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/atari/dev/atari5380.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/atari/dev/clock.c
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/atari/dev/ite.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/atari/dev/kbd.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/atari/dev/ncr5380.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/atari/dev/ser.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/atari/dev/zs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/atari/atari/autoconf.c
diff -u src/sys/arch/atari/atari/autoconf.c:1.64 src/sys/arch/atari/atari/autoconf.c:1.65
--- src/sys/arch/atari/atari/autoconf.c:1.64 Sat Oct 27 13:17:42 2012
+++ src/sys/arch/atari/atari/autoconf.c Mon Mar 24 14:39:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.64 2012/10/27 17:17:42 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.65 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: autoconf.c,v 1.64 2012/10/27 17:17:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.65 2014/03/24 18:39:57 christos Exp $");
#include "opt_md.h"
@@ -95,14 +95,12 @@ cpu_rootconf(void)
if ((boothowto & RB_ASKNAME) != 0) {
int md_major, i;
- dev_t md_dev;
cfdata_t cf;
struct md_softc *sc;
md_major = devsw_name2blk("md", NULL, 0);
if (md_major >= 0) {
for (i = 0; i < RAMD_NDEV; i++) {
- md_dev = MAKEDISKDEV(md_major, i, RAW_PART);
cf = malloc(sizeof(*cf), M_DEVBUF,
M_ZERO|M_WAITOK);
if (cf == NULL)
Index: src/sys/arch/atari/atari/machdep.c
diff -u src/sys/arch/atari/atari/machdep.c:1.175 src/sys/arch/atari/atari/machdep.c:1.176
--- src/sys/arch/atari/atari/machdep.c:1.175 Fri Aug 10 13:43:32 2012
+++ src/sys/arch/atari/atari/machdep.c Mon Mar 24 14:39:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.175 2012/08/10 17:43:32 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.176 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: machdep.c,v 1.175 2012/08/10 17:43:32 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.176 2014/03/24 18:39:57 christos Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -232,8 +232,6 @@ cpu_startup(void)
/*
* Info for CTL_HW
*/
-char cpu_model[120];
-
static void
identifycpu(void)
{
@@ -288,8 +286,8 @@ identifycpu(void)
cpu = "m68020";
mmu = " m68851 MMU";
}
- sprintf(cpu_model, "%s (%s CPU%s%sFPU)", mach, cpu, mmu, fpu);
- printf("%s\n", cpu_model);
+ cpu_setmodel("%s (%s CPU%s%sFPU)", mach, cpu, mmu, fpu);
+ printf("%s\n", cpu_getmodel());
}
/*
@@ -570,12 +568,9 @@ int *nofault;
int
badbaddr(void *addr, int size)
{
- register int i;
+ int i;
label_t faultbuf;
-#ifdef lint
- i = *addr; if (i) return(0);
-#endif
nofault = (int *) &faultbuf;
if (setjmp((label_t *)nofault)) {
nofault = (int *) 0;
@@ -594,6 +589,7 @@ badbaddr(void *addr, int size)
default:
panic("badbaddr: unknown size");
}
+ __USE(i);
nofault = (int *)0;
return 0;
}
Index: src/sys/arch/atari/dev/atari5380.c
diff -u src/sys/arch/atari/dev/atari5380.c:1.59 src/sys/arch/atari/dev/atari5380.c:1.60
--- src/sys/arch/atari/dev/atari5380.c:1.59 Sun Feb 12 11:34:07 2012
+++ src/sys/arch/atari/dev/atari5380.c Mon Mar 24 14:39:57 2014
@@ -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;
Index: src/sys/arch/atari/dev/clock.c
diff -u src/sys/arch/atari/dev/clock.c:1.56 src/sys/arch/atari/dev/clock.c:1.57
--- src/sys/arch/atari/dev/clock.c:1.56 Sun Mar 16 01:20:23 2014
+++ src/sys/arch/atari/dev/clock.c Mon Mar 24 14:39:57 2014
@@ -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,
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);
Index: src/sys/arch/atari/dev/ite.c
diff -u src/sys/arch/atari/dev/ite.c:1.73 src/sys/arch/atari/dev/ite.c:1.74
--- src/sys/arch/atari/dev/ite.c:1.73 Sun Mar 16 01:20:23 2014
+++ src/sys/arch/atari/dev/ite.c Mon Mar 24 14:39:57 2014
@@ -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();
Index: src/sys/arch/atari/dev/kbd.c
diff -u src/sys/arch/atari/dev/kbd.c:1.43 src/sys/arch/atari/dev/kbd.c:1.44
--- src/sys/arch/atari/dev/kbd.c:1.43 Sun Mar 16 01:20:23 2014
+++ src/sys/arch/atari/dev/kbd.c Mon Mar 24 14:39:57 2014
@@ -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.
Index: src/sys/arch/atari/dev/ncr5380.c
diff -u src/sys/arch/atari/dev/ncr5380.c:1.70 src/sys/arch/atari/dev/ncr5380.c:1.71
--- src/sys/arch/atari/dev/ncr5380.c:1.70 Sat Oct 27 13:17:43 2012
+++ src/sys/arch/atari/dev/ncr5380.c Mon Mar 24 14:39:57 2014
@@ -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_chann
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_chann
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_lo
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);
Index: src/sys/arch/atari/dev/ser.c
diff -u src/sys/arch/atari/dev/ser.c:1.53 src/sys/arch/atari/dev/ser.c:1.54
--- src/sys/arch/atari/dev/ser.c:1.53 Sun Mar 16 01:20:23 2014
+++ src/sys/arch/atari/dev/ser.c Mon Mar 24 14:39:57 2014
@@ -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
Index: src/sys/arch/atari/dev/zs.c
diff -u src/sys/arch/atari/dev/zs.c:1.75 src/sys/arch/atari/dev/zs.c:1.76
--- src/sys/arch/atari/dev/zs.c:1.75 Sun Mar 16 01:20:23 2014
+++ src/sys/arch/atari/dev/zs.c Mon Mar 24 14:39:57 2014
@@ -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, ui
ZS_WRITE(zc, 15, reg[15]);
ZS_WRITE(zc, 3, reg[3]);
ZS_WRITE(zc, 5, reg[5]);
+ __USE(i);
}
#endif /* NZS > 1 */
