Module Name: src
Committed By: christos
Date: Wed Jan 22 00:25:16 UTC 2014
Modified Files:
src/sys/arch/amiga/amiga: cc.c disksubr.c
src/sys/arch/amiga/dev: empsc.c fd.c gayle_pcmcia.c grf_cl.c grf_cv.c
grf_cv3d.c grf_cv3dreg.h grf_cvreg.h grf_et.c grf_rh.c grf_ul.c
if_es.c if_le.c ite.c ite_rt.c ivsc.c mlhsc.c otgsc.c repulse.c
sbic.c sci.c ser.c siop.c siop2.c toccata.c wstsc.c
Log Message:
gcc-4.8.x unused variable fixes
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/amiga/amiga/cc.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/amiga/amiga/disksubr.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amiga/dev/empsc.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/amiga/dev/fd.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amiga/dev/gayle_pcmcia.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amiga/dev/grf_cl.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/amiga/dev/grf_cv.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amiga/dev/grf_cv3d.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amiga/dev/grf_cv3dreg.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amiga/dev/grf_cvreg.h \
src/sys/arch/amiga/dev/repulse.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/amiga/dev/grf_et.c \
src/sys/arch/amiga/dev/mlhsc.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/amiga/dev/grf_rh.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/amiga/dev/grf_ul.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/amiga/dev/if_es.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/amiga/dev/if_le.c
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/amiga/dev/ite.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amiga/dev/ite_rt.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amiga/dev/ivsc.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amiga/dev/otgsc.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/amiga/dev/sbic.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/amiga/dev/sci.c
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/amiga/dev/ser.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/amiga/dev/siop.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amiga/dev/siop2.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/toccata.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/amiga/dev/wstsc.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/amiga/amiga/cc.c
diff -u src/sys/arch/amiga/amiga/cc.c:1.25 src/sys/arch/amiga/amiga/cc.c:1.26
--- src/sys/arch/amiga/amiga/cc.c:1.25 Fri Jan 3 02:14:20 2014
+++ src/sys/arch/amiga/amiga/cc.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cc.c,v 1.25 2014/01/03 07:14:20 mlelstv Exp $ */
+/* $NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.25 2014/01/03 07:14:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cc.c,v 1.26 2014/01/22 00:25:16 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -348,11 +348,10 @@ cc_init_audio(void)
void
audio_handler(void)
{
- u_short audio_dma, disable_dma, flag, ir;
+ u_short audio_dma, flag, ir;
int i;
audio_dma = custom.dmaconr;
- disable_dma = 0;
/*
* only check channels who have DMA enabled.
Index: src/sys/arch/amiga/amiga/disksubr.c
diff -u src/sys/arch/amiga/amiga/disksubr.c:1.60 src/sys/arch/amiga/amiga/disksubr.c:1.61
--- src/sys/arch/amiga/amiga/disksubr.c:1.60 Sat Sep 12 05:18:42 2009
+++ src/sys/arch/amiga/amiga/disksubr.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.60 2009/09/12 09:18:42 phx Exp $ */
+/* $NetBSD: disksubr.c,v 1.61 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.60 2009/09/12 09:18:42 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.61 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -536,7 +536,6 @@ setdisklabel(struct disklabel *olp, stru
int
writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, struct cpu_disklabel *clp)
{
- struct rdbmap *bmap;
struct buf *bp;
struct disklabel *dlp;
int error = 0;
@@ -576,7 +575,7 @@ done:
(clp->rdblock <= 0 || clp->rdblock >= RDB_MAXBLOCKS))
return(EINVAL);
- bmap = getrdbmap(dev, strat, lp, clp);
+ (void)getrdbmap(dev, strat, lp, clp);
return(EINVAL);
}
Index: src/sys/arch/amiga/dev/empsc.c
diff -u src/sys/arch/amiga/dev/empsc.c:1.27 src/sys/arch/amiga/dev/empsc.c:1.28
--- src/sys/arch/amiga/dev/empsc.c:1.27 Sat Oct 27 13:17:28 2012
+++ src/sys/arch/amiga/dev/empsc.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: empsc.c,v 1.27 2012/10/27 17:17:28 chs Exp $ */
+/* $NetBSD: empsc.c,v 1.28 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: empsc.c,v 1.27 2012/10/27 17:17:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: empsc.c,v 1.28 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -187,6 +187,7 @@ empsc_intr(void *arg)
if ((*dev->sci_csr & SCI_CSR_INT) == 0)
return(0);
stat = *dev->sci_iack;
+ __USE(stat);
/* XXXX is: something is missing here, at least a: */
return(1);
}
Index: src/sys/arch/amiga/dev/fd.c
diff -u src/sys/arch/amiga/dev/fd.c:1.87 src/sys/arch/amiga/dev/fd.c:1.88
--- src/sys/arch/amiga/dev/fd.c:1.87 Sat Oct 27 13:17:28 2012
+++ src/sys/arch/amiga/dev/fd.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.87 2012/10/27 17:17:28 chs Exp $ */
+/* $NetBSD: fd.c,v 1.88 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.87 2012/10/27 17:17:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.88 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -644,12 +644,10 @@ fdidxintr(void)
void
fdstrategy(struct buf *bp)
{
- struct disklabel *lp;
struct fd_softc *sc;
- int unit, part, s;
+ int unit, s;
unit = FDUNIT(bp->b_dev);
- part = FDPART(bp->b_dev);
sc = getsoftc(fd_cd, unit);
#ifdef FDDEBUG
@@ -658,7 +656,6 @@ fdstrategy(struct buf *bp)
/*
* check for valid partition and bounds
*/
- lp = sc->dkdev.dk_label;
if ((sc->flags & FDF_HAVELABEL) == 0) {
bp->b_error = EIO;
goto done;
@@ -1653,12 +1650,11 @@ void
fdminphys(struct buf *bp)
{
struct fd_softc *sc;
- int trk, sec, toff, tsz;
+ int sec, toff, tsz;
if ((sc = getsoftc(fd_cd, FDUNIT(bp->b_dev))) == NULL)
panic("fdminphys: couldn't get softc");
- trk = bp->b_blkno / sc->nsectors;
sec = bp->b_blkno % sc->nsectors;
toff = sec * FDSECSIZE;
@@ -1705,7 +1701,7 @@ void
amcachetoraw(struct fd_softc *sc)
{
static u_long mfmnull[4];
- u_long *rp, *crp, *dp, hcksum, dcksum, info, zero;
+ u_long *rp, *crp, *dp, hcksum, dcksum, info;
int sec, i;
rp = fdc_dmap;
@@ -1720,7 +1716,6 @@ amcachetoraw(struct fd_softc *sc)
* process sectors
*/
dp = sc->cachep;
- zero = 0;
info = 0xff000000 | (sc->cachetrk << 16) | sc->nsectors;
for (sec = 0; sec < sc->nsectors; sec++, info += (1 << 8) - 1) {
hcksum = dcksum = 0;
@@ -1938,11 +1933,11 @@ mscachetoraw(struct fd_softc *sc)
int
msrawtocache(struct fd_softc *sc)
{
- u_short *rp, *srp, *erp;
+ u_short *rp, *erp;
u_char tb[5], *cp;
int ct, sec, retry;
- srp = rp = (u_short *)fdc_dmap;
+ rp = (u_short *)fdc_dmap;
erp = rp + sc->type->nreadw;
cp = sc->cachep;
Index: src/sys/arch/amiga/dev/gayle_pcmcia.c
diff -u src/sys/arch/amiga/dev/gayle_pcmcia.c:1.28 src/sys/arch/amiga/dev/gayle_pcmcia.c:1.29
--- src/sys/arch/amiga/dev/gayle_pcmcia.c:1.28 Thu Jan 2 19:33:06 2014
+++ src/sys/arch/amiga/dev/gayle_pcmcia.c Tue Jan 21 19:25:16 2014
@@ -1,9 +1,9 @@
-/* $NetBSD: gayle_pcmcia.c,v 1.28 2014/01/03 00:33:06 rkujawa Exp $ */
+/* $NetBSD: gayle_pcmcia.c,v 1.29 2014/01/22 00:25:16 christos Exp $ */
/* public domain */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.28 2014/01/03 00:33:06 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.29 2014/01/22 00:25:16 christos Exp $");
/* PCMCIA front-end driver for A1200's and A600's. */
@@ -209,6 +209,7 @@ pccard_attach(device_t parent, device_t
*reset_card_reg = 0x0;
delay(1000);
x = *reset_card_reg;
+ __USE(x);
gayle_pcmcia_status_write(GAYLE_CCMEM_WP | GAYLE_CCIO_SPKR);
}
Index: src/sys/arch/amiga/dev/grf_cl.c
diff -u src/sys/arch/amiga/dev/grf_cl.c:1.48 src/sys/arch/amiga/dev/grf_cl.c:1.49
--- src/sys/arch/amiga/dev/grf_cl.c:1.48 Thu Nov 8 13:04:56 2012
+++ src/sys/arch/amiga/dev/grf_cl.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cl.c,v 1.48 2012/11/08 18:04:56 rkujawa Exp $ */
+/* $NetBSD: grf_cl.c,v 1.49 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1997 Klaus Burkert
@@ -36,7 +36,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.48 2012/11/08 18:04:56 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.49 2014/01/22 00:25:16 christos Exp $");
#include "grfcl.h"
#include "ite.h"
@@ -198,10 +198,9 @@ int
grfclmatch(device_t parent, cfdata_t cf, void *aux)
{
struct zbus_args *zap;
- static int regprod, fbprod, fbprod2;
+ static int regprod, fbprod;
int error;
- fbprod2 = 0;
zap = aux;
#ifndef CL5426CONSOLE
@@ -223,7 +222,6 @@ grfclmatch(device_t parent, cfdata_t cf,
error = 0;
break;
case 22:
- fbprod2 = 22;
error = 0;
break;
case 21:
@@ -829,7 +827,7 @@ int
cl_setmousepos(struct grf_softc *gp, struct grf_position *data)
{
volatile char *ba = gp->g_regkva;
- short rx, ry, prx, pry;
+ short rx, ry;
#ifdef CL_SHIFTSPRITE
volatile char *fb = gp->g_fbkva;
volatile char *sprite = fb + (cl_fbsize - 1024);
@@ -842,8 +840,6 @@ cl_setmousepos(struct grf_softc *gp, str
/* current and previous real coordinates */
rx = data->x - cl_cursprite.hot.x;
ry = data->y - cl_cursprite.hot.y;
- prx = cl_cursprite.pos.x - cl_cursprite.hot.x;
- pry = cl_cursprite.pos.y - cl_cursprite.hot.y;
/*
* if we are/were on an edge, create (un)shifted bitmap --
@@ -1339,7 +1335,7 @@ cl_load_mon(struct grf_softc *gp, struct
unsigned char num0, denom0, clkdoub;
unsigned short HT, HDE, HBS, HBE, HSS, HSE, VDE, VBS, VBE, VSS,
VSE, VT;
- int clkmul, offsmul, clkmode;
+ int clkmul, clkmode;
int vmul;
int sr15;
unsigned char hvsync_pulse;
@@ -1403,13 +1399,11 @@ cl_load_mon(struct grf_softc *gp, struct
switch (gv->depth) {
case 8:
clkmul = 1;
- offsmul = 1;
clkmode = 0x0;
break;
case 15:
case 16:
clkmul = 1;
- offsmul = 2;
clkmode = 0x6;
break;
case 24:
@@ -1417,17 +1411,14 @@ cl_load_mon(struct grf_softc *gp, struct
clkmul = 1;
else
clkmul = 3;
- offsmul = 3;
clkmode = 0x4;
break;
case 32:
clkmul = 1;
- offsmul = 2;
clkmode = 0x8;
break;
default:
clkmul = 1;
- offsmul = 1;
clkmode = 0x0;
break;
}
Index: src/sys/arch/amiga/dev/grf_cv.c
diff -u src/sys/arch/amiga/dev/grf_cv.c:1.55 src/sys/arch/amiga/dev/grf_cv.c:1.56
--- src/sys/arch/amiga/dev/grf_cv.c:1.55 Thu Nov 8 13:04:56 2012
+++ src/sys/arch/amiga/dev/grf_cv.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cv.c,v 1.55 2012/11/08 18:04:56 rkujawa Exp $ */
+/* $NetBSD: grf_cv.c,v 1.56 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.55 2012/11/08 18:04:56 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.56 2014/01/22 00:25:16 christos Exp $");
#include "grfcv.h"
#include "ite.h"
@@ -478,11 +478,9 @@ grfcvattach(device_t parent, device_t se
static struct grf_cv_softc congrf;
static char attachflag = 0;
struct device temp;
- struct zbus_args *zap;
struct grf_softc *gp;
struct grf_cv_softc *gcp;
- zap = aux;
/*
* This function is called twice, once on console init (self == NULL)
@@ -1281,7 +1279,7 @@ cv_load_mon(struct grf_softc *gp, struct
{
struct grfvideo_mode *gv;
struct grfinfo *gi;
- volatile void *ba, *fb;
+ volatile void *ba;
unsigned short mnr;
unsigned short HT, HDE, HBS, HBE, HSS, HSE, VDE, VBS, VBE, VSS,
VSE, VT;
@@ -1304,7 +1302,6 @@ cv_load_mon(struct grf_softc *gp, struct
}
ba = gp->g_regkva;
- fb = gp->g_fbkva;
/* Disable Interrupts */
test = RCrt(ba, CRT_ID_BACKWAD_COMP_1);
@@ -1689,12 +1686,11 @@ void
cv_inittextmode(struct grf_softc *gp)
{
struct grfcvtext_mode *tm = (struct grfcvtext_mode *)gp->g_data;
- volatile void *ba, *fb;
+ volatile void *fb;
volatile unsigned char *c;
unsigned char *f, y;
unsigned short z;
- ba = gp->g_regkva;
fb = gp->g_fbkva;
/* load text font into beginning of display memory.
@@ -1870,10 +1866,9 @@ M2I(short val)
int
cv_getspriteinfo(struct grf_softc *gp, struct grf_spriteinfo *info)
{
- volatile void *ba, *fb;
+ volatile void *ba;
ba = gp->g_regkva;
- fb = gp->g_fbkva;
if (info->set & GRFSPRSET_ENABLE)
info->enable = RCrt(ba, CRT_ID_HWGC_MODE) & 0x01;
@@ -1882,9 +1877,11 @@ cv_getspriteinfo(struct grf_softc *gp, s
cv_getspritepos (gp, &info->pos);
#if 0 /* XXX */
+ volatile void *fb = gp->g_fbkva;
if (info->set & GRFSPRSET_SHAPE) {
u_char image[512], mask[512];
volatile u_long *hwp;
+ volative void *fb = gp->g_fbkva;
u_char *imp, *mp;
short row;
info->size.x = 64;
@@ -1997,11 +1994,10 @@ cv_setup_hwc(struct grf_softc *gp)
int
cv_setspriteinfo(struct grf_softc *gp, struct grf_spriteinfo *info)
{
- volatile void *ba, *fb;
+ volatile void *ba;
int depth = gp->g_display.gd_planes;
ba = gp->g_regkva;
- fb = gp->g_fbkva;
if (info->set & GRFSPRSET_SHAPE) {
/*
@@ -2183,10 +2179,9 @@ cv_setspriteinfo(struct grf_softc *gp, s
}
if (info->set & GRFSPRSET_CMAP) {
volatile char *hwc;
- int test;
/* reset colour stack */
- test = RCrt(ba, CRT_ID_HWGC_MODE);
+ (void)RCrt(ba, CRT_ID_HWGC_MODE);
amiga_cpu_sync();
switch (depth) {
case 8:
@@ -2205,7 +2200,7 @@ cv_setspriteinfo(struct grf_softc *gp, s
break;
}
- test = RCrt(ba, CRT_ID_HWGC_MODE);
+ (void)RCrt(ba, CRT_ID_HWGC_MODE);
amiga_cpu_sync();
switch (depth) {
case 8:
Index: src/sys/arch/amiga/dev/grf_cv3d.c
diff -u src/sys/arch/amiga/dev/grf_cv3d.c:1.29 src/sys/arch/amiga/dev/grf_cv3d.c:1.30
--- src/sys/arch/amiga/dev/grf_cv3d.c:1.29 Thu Nov 8 13:04:56 2012
+++ src/sys/arch/amiga/dev/grf_cv3d.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cv3d.c,v 1.29 2012/11/08 18:04:56 rkujawa Exp $ */
+/* $NetBSD: grf_cv3d.c,v 1.30 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.29 2012/11/08 18:04:56 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.30 2014/01/22 00:25:16 christos Exp $");
#include "ite.h"
#include "wsdisplay.h"
@@ -424,11 +424,8 @@ grfcv3dattach(device_t parent, device_t
static struct grf_softc congrf;
static char attachflag = 0;
struct device temp;
- struct zbus_args *zap;
struct grf_softc *gp;
- zap = aux;
-
printf("\n");
/*
@@ -1040,12 +1037,10 @@ cv3d_setmonitor(struct grf_softc *gp, st
int
cv3d_getcmap(struct grf_softc *gfp, struct grf_colormap *cmap)
{
- volatile void *ba;
u_char red[256], green[256], blue[256], *rp, *gp, *bp;
short x;
int error;
- ba = gfp->g_regkva;
if (cmap->count == 0 || cmap->index >= 256)
return (0);
@@ -1078,12 +1073,10 @@ cv3d_getcmap(struct grf_softc *gfp, stru
int
cv3d_putcmap(struct grf_softc *gfp, struct grf_colormap *cmap)
{
- volatile void *ba;
u_char red[256], green[256], blue[256], *rp, *gp, *bp;
short x;
int error;
- ba = gfp->g_regkva;
if (cmap->count == 0 || cmap->index >= 256)
return (0);
@@ -1115,9 +1108,6 @@ cv3d_putcmap(struct grf_softc *gfp, stru
int
cv3d_toggle(struct grf_softc *gp)
{
- volatile void *ba;
-
- ba = gp->g_regkva;
#ifndef CV3DCONSOLE
cv3d_pass_toggle = 1;
#endif /* !CV3DCONSOLE */
@@ -1203,7 +1193,7 @@ cv3d_load_mon(struct grf_softc *gp, stru
{
struct grfvideo_mode *gv;
struct grfinfo *gi;
- volatile void *ba, *fb;
+ volatile void *ba;
unsigned short mnr;
unsigned short HT, HDE, HBS, HBE, HSS, HSE, VDE, VBS, VBE, VSS,
VSE, VT;
@@ -1225,7 +1215,6 @@ cv3d_load_mon(struct grf_softc *gp, stru
}
ba = gp->g_regkva;
- fb = gp->g_fbkva;
/* turn gfx off, don't mess up the display */
cv3d_gfx_on_off(1, ba);
@@ -1573,12 +1562,11 @@ void
cv3d_inittextmode(struct grf_softc *gp)
{
struct grfcv3dtext_mode *tm = (struct grfcv3dtext_mode *)gp->g_data;
- volatile void *ba, *fb;
+ volatile void *fb;
volatile unsigned char *c;
unsigned char *f, y;
unsigned short z;
- ba = gp->g_regkva;
fb = gp->g_fbkva;
/* load text font into beginning of display memory.
Index: src/sys/arch/amiga/dev/grf_cv3dreg.h
diff -u src/sys/arch/amiga/dev/grf_cv3dreg.h:1.11 src/sys/arch/amiga/dev/grf_cv3dreg.h:1.12
--- src/sys/arch/amiga/dev/grf_cv3dreg.h:1.11 Sun Feb 12 11:34:07 2012
+++ src/sys/arch/amiga/dev/grf_cv3dreg.h Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cv3dreg.h,v 1.11 2012/02/12 16:34:07 matt Exp $ */
+/* $NetBSD: grf_cv3dreg.h,v 1.12 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1995 Michael Teske
@@ -544,6 +544,7 @@ static inline unsigned char RGfx(volatil
do { \
unsigned char tmp;\
tmp = vgar(ba, ACT_ADDRESS_RESET);\
+ __USE(tmp);\
vgaw(ba, ACT_ADDRESS_W, idx);\
vgaw(ba, ACT_ADDRESS_W, val);\
} while (0)
Index: src/sys/arch/amiga/dev/grf_cvreg.h
diff -u src/sys/arch/amiga/dev/grf_cvreg.h:1.19 src/sys/arch/amiga/dev/grf_cvreg.h:1.20
--- src/sys/arch/amiga/dev/grf_cvreg.h:1.19 Sun Feb 12 11:34:07 2012
+++ src/sys/arch/amiga/dev/grf_cvreg.h Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_cvreg.h,v 1.19 2012/02/12 16:34:07 matt Exp $ */
+/* $NetBSD: grf_cvreg.h,v 1.20 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1995 Michael Teske
@@ -354,6 +354,7 @@ static inline unsigned char RGfx(volatil
do { \
unsigned char tmp;\
tmp = vgar(ba, ACT_ADDRESS_RESET);\
+ __USE(tmp);\
vgaw(ba, ACT_ADDRESS_W, idx);\
vgaw(ba, ACT_ADDRESS_W, val);\
} while (0)
Index: src/sys/arch/amiga/dev/repulse.c
diff -u src/sys/arch/amiga/dev/repulse.c:1.19 src/sys/arch/amiga/dev/repulse.c:1.20
--- src/sys/arch/amiga/dev/repulse.c:1.19 Sat Oct 27 13:17:30 2012
+++ src/sys/arch/amiga/dev/repulse.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: repulse.c,v 1.19 2012/10/27 17:17:30 chs Exp $ */
+/* $NetBSD: repulse.c,v 1.20 2014/01/22 00:25:16 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: repulse.c,v 1.19 2012/10/27 17:17:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: repulse.c,v 1.20 2014/01/22 00:25:16 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -807,14 +807,14 @@ rep_write_16_stereo(struct repulse_hw *b
void
rep_read_8_mono(struct repulse_hw *bp, uint8_t *p, int length, unsigned flags)
{
- uint16_t v;
- uint16_t xor;
+ uint16_t v, xor;
xor = flags & 1 ? 0x8000 : 0;
while (length > 0) {
*p++ = (bp->rhw_fifo_lh ^ xor) >> 8;
v = bp->rhw_fifo_rh;
+ __USE(v);
length--;
}
}
@@ -833,6 +833,7 @@ rep_read_16_mono(struct repulse_hw *bp,
while (length > 0) {
*q++ = bswap16(bp->rhw_fifo_lh ^ xor);
v = bp->rhw_fifo_rh;
+ __USE(v);
length -= 2;
}
return;
Index: src/sys/arch/amiga/dev/grf_et.c
diff -u src/sys/arch/amiga/dev/grf_et.c:1.31 src/sys/arch/amiga/dev/grf_et.c:1.32
--- src/sys/arch/amiga/dev/grf_et.c:1.31 Thu Nov 8 13:04:56 2012
+++ src/sys/arch/amiga/dev/grf_et.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_et.c,v 1.31 2012/11/08 18:04:56 rkujawa Exp $ */
+/* $NetBSD: grf_et.c,v 1.32 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1997 Klaus Burkert
@@ -37,7 +37,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.31 2012/11/08 18:04:56 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.32 2014/01/22 00:25:16 christos Exp $");
#include "grfet.h"
#include "ite.h"
@@ -273,11 +273,8 @@ grfetattach(device_t parent, device_t se
static struct grf_softc congrf;
static char attachflag = 0;
struct device temp;
- struct zbus_args *zap;
struct grf_softc *gp;
- zap = aux;
-
printf("\n");
/* make sure both halves have matched */
@@ -744,7 +741,7 @@ int
et_setmousepos(struct grf_softc *gp, struct grf_position *data)
{
volatile char *ba = gp->g_regkva;
- short rx, ry, prx, pry;
+ short rx, ry;
/* no movement */
if (et_cursprite.pos.x == data->x && et_cursprite.pos.y == data->y)
@@ -753,8 +750,6 @@ et_setmousepos(struct grf_softc *gp, str
/* current and previous real coordinates */
rx = data->x - et_cursprite.hot.x;
ry = data->y - et_cursprite.hot.y;
- prx = et_cursprite.pos.x - et_cursprite.hot.x;
- pry = et_cursprite.pos.y - et_cursprite.hot.y;
/* if we are/were on an edge, create (un)shifted bitmap --
* ripped out optimization (not extremely worthwhile,
Index: src/sys/arch/amiga/dev/mlhsc.c
diff -u src/sys/arch/amiga/dev/mlhsc.c:1.31 src/sys/arch/amiga/dev/mlhsc.c:1.32
--- src/sys/arch/amiga/dev/mlhsc.c:1.31 Sat Oct 27 13:17:30 2012
+++ src/sys/arch/amiga/dev/mlhsc.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mlhsc.c,v 1.31 2012/10/27 17:17:30 chs Exp $ */
+/* $NetBSD: mlhsc.c,v 1.32 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlhsc.c,v 1.31 2012/10/27 17:17:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlhsc.c,v 1.32 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -188,6 +188,7 @@ mlhsc_dma_xfer_in(struct sci_softc *dev,
#endif
csr = *dev->sci_bus_csr;
+ __USE(csr);
QPRINTF(("mlhdma_in %d, csr=%02x\n", len, csr));
@@ -270,6 +271,7 @@ mlhsc_dma_xfer_out(struct sci_softc *dev
volatile register u_char *sci_csr = dev->sci_csr;
csr = *dev->sci_bus_csr;
+ __USE(csr);
QPRINTF(("mlhdma_xfer %d, csr=%02x\n", len, csr));
Index: src/sys/arch/amiga/dev/grf_rh.c
diff -u src/sys/arch/amiga/dev/grf_rh.c:1.56 src/sys/arch/amiga/dev/grf_rh.c:1.57
--- src/sys/arch/amiga/dev/grf_rh.c:1.56 Thu Nov 8 13:04:56 2012
+++ src/sys/arch/amiga/dev/grf_rh.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_rh.c,v 1.56 2012/11/08 18:04:56 rkujawa Exp $ */
+/* $NetBSD: grf_rh.c,v 1.57 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1994 Markus Wild
@@ -34,7 +34,7 @@
#include "opt_retina.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_rh.c,v 1.56 2012/11/08 18:04:56 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_rh.c,v 1.57 2014/01/22 00:25:16 christos Exp $");
#include "grfrh.h"
#include "ite.h"
@@ -1909,10 +1909,9 @@ rh_setspritepos (struct grf_softc *gp, s
int
rh_getspriteinfo(struct grf_softc *gp, struct grf_spriteinfo *info)
{
- volatile unsigned char *ba, *fb;
+ volatile unsigned char *ba;
ba = gp->g_regkva;
- fb = gp->g_fbkva;
if (info->set & GRFSPRSET_ENABLE)
info->enable = RSeq (ba, SEQ_ID_CURSOR_CONTROL) & 0x01;
if (info->set & GRFSPRSET_POS)
@@ -2002,13 +2001,12 @@ rh_getspriteinfo(struct grf_softc *gp, s
int
rh_setspriteinfo(struct grf_softc *gp, struct grf_spriteinfo *info)
{
- volatile unsigned char *ba, *fb;
+ volatile unsigned char *ba;
#if 0
u_char control;
#endif
ba = gp->g_regkva;
- fb = gp->g_fbkva;
if (info->set & GRFSPRSET_SHAPE) {
/*
Index: src/sys/arch/amiga/dev/grf_ul.c
diff -u src/sys/arch/amiga/dev/grf_ul.c:1.49 src/sys/arch/amiga/dev/grf_ul.c:1.50
--- src/sys/arch/amiga/dev/grf_ul.c:1.49 Thu Nov 8 13:04:56 2012
+++ src/sys/arch/amiga/dev/grf_ul.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grf_ul.c,v 1.49 2012/11/08 18:04:56 rkujawa Exp $ */
+/* $NetBSD: grf_ul.c,v 1.50 2014/01/22 00:25:16 christos Exp $ */
#define UL_DEBUG
/*-
@@ -33,7 +33,7 @@
#include "opt_amigacons.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.49 2012/11/08 18:04:56 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.50 2014/01/22 00:25:16 christos Exp $");
#include "grful.h"
#include "ite.h"
@@ -360,12 +360,10 @@ ul_load_code(struct grf_softc *gp)
static int
ul_load_mon(struct grf_softc *gp, struct grfvideo_mode *md)
{
- struct grf_ul_softc *gup;
struct grfinfo *gi;
volatile struct gspregs *ba;
u_int16_t buf[8];
- gup = (struct grf_ul_softc *)gp;
gi = &gp->g_display;
ba = (volatile struct gspregs *)gp->g_regkva;
@@ -607,15 +605,11 @@ ul_getvmode (struct grf_softc *gp, struc
static int
ul_setvmode (struct grf_softc *gp, unsigned mode)
{
- struct grf_ul_softc *gup;
- volatile struct gspregs *ba;
int error;
if (!mode || mode > ulowell_mon_max)
return EINVAL;
- ba = (volatile struct gspregs *)gp->g_regkva;
- gup = (struct grf_ul_softc *)gp;
current_mon = ul_monitor_defs + mode - 1;
error = ul_load_mon (gp, current_mon) ? 0 : EINVAL;
Index: src/sys/arch/amiga/dev/if_es.c
diff -u src/sys/arch/amiga/dev/if_es.c:1.51 src/sys/arch/amiga/dev/if_es.c:1.52
--- src/sys/arch/amiga/dev/if_es.c:1.51 Sat Oct 27 13:17:29 2012
+++ src/sys/arch/amiga/dev/if_es.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_es.c,v 1.51 2012/10/27 17:17:29 chs Exp $ */
+/* $NetBSD: if_es.c,v 1.52 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1995 Michael L. Hitch
@@ -33,7 +33,7 @@
#include "opt_ns.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.51 2012/10/27 17:17:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_es.c,v 1.52 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
@@ -448,6 +448,7 @@ zzzz:
#endif
smc->b0.bsr = BSR_BANK0;
ephsr = smc->b0.ephsr; /* get EPHSR */
+ __USE(ephsr);
tcr = smc->b0.tcr; /* and TCR */
smc->b2.bsr = BSR_BANK2;
save_ptr = smc->b2.ptr;
Index: src/sys/arch/amiga/dev/if_le.c
diff -u src/sys/arch/amiga/dev/if_le.c:1.45 src/sys/arch/amiga/dev/if_le.c:1.46
--- src/sys/arch/amiga/dev/if_le.c:1.45 Tue Jan 19 17:06:19 2010
+++ src/sys/arch/amiga/dev/if_le.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.45 2010/01/19 22:06:19 pooka Exp $ */
+/* $NetBSD: if_le.c,v 1.46 2014/01/22 00:25:16 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
#include "opt_inet.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.45 2010/01/19 22:06:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.46 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
@@ -216,6 +216,7 @@ lepcnet_reset(struct lance_softc *sc)
volatile int dummy;
dummy = ler1->ler1_reset; /* Reset PCNet-ISA */
+ __USE(dummy);
}
void
Index: src/sys/arch/amiga/dev/ite.c
diff -u src/sys/arch/amiga/dev/ite.c:1.94 src/sys/arch/amiga/dev/ite.c:1.95
--- src/sys/arch/amiga/dev/ite.c:1.94 Sat Oct 27 13:17:29 2012
+++ src/sys/arch/amiga/dev/ite.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.94 2012/10/27 17:17:29 chs Exp $ */
+/* $NetBSD: ite.c,v 1.95 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -46,7 +46,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.94 2012/10/27 17:17:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.95 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -593,11 +593,10 @@ void
itestart(struct tty *tp)
{
struct clist *rbp;
- struct ite_softc *ip;
u_char buf[ITEBURST];
int s, len;
- ip = getitesp(tp->t_dev);
+ (void)getitesp(tp->t_dev);
KDASSERT(tp);
@@ -630,9 +629,7 @@ void
ite_on(dev_t dev, int flag)
{
struct ite_softc *ip;
- int unit;
- unit = ITEUNIT(dev);
ip = getitesp(dev);
/* force ite active, overriding graphics mode */
Index: src/sys/arch/amiga/dev/ite_rt.c
diff -u src/sys/arch/amiga/dev/ite_rt.c:1.24 src/sys/arch/amiga/dev/ite_rt.c:1.25
--- src/sys/arch/amiga/dev/ite_rt.c:1.24 Mon Oct 26 15:16:54 2009
+++ src/sys/arch/amiga/dev/ite_rt.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_rt.c,v 1.24 2009/10/26 19:16:54 cegger Exp $ */
+/* $NetBSD: ite_rt.c,v 1.25 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1993 Markus Wild
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_rt.c,v 1.24 2009/10/26 19:16:54 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_rt.c,v 1.25 2014/01/22 00:25:16 christos Exp $");
#include "grfrt.h"
#if NGRFRT > 0
@@ -436,10 +436,8 @@ retina_clear(struct ite_softc *ip, int s
void
retina_scroll(struct ite_softc *ip, int sy, int sx, int count, int dir)
{
- volatile void *ba;
u_long *fb;
- ba = ip->grf->g_regkva;
fb = (u_long *)__UNVOLATILE(ip->grf->g_fbkva);
retina_cursor(ip, ERASE_CURSOR);
Index: src/sys/arch/amiga/dev/ivsc.c
diff -u src/sys/arch/amiga/dev/ivsc.c:1.36 src/sys/arch/amiga/dev/ivsc.c:1.37
--- src/sys/arch/amiga/dev/ivsc.c:1.36 Sat Oct 27 13:17:29 2012
+++ src/sys/arch/amiga/dev/ivsc.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ivsc.c,v 1.36 2012/10/27 17:17:29 chs Exp $ */
+/* $NetBSD: ivsc.c,v 1.37 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ivsc.c,v 1.36 2012/10/27 17:17:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ivsc.c,v 1.37 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -329,6 +329,7 @@ ivsc_intr(void *arg)
if ((*dev->sci_csr & SCI_CSR_INT) == 0)
return(0);
stat = *dev->sci_iack;
+ __USE(stat);
/* XXXX is: something is missing here, at least a: */
return(1);
}
Index: src/sys/arch/amiga/dev/otgsc.c
diff -u src/sys/arch/amiga/dev/otgsc.c:1.32 src/sys/arch/amiga/dev/otgsc.c:1.33
--- src/sys/arch/amiga/dev/otgsc.c:1.32 Sat Oct 27 13:17:30 2012
+++ src/sys/arch/amiga/dev/otgsc.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: otgsc.c,v 1.32 2012/10/27 17:17:30 chs Exp $ */
+/* $NetBSD: otgsc.c,v 1.33 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: otgsc.c,v 1.32 2012/10/27 17:17:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: otgsc.c,v 1.33 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -285,6 +285,7 @@ otgsc_intr(void *arg)
if ((*dev->sci_csr & SCI_CSR_INT) == 0)
return (1);
stat = *dev->sci_iack;
+ __USE(stat);
*dev->sci_mode = 0;
return (1);
}
Index: src/sys/arch/amiga/dev/sbic.c
diff -u src/sys/arch/amiga/dev/sbic.c:1.71 src/sys/arch/amiga/dev/sbic.c:1.72
--- src/sys/arch/amiga/dev/sbic.c:1.71 Sat Oct 27 13:17:30 2012
+++ src/sys/arch/amiga/dev/sbic.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sbic.c,v 1.71 2012/10/27 17:17:30 chs Exp $ */
+/* $NetBSD: sbic.c,v 1.72 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -81,7 +81,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.71 2012/10/27 17:17:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbic.c,v 1.72 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -798,7 +798,6 @@ printf("%s: sbicabort - sending DISC com
void
sbicinit(struct sbic_softc *dev)
{
- sbic_regmap_t regs;
u_int i;
struct sbic_acb *acb;
u_int inhibit_sync;
@@ -806,8 +805,6 @@ sbicinit(struct sbic_softc *dev)
extern u_long scsi_nosync;
extern int shift_nosync;
- regs = dev->sc_sbic;
-
if ((dev->sc_flags & SBICF_ALIVE) == 0) {
TAILQ_INIT(&dev->ready_list);
TAILQ_INIT(&dev->nexus_list);
@@ -885,6 +882,7 @@ sbicreset(struct sbic_softc *dev)
DELAY(25);
SBIC_WAIT(regs, SBIC_ASR_INT, 0);
GET_SBIC_csr(regs, csr); /* clears interrupt also */
+ __USE(csr);
if (dev->sc_clkfreq < 110)
my_id |= SBIC_ID_FS_8_10;
@@ -1191,6 +1189,7 @@ sbicxfout(sbic_regmap_t regs, int len, v
buf[3], buf[4], buf[5], buf[6], buf[7], buf[8], buf[9]));
GET_SBIC_csr (regs, orig_csr);
+ __USE(orig_csr);
CSR_TRACE('>',orig_csr,0,0);
/*
@@ -1232,14 +1231,14 @@ int
sbicxfin(sbic_regmap_t regs, int len, void *bp)
{
int wait;
- u_char *obp, *buf;
+ u_char *buf;
u_char orig_csr, csr, asr;
wait = sbic_data_wait;
- obp = bp;
buf = bp;
GET_SBIC_csr (regs, orig_csr);
+ __USE(orig_csr);
CSR_TRACE('<',orig_csr,0,0);
QPRINTF(("sbicxfin %d, csr=%02x\n", len, orig_csr));
@@ -1274,6 +1273,7 @@ sbicxfin(sbic_regmap_t regs, int len, vo
if (!(asr & SBIC_ASR_BSY)) {
GET_SBIC_csr(regs, csr);
+ __USE(csr);
CSR_TRACE('<',csr,asr,len);
QPRINTF(("[CSR%02xASR%02x]", csr, asr));
}
@@ -1568,6 +1568,7 @@ sbicxfdone(struct sbic_softc *dev, sbic_
do {
asr = SBIC_WAIT (regs, SBIC_ASR_INT, 0);
+ __USE(asr);
GET_SBIC_csr (regs, csr);
CSR_TRACE('f',csr,asr,target);
QPRINTF(("%02x:", csr));
Index: src/sys/arch/amiga/dev/sci.c
diff -u src/sys/arch/amiga/dev/sci.c:1.35 src/sys/arch/amiga/dev/sci.c:1.36
--- src/sys/arch/amiga/dev/sci.c:1.35 Sat Oct 27 13:17:31 2012
+++ src/sys/arch/amiga/dev/sci.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sci.c,v 1.35 2012/10/27 17:17:31 chs Exp $ */
+/* $NetBSD: sci.c,v 1.36 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sci.c,v 1.35 2012/10/27 17:17:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sci.c,v 1.36 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,14 +142,18 @@ sci_scsipi_request(struct scsipi_channel
void *arg)
{
struct scsipi_xfer *xs;
+#ifdef DIAGNOSTIC
struct scsipi_periph *periph;
+#endif
struct sci_softc *dev = device_private(chan->chan_adapter->adapt_dev);
int flags, s;
switch (req) {
case ADAPTER_REQ_RUN_XFER:
xs = arg;
+#ifdef DIAGNOSTIC
periph = xs->xs_periph;
+#endif
flags = xs->xs_control;
if (flags & XS_CTL_DATA_UIO)
@@ -502,7 +506,7 @@ sciicmd(struct sci_softc *dev, int targe
int len, u_char xferphase)
{
u_char phase;
- register int wait;
+ int wait;
/* select the SCSI bus (it's an error if bus isn't free) */
if (sciselectbus (dev, target, dev->sc_scsi_addr))
@@ -577,6 +581,8 @@ sciicmd(struct sci_softc *dev, int targe
#if 0
if (wait <= 0)
goto abort;
+#else
+ __USE(wait);
#endif
}
Index: src/sys/arch/amiga/dev/ser.c
diff -u src/sys/arch/amiga/dev/ser.c:1.80 src/sys/arch/amiga/dev/ser.c:1.81
--- src/sys/arch/amiga/dev/ser.c:1.80 Sat Oct 27 13:17:31 2012
+++ src/sys/arch/amiga/dev/ser.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.80 2012/10/27 17:17:31 chs Exp $ */
+/* $NetBSD: ser.c,v 1.81 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
#include "opt_kgdb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.80 2012/10/27 17:17:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.81 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -224,6 +224,7 @@ serattach(device_t parent, device_t self
sc = device_private(self);
ir = custom.intenar;
+ __USE(ir);
if (serconsole == 0)
DELAY(100000);
@@ -422,6 +423,7 @@ ser_shutdown(struct ser_softc *sc)
}
#endif
ser_open_speed = tp->t_ispeed;
+ splx(s);
return;
}
Index: src/sys/arch/amiga/dev/siop.c
diff -u src/sys/arch/amiga/dev/siop.c:1.67 src/sys/arch/amiga/dev/siop.c:1.68
--- src/sys/arch/amiga/dev/siop.c:1.67 Sat Oct 27 13:17:31 2012
+++ src/sys/arch/amiga/dev/siop.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: siop.c,v 1.67 2012/10/27 17:17:31 chs Exp $ */
+/* $NetBSD: siop.c,v 1.68 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -70,7 +70,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.67 2012/10/27 17:17:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.68 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -225,7 +225,9 @@ siop_scsipi_request(struct scsipi_channe
void *arg)
{
struct scsipi_xfer *xs;
+#ifdef DIAGNOSTIC
struct scsipi_periph *periph;
+#endif
struct siop_acb *acb;
struct siop_softc *sc = device_private(chan->chan_adapter->adapt_dev);
int flags, s;
@@ -233,7 +235,9 @@ siop_scsipi_request(struct scsipi_channe
switch (req) {
case ADAPTER_REQ_RUN_XFER:
xs = arg;
+#ifdef DIAGNOSTIC
periph = xs->xs_periph;
+#endif
flags = xs->xs_control;
/* XXXX ?? */
@@ -680,6 +684,7 @@ siopreset(struct siop_softc *sc)
if (i & SIOP_ISTAT_DIP)
dummy = rp->siop_dstat;
+ __USE(dummy);
splx (s);
delay (siop_reset_delay * 1000);
Index: src/sys/arch/amiga/dev/siop2.c
diff -u src/sys/arch/amiga/dev/siop2.c:1.41 src/sys/arch/amiga/dev/siop2.c:1.42
--- src/sys/arch/amiga/dev/siop2.c:1.41 Sat Oct 27 13:17:31 2012
+++ src/sys/arch/amiga/dev/siop2.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: siop2.c,v 1.41 2012/10/27 17:17:31 chs Exp $ */
+/* $NetBSD: siop2.c,v 1.42 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -70,7 +70,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop2.c,v 1.41 2012/10/27 17:17:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop2.c,v 1.42 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -212,7 +212,9 @@ siopng_scsipi_request(struct scsipi_chan
void *arg)
{
struct scsipi_xfer *xs;
+#ifdef DIAGNOSTIC
struct scsipi_periph *periph;
+#endif
struct siop_acb *acb;
struct siop_softc *sc = device_private(chan->chan_adapter->adapt_dev);
int flags, s;
@@ -220,7 +222,9 @@ siopng_scsipi_request(struct scsipi_chan
switch (req) {
case ADAPTER_REQ_RUN_XFER:
xs = arg;
+#ifdef DIAGNOSTIC
periph = xs->xs_periph;
+#endif
flags = xs->xs_control;
/* XXXX ?? */
@@ -674,6 +678,7 @@ siopngreset(struct siop_softc *sc)
if (i & SIOP_ISTAT_DIP)
dummy = rp->siop_dstat;
+ __USE(dummy);
splx (s);
delay (siopng_reset_delay * 1000);
@@ -976,6 +981,7 @@ siopng_checkintr(struct siop_softc *sc,
dbc = rp->siop_dbc0;
sstat0 = rp->siop_sstat0;
sstat1 = rp->siop_sstat1;
+ __USE(sstat1);
sstat2 = rp->siop_sstat2;
rp->siop_ctest3 |= SIOP_CTEST8_CLF;
while ((rp->siop_ctest1 & SIOP_CTEST1_FMT) != SIOP_CTEST1_FMT)
Index: src/sys/arch/amiga/dev/toccata.c
diff -u src/sys/arch/amiga/dev/toccata.c:1.16 src/sys/arch/amiga/dev/toccata.c:1.17
--- src/sys/arch/amiga/dev/toccata.c:1.16 Mon Dec 9 04:35:16 2013
+++ src/sys/arch/amiga/dev/toccata.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: toccata.c,v 1.16 2013/12/09 09:35:16 wiz Exp $ */
+/* $NetBSD: toccata.c,v 1.17 2014/01/22 00:25:16 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.16 2013/12/09 09:35:16 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.17 2014/01/22 00:25:16 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -473,11 +473,9 @@ int
toccata_halt_input(void *addr)
{
struct toccata_softc *sc;
- struct ad1848_softc *asc;
unsigned reg;
sc = addr;
- asc = &sc->sc_ad;
/* we're half_duplex; be brutal */
*sc->sc_boardp = TOCC_CP_TAIL;
@@ -525,11 +523,9 @@ int
toccata_halt_output(void *addr)
{
struct toccata_softc *sc;
- struct ad1848_softc *asc;
unsigned int reg;
sc = addr;
- asc = &sc->sc_ad;
/* we're half_duplex; be brutal */
*sc->sc_boardp = TOCC_PB_TAIL;
Index: src/sys/arch/amiga/dev/wstsc.c
diff -u src/sys/arch/amiga/dev/wstsc.c:1.33 src/sys/arch/amiga/dev/wstsc.c:1.34
--- src/sys/arch/amiga/dev/wstsc.c:1.33 Sat Oct 27 13:17:32 2012
+++ src/sys/arch/amiga/dev/wstsc.c Tue Jan 21 19:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wstsc.c,v 1.33 2012/10/27 17:17:32 chs Exp $ */
+/* $NetBSD: wstsc.c,v 1.34 2014/01/22 00:25:16 christos Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wstsc.c,v 1.33 2012/10/27 17:17:32 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wstsc.c,v 1.34 2014/01/22 00:25:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -535,5 +535,6 @@ wstsc_intr(void *arg)
if ((*(dev->sci_csr + 0x10) & SCI_CSR_INT) == 0)
return (0);
stat = *(dev->sci_iack + 0x10);
+ __USE(stat);
return (1);
}
