Module Name: src Committed By: christos Date: Mon Mar 24 19:42:58 UTC 2014
Modified Files: src/sys/arch/hp300/dev: ct.c dcm.c diofb.c dmareg.h fhpib.c mt.c nhpib.c rd.c src/sys/arch/hp300/hp300: autoconf.c bus_space.c machdep.c Log Message: - remove unused - use cpu_{g,s}etmodel To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/hp300/dev/ct.c cvs rdiff -u -r1.84 -r1.85 src/sys/arch/hp300/dev/dcm.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp300/dev/diofb.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hp300/dev/dmareg.h cvs rdiff -u -r1.39 -r1.40 src/sys/arch/hp300/dev/fhpib.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/hp300/dev/mt.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/hp300/dev/nhpib.c cvs rdiff -u -r1.94 -r1.95 src/sys/arch/hp300/dev/rd.c cvs rdiff -u -r1.103 -r1.104 src/sys/arch/hp300/hp300/autoconf.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hp300/hp300/bus_space.c cvs rdiff -u -r1.227 -r1.228 src/sys/arch/hp300/hp300/machdep.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/hp300/dev/ct.c diff -u src/sys/arch/hp300/dev/ct.c:1.58 src/sys/arch/hp300/dev/ct.c:1.59 --- src/sys/arch/hp300/dev/ct.c:1.58 Sun Mar 16 01:20:24 2014 +++ src/sys/arch/hp300/dev/ct.c Mon Mar 24 15:42:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ct.c,v 1.58 2014/03/16 05:20:24 dholland Exp $ */ +/* $NetBSD: ct.c,v 1.59 2014/03/24 19:42:58 christos Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.58 2014/03/16 05:20:24 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.59 2014/03/24 19:42:58 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -732,11 +732,10 @@ ctintr(void *arg) struct ct_softc *sc = arg; struct buf *bp; uint8_t stat; - int ctlr, slave, unit; + int ctlr, slave; ctlr = device_unit(device_parent(sc->sc_dev)); slave = sc->sc_slave; - unit = device_unit(sc->sc_dev); bp = bufq_peek(sc->sc_tab); if (bp == NULL) { Index: src/sys/arch/hp300/dev/dcm.c diff -u src/sys/arch/hp300/dev/dcm.c:1.84 src/sys/arch/hp300/dev/dcm.c:1.85 --- src/sys/arch/hp300/dev/dcm.c:1.84 Sun Mar 16 01:20:24 2014 +++ src/sys/arch/hp300/dev/dcm.c Mon Mar 24 15:42:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: dcm.c,v 1.84 2014/03/16 05:20:24 dholland Exp $ */ +/* $NetBSD: dcm.c,v 1.85 2014/03/24 19:42:58 christos Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.84 2014/03/16 05:20:24 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.85 2014/03/24 19:42:58 christos Exp $"); #include "opt_kgdb.h" @@ -1594,6 +1594,7 @@ dcmcngetc(dev_t dev) c = fifo->data_char; stat = fifo->data_stat; pp->r_head = (head + 2) & RX_MASK; + __USE(stat); splx(s); return c; } @@ -1621,7 +1622,7 @@ dcmcnputc(dev_t dev, int c) } tail = pp->t_tail & TX_MASK; while (tail != (pp->t_head & TX_MASK)) - ; + continue; dcm_cn->dcm_tfifos[3-DCMCONSPORT][tail].data_char = c; pp->t_tail = tail = (tail + 1) & TX_MASK; SEM_LOCK(dcm_cn); @@ -1629,7 +1630,7 @@ dcmcnputc(dev_t dev, int c) dcm_cn->dcm_cr |= (1 << DCMCONSPORT); SEM_UNLOCK(dcm_cn); while (tail != (pp->t_head & TX_MASK)) - ; + continue; /* * If board interrupts are enabled, just let our completion * interrupt through in case some other port on the board @@ -1640,5 +1641,6 @@ dcmcnputc(dev_t dev, int c) stat = dcm_cn->dcm_iir; SEM_UNLOCK(dcm_cn); } + __USE(stat); splx(s); } Index: src/sys/arch/hp300/dev/diofb.c diff -u src/sys/arch/hp300/dev/diofb.c:1.3 src/sys/arch/hp300/dev/diofb.c:1.4 --- src/sys/arch/hp300/dev/diofb.c:1.3 Fri Feb 18 14:15:43 2011 +++ src/sys/arch/hp300/dev/diofb.c Mon Mar 24 15:42:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: diofb.c,v 1.3 2011/02/18 19:15:43 tsutsui Exp $ */ +/* $NetBSD: diofb.c,v 1.4 2014/03/24 19:42:58 christos Exp $ */ /* $OpenBSD: diofb.c,v 1.18 2010/12/26 15:40:59 miod Exp $ */ /* @@ -318,7 +318,7 @@ diofb_end_attach(device_t self, struct w fb->scrlist[0] = &fb->wsd; fb->wsl.nscreens = 1; - fb->wsl.screens = (const struct wsscreen_descr **)fb->scrlist; + fb->wsl.screens = (void *)fb->scrlist; waa.console = console; waa.scrdata = &fb->wsl; Index: src/sys/arch/hp300/dev/dmareg.h diff -u src/sys/arch/hp300/dev/dmareg.h:1.16 src/sys/arch/hp300/dev/dmareg.h:1.17 --- src/sys/arch/hp300/dev/dmareg.h:1.16 Wed Jul 19 13:21:23 2006 +++ src/sys/arch/hp300/dev/dmareg.h Mon Mar 24 15:42:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: dmareg.h,v 1.16 2006/07/19 17:21:23 tsutsui Exp $ */ +/* $NetBSD: dmareg.h,v 1.17 2014/03/24 19:42:58 christos Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -108,7 +108,8 @@ struct dmareg { #define DMA_CLEAR(dc) do { \ v_int dmaclr; \ dmaclr = (int)dc->dm_Bhwaddr->dmaB_addr; \ - } while (0); + __USE(dmaclr); \ + } while (/*CONSTCOND*/0); #define DMA_STAT(dc) dc->dm_Bhwaddr->dmaB_stat #if defined(HP320) Index: src/sys/arch/hp300/dev/fhpib.c diff -u src/sys/arch/hp300/dev/fhpib.c:1.39 src/sys/arch/hp300/dev/fhpib.c:1.40 --- src/sys/arch/hp300/dev/fhpib.c:1.39 Mon Apr 28 16:23:19 2008 +++ src/sys/arch/hp300/dev/fhpib.c Mon Mar 24 15:42:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fhpib.c,v 1.39 2008/04/28 20:23:19 martin Exp $ */ +/* $NetBSD: fhpib.c,v 1.40 2014/03/24 19:42:58 christos Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fhpib.c,v 1.39 2008/04/28 20:23:19 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fhpib.c,v 1.40 2014/03/24 19:42:58 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -409,6 +409,7 @@ fhpibgo(struct hpibbus_softc *hs, int sl hd->hpib_cmd = sc->sc_cmd; hd->hpib_ie = IDS_DMA(hs->sc_dq->dq_chan) | ((flags & DMAGO_WORD) ? IDS_WDMA : 0); + __USE(i); return; } sc->sc_cmd = CT_REN | CT_8BIT | CT_FIFOSEL; @@ -436,6 +437,7 @@ fhpibgo(struct hpibbus_softc *hs, int sl hd->hpib_cmd = sc->sc_cmd; hd->hpib_ie = IDS_DMA(hs->sc_dq->dq_chan) | IDS_WRITE | ((flags & DMAGO_WORD) ? IDS_WDMA : 0); + __USE(i); } /* Index: src/sys/arch/hp300/dev/mt.c diff -u src/sys/arch/hp300/dev/mt.c:1.51 src/sys/arch/hp300/dev/mt.c:1.52 --- src/sys/arch/hp300/dev/mt.c:1.51 Sun Mar 16 01:20:24 2014 +++ src/sys/arch/hp300/dev/mt.c Mon Mar 24 15:42:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: mt.c,v 1.51 2014/03/16 05:20:24 dholland Exp $ */ +/* $NetBSD: mt.c,v 1.52 2014/03/24 19:42:58 christos Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.51 2014/03/16 05:20:24 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.52 2014/03/24 19:42:58 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -189,7 +189,7 @@ mtattach(device_t parent, device_t self, { struct mt_softc *sc = device_private(self); struct hpibbus_attach_args *ha = aux; - int unit, hpibno, slave; + int hpibno, slave; sc->sc_dev = self; if (mtident(sc, ha) == 0) { @@ -197,7 +197,6 @@ mtattach(device_t parent, device_t self, return; } - unit = device_unit(self); hpibno = device_unit(parent); slave = ha->ha_slave; Index: src/sys/arch/hp300/dev/nhpib.c diff -u src/sys/arch/hp300/dev/nhpib.c:1.40 src/sys/arch/hp300/dev/nhpib.c:1.41 --- src/sys/arch/hp300/dev/nhpib.c:1.40 Mon Apr 28 16:23:19 2008 +++ src/sys/arch/hp300/dev/nhpib.c Mon Mar 24 15:42:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: nhpib.c,v 1.40 2008/04/28 20:23:19 martin Exp $ */ +/* $NetBSD: nhpib.c,v 1.41 2014/03/24 19:42:58 christos Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nhpib.c,v 1.40 2008/04/28 20:23:19 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nhpib.c,v 1.41 2014/03/24 19:42:58 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -508,14 +508,11 @@ nhpibintr(void *arg) int stat0; int stat1; -#ifdef lint - if (stat1 = unit) - return 1; -#endif if ((hd->hpib_ids & IDS_IR) == 0) return 0; stat0 = hd->hpib_mis; stat1 = hd->hpib_lis; + __USE(stat1); hq = TAILQ_FIRST(&hs->sc_queue); Index: src/sys/arch/hp300/dev/rd.c diff -u src/sys/arch/hp300/dev/rd.c:1.94 src/sys/arch/hp300/dev/rd.c:1.95 --- src/sys/arch/hp300/dev/rd.c:1.94 Sun Mar 16 01:20:24 2014 +++ src/sys/arch/hp300/dev/rd.c Mon Mar 24 15:42:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.94 2014/03/16 05:20:24 dholland Exp $ */ +/* $NetBSD: rd.c,v 1.95 2014/03/24 19:42:58 christos Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.94 2014/03/16 05:20:24 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.95 2014/03/24 19:42:58 christos Exp $"); #include "opt_useleds.h" @@ -768,7 +768,7 @@ rdstart(void *arg) { struct rd_softc *sc = arg; struct buf *bp = bufq_peek(sc->sc_tab); - int part, ctlr, slave; + int ctlr, slave; ctlr = device_unit(device_parent(sc->sc_dev)); slave = sc->sc_slave; @@ -779,7 +779,6 @@ again: printf("rdstart(%s): bp %p, %c\n", device_xname(sc->sc_dev), bp, (bp->b_flags & B_READ) ? 'R' : 'W'); #endif - part = rdpart(bp->b_dev); sc->sc_flags |= RDF_SEEK; sc->sc_ioc.c_unit = C_SUNIT(sc->sc_punit); sc->sc_ioc.c_volume = C_SVOL(0); @@ -1257,7 +1256,7 @@ rddump(dev_t dev, daddr_t blkno, void *v int sectoff; /* sector offset of partition */ int totwrt; /* total number of sectors left to write */ int nwrt; /* current number of sectors to write */ - int unit, part; + int part; int ctlr, slave; struct rd_softc *sc; struct disklabel *lp; @@ -1269,7 +1268,6 @@ rddump(dev_t dev, daddr_t blkno, void *v rddoingadump = 1; /* Decompose unit and partition. */ - unit = rdunit(dev); part = rdpart(dev); /* Make sure dump device is ok. */ Index: src/sys/arch/hp300/hp300/autoconf.c diff -u src/sys/arch/hp300/hp300/autoconf.c:1.103 src/sys/arch/hp300/hp300/autoconf.c:1.104 --- src/sys/arch/hp300/hp300/autoconf.c:1.103 Sun Mar 23 02:03:38 2014 +++ src/sys/arch/hp300/hp300/autoconf.c Mon Mar 24 15:42:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.103 2014/03/23 06:03:38 dholland Exp $ */ +/* $NetBSD: autoconf.c,v 1.104 2014/03/24 19:42:58 christos Exp $ */ /*- * Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.103 2014/03/23 06:03:38 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.104 2014/03/24 19:42:58 christos Exp $"); #include "dvbox.h" #include "gbox.h" @@ -300,7 +300,6 @@ void cpu_rootconf(void) { struct dev_data *dd; - device_t dv; struct vfsops *vops; /* @@ -342,7 +341,6 @@ cpu_rootconf(void) } if (dd == NULL) { printf("no network interface for NFS root"); - dv = NULL; } } if (vops != NULL) Index: src/sys/arch/hp300/hp300/bus_space.c diff -u src/sys/arch/hp300/hp300/bus_space.c:1.20 src/sys/arch/hp300/hp300/bus_space.c:1.21 --- src/sys/arch/hp300/hp300/bus_space.c:1.20 Sat Feb 12 00:15:39 2011 +++ src/sys/arch/hp300/hp300/bus_space.c Mon Mar 24 15:42:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space.c,v 1.20 2011/02/12 05:15:39 tsutsui Exp $ */ +/* $NetBSD: bus_space.c,v 1.21 2014/03/24 19:42:58 christos Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.20 2011/02/12 05:15:39 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.21 2014/03/24 19:42:58 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -199,7 +199,7 @@ hp300_bus_space_probe(bus_space_tag_t t, panic("%s: unupported data size %d", __func__, sz); /* NOTREACHED */ } - + __USE(i); nofault = NULL; return 1; } Index: src/sys/arch/hp300/hp300/machdep.c diff -u src/sys/arch/hp300/hp300/machdep.c:1.227 src/sys/arch/hp300/hp300/machdep.c:1.228 --- src/sys/arch/hp300/hp300/machdep.c:1.227 Fri Aug 16 09:39:47 2013 +++ src/sys/arch/hp300/hp300/machdep.c Mon Mar 24 15:42:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.227 2013/08/16 13:39:47 tsutsui Exp $ */ +/* $NetBSD: machdep.c,v 1.228 2014/03/24 19:42:58 christos Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.227 2013/08/16 13:39:47 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.228 2014/03/24 19:42:58 christos Exp $"); #include "opt_ddb.h" #include "opt_compat_netbsd.h" @@ -72,6 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v #include <sys/vnode.h> #include <sys/ksyms.h> #include <sys/module.h> +#include <sys/cpu.h> #ifdef DDB #include <machine/db_machdep.h> @@ -333,11 +334,6 @@ cpu_startup(void) extio_ex_malloc_safe = 1; } -/* - * Info for CTL_HW - */ -char cpu_model[120]; - struct hp300_model { int id; int mmuid; @@ -372,8 +368,9 @@ static const struct hp300_model hp300_mo static void identifycpu(void) { - const char *t, *mc, *s; - int i, len; + const char *t, *mc, *s, *mmu; + int i; + char fpu[64], cache[64]; /* * Find the model number. @@ -411,7 +408,6 @@ identifycpu(void) goto lose; } - sprintf(cpu_model, "HP 9000/%s (%sMHz MC680%s CPU", t, s, mc); /* * ...and the MMU type. @@ -419,68 +415,68 @@ identifycpu(void) switch (mmutype) { case MMU_68040: case MMU_68030: - strcat(cpu_model, "+MMU"); + mmu = "+MMU"; break; case MMU_68851: - strcat(cpu_model, ", MC68851 MMU"); + mmu = ", MC68851 MMU"; break; case MMU_HP: - strcat(cpu_model, ", HP MMU"); + mmu = ", HP MMU"; break; default: - printf("%s\nunknown MMU type %d\n", cpu_model, mmutype); + printf("MC680%s\nunknown MMU type %d\n", mc, mmutype); panic("startup"); } - len = strlen(cpu_model); - /* * ...and the FPU type. */ switch (fputype) { case FPU_68040: - len += sprintf(cpu_model + len, "+FPU"); + strlcpy(fpu, "+FPU", sizeof(fpu)); break; case FPU_68882: - len += sprintf(cpu_model + len, ", %sMHz MC68882 FPU", s); + snprintf(fpu, sizeof(fpu), ", %sMHz MC68882 FPU", s); break; case FPU_68881: - len += sprintf(cpu_model + len, ", %sMHz MC68881 FPU", + snprintf(fpu, sizeof(fpu), ", %sMHz MC68881 FPU", machineid == HP_350 ? "20" : "16.67"); break; case FPU_NONE: #ifdef FPU_EMULATE - len += sprintf(cpu_model + len, ", emulated FPU"); + strlcpy(fpu, ", emulated FPU", sizeof(fpu)); #else - len += sprintf(cpu_model + len, ", no FPU"); + strlcpy(fpu, ", no FPU", sizeof(fpu)); #endif break; default: - len += sprintf(cpu_model + len, ", unknown FPU"); + strlcpy(fpu, ", unknown FPU", sizeof(fpu)); } /* * ...and finally, the cache type. */ if (cputype == CPU_68040) - sprintf(cpu_model + len, ", 4k on-chip physical I/D caches"); + snprintf(cache, sizeof(cache), + ", 4k on-chip physical I/D caches"); else { switch (ectype) { case EC_VIRT: - sprintf(cpu_model + len, + snprintf(cache, sizeof(cache), ", %dK virtual-address cache", machineid == HP_320 ? 16 : 32); break; case EC_PHYS: - sprintf(cpu_model + len, + snprintf(cache, sizeof(cache), ", %dK physical-address cache", machineid == HP_370 ? 64 : 32); break; } } - strcat(cpu_model, ")"); - printf("%s\n", cpu_model); + cpu_setmodel("HP 9000/%s (%sMHz MC680%s CPU%s%s%s)", t, s, mc, + mmu, fpu, cache); + printf("%s\n", cpu_getmodel()); #ifdef DIAGNOSTIC printf("cpu: delay divisor %d", delay_divisor); if (mmuid) @@ -910,6 +906,7 @@ badaddr(void *addr) return 1; } i = *(volatile short *)addr; + __USE(i); nofault = (int *)0; return 0; } @@ -926,6 +923,7 @@ badbaddr(void *addr) return 1; } i = *(volatile char *)addr; + __USE(i); nofault = (int *) 0; return 0; } @@ -1076,11 +1074,6 @@ parityerrorfind(void) int i; int found; -#ifdef lint - i = o = pg = 0; - if (i) - return 0; -#endif /* * If looking is true we are searching for a known parity error * and it has just occurred. All we do is return to the higher @@ -1115,6 +1108,7 @@ parityerrorfind(void) for (o = 0; o < PAGE_SIZE; o += sizeof(int)) i = *ip++; } + __USE(i); /* * Getting here implies no fault was found. Should never happen. */