Module Name: src Committed By: christos Date: Sun Nov 10 20:09:53 UTC 2013
Modified Files: src/sys/arch/pmax/ibus: pm.c sii.c src/sys/arch/pmax/pmax: machdep.c src/sys/arch/pmax/tc: dtkbd.c ioasic.c Log Message: fix unused variable warnings To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/pmax/ibus/pm.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/pmax/ibus/sii.c cvs rdiff -u -r1.245 -r1.246 src/sys/arch/pmax/pmax/machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/pmax/tc/dtkbd.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/pmax/tc/ioasic.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/pmax/ibus/pm.c diff -u src/sys/arch/pmax/ibus/pm.c:1.11 src/sys/arch/pmax/ibus/pm.c:1.12 --- src/sys/arch/pmax/ibus/pm.c:1.11 Wed Jan 11 16:17:33 2012 +++ src/sys/arch/pmax/ibus/pm.c Sun Nov 10 15:09:52 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pm.c,v 1.11 2012/01/11 21:17:33 macallan Exp $ */ +/* $NetBSD: pm.c,v 1.12 2013/11/10 20:09:52 christos Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.11 2012/01/11 21:17:33 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.12 2013/11/10 20:09:52 christos Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -555,14 +555,12 @@ pm_flush(struct pm_softc *sc) int v, i, x, y; u_short *p, *pe; struct hwcmap256 *cm; - struct rasops_info *ri; if (sc->sc_changed == 0) return (1); vdac = (void *)MIPS_PHYS_TO_KSEG1(KN01_SYS_VDAC); pcc = (void *)MIPS_PHYS_TO_KSEG1(KN01_SYS_PCC); - ri = &pm_ri; v = sc->sc_changed; if ((v & WSDISPLAY_CURSOR_DOCUR) != 0) { Index: src/sys/arch/pmax/ibus/sii.c diff -u src/sys/arch/pmax/ibus/sii.c:1.10 src/sys/arch/pmax/ibus/sii.c:1.11 --- src/sys/arch/pmax/ibus/sii.c:1.10 Sat Jul 9 13:32:30 2011 +++ src/sys/arch/pmax/ibus/sii.c Sun Nov 10 15:09:52 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: sii.c,v 1.10 2011/07/09 17:32:30 matt Exp $ */ +/* $NetBSD: sii.c,v 1.11 2013/11/10 20:09:52 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sii.c,v 1.10 2011/07/09 17:32:30 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sii.c,v 1.11 2013/11/10 20:09:52 christos Exp $"); #include "sii.h" /* @@ -1757,11 +1757,10 @@ sii_CmdDone(struct siisoftc *sc, int tar /* target: which device is done */ /* error: error code if any errors */ { - ScsiCmd *scsicmd; int i; - scsicmd = sc->sc_cmd[target]; #ifdef DIAGNOSTIC + ScsiCmd *scsicmd = sc->sc_cmd[target]; if (target < 0 || !scsicmd) panic("sii_CmdDone"); #endif Index: src/sys/arch/pmax/pmax/machdep.c diff -u src/sys/arch/pmax/pmax/machdep.c:1.245 src/sys/arch/pmax/pmax/machdep.c:1.246 --- src/sys/arch/pmax/pmax/machdep.c:1.245 Sat Jul 28 19:08:57 2012 +++ src/sys/arch/pmax/pmax/machdep.c Sun Nov 10 15:09:52 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.245 2012/07/28 23:08:57 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.246 2013/11/10 20:09:52 christos Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.245 2012/07/28 23:08:57 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.246 2013/11/10 20:09:52 christos Exp $"); #include "opt_ddb.h" #include "opt_modular.h" @@ -134,6 +134,7 @@ void mach_init(int argc, int32_t *argv32, int code, intptr_t cv, u_int bim, char *bip) { char *cp; +/*###137 [cc] error: variable 'bootinfo_msg' set but not used [-Werror=unused-but-set-variable]%%%*/ const char *bootinfo_msg; int i; char *kernend; @@ -215,6 +216,8 @@ mach_init(int argc, int32_t *argv32, int #if 0 if (bootinfo_msg != NULL) printf(bootinfo_msg); +#else + __USE(bootinfo_msg); #endif /* * Set the VM page size. Index: src/sys/arch/pmax/tc/dtkbd.c diff -u src/sys/arch/pmax/tc/dtkbd.c:1.10 src/sys/arch/pmax/tc/dtkbd.c:1.11 --- src/sys/arch/pmax/tc/dtkbd.c:1.10 Sat Jul 9 13:32:31 2011 +++ src/sys/arch/pmax/tc/dtkbd.c Sun Nov 10 15:09:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dtkbd.c,v 1.10 2011/07/09 17:32:31 matt Exp $ */ +/* $NetBSD: dtkbd.c,v 1.11 2013/11/10 20:09:53 christos Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dtkbd.c,v 1.10 2011/07/09 17:32:31 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dtkbd.c,v 1.11 2013/11/10 20:09:53 christos Exp $"); #include "locators.h" @@ -187,9 +187,6 @@ dtkbd_cnpollc(void *v, int on) int dtkbd_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l) { - struct dtkbd_softc *sc; - - sc = v; switch (cmd) { case WSKBDIO_GTYPE: Index: src/sys/arch/pmax/tc/ioasic.c diff -u src/sys/arch/pmax/tc/ioasic.c:1.21 src/sys/arch/pmax/tc/ioasic.c:1.22 --- src/sys/arch/pmax/tc/ioasic.c:1.21 Sat Jul 9 13:32:31 2011 +++ src/sys/arch/pmax/tc/ioasic.c Sun Nov 10 15:09:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ioasic.c,v 1.21 2011/07/09 17:32:31 matt Exp $ */ +/* $NetBSD: ioasic.c,v 1.22 2013/11/10 20:09:53 christos Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.21 2011/07/09 17:32:31 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.22 2013/11/10 20:09:53 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -179,6 +179,8 @@ ioasicattach(device_t parent, device_t s for (i = 0; i < ioasic_ndevs; i++) imsk &= ~ioasic_devs[i].iad_intrbits; bus_space_write_4(sc->sc_bst, sc->sc_bsh, IOASIC_IMSK, imsk); +#else + __USE(ioasic_ndevs); #endif /*