Module Name: src
Committed By: msaitoh
Date: Fri Mar 31 08:38:14 UTC 2017
Modified Files:
src/sys/arch/hpcmips/vr: vrc4173bcu.c
src/sys/arch/i386/mca: mca_machdep.c
src/sys/arch/macppc/dev: mesh.c snapper.c
src/sys/arch/newsmips/apbus: spifi.c
src/sys/arch/next68k/dev: esp.c mb8795.c nextdma.c
src/sys/arch/next68k/next68k: isr.c
src/sys/arch/vax/vax: crl.c ka650.c
src/sys/dev/ic: midway.c
src/sys/dev/isa: if_iy.c
src/sys/dev/marvell: gtidmac.c
src/sys/dev/pci: ichsmb.c
src/sys/kern: vfs_subr.c
Log Message:
Remove extra 0x. This bug was added when replacing bitmask_snprintf(9) with
snprintb(3) (in between NetBSD 5 and 6). Old bitmask_snprint(9) didn't add
0x" automatically for hexadecimal value, so old code used it with "0x%s".
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcmips/vr/vrc4173bcu.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/i386/mca/mca_machdep.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/macppc/dev/mesh.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/macppc/dev/snapper.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/newsmips/apbus/spifi.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/next68k/dev/esp.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/next68k/dev/mb8795.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/next68k/dev/nextdma.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/next68k/next68k/isr.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/vax/vax/crl.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/vax/vax/ka650.c
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/ic/midway.c
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/isa/if_iy.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/marvell/gtidmac.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.460 -r1.461 src/sys/kern/vfs_subr.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/hpcmips/vr/vrc4173bcu.c
diff -u src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.23 src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.24
--- src/sys/arch/hpcmips/vr/vrc4173bcu.c:1.23 Sat Mar 29 19:28:28 2014
+++ src/sys/arch/hpcmips/vr/vrc4173bcu.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vrc4173bcu.c,v 1.23 2014/03/29 19:28:28 christos Exp $ */
+/* $NetBSD: vrc4173bcu.c,v 1.24 2017/03/31 08:38:13 msaitoh Exp $ */
/*-
* Copyright (c) 2001,2002 Enami Tsugutomo.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrc4173bcu.c,v 1.23 2014/03/29 19:28:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrc4173bcu.c,v 1.24 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -344,19 +344,19 @@ vrc4173bcu_attach(device_t parent, devic
snprintb(buf, sizeof(buf),
"\20\1USB\2PCMCIA2\3PCMCIA1\4PS2CH2\5PS2CH1\6PIU\7AIU\10KIU"
"\11GIU\12AC97\13AC97-1\14B11\15B12\16DOZEPIU\17B14\20B15", reg);
- printf("%s: SYSINT1 = 0x%s\n", device_xname(self), buf);
+ printf("%s: SYSINT1 = %s\n", device_xname(self), buf);
reg = bus_space_read_2(sc->sc_iot, sc->sc_icuh, VRC4173ICU_MKIUINT);
snprintb(buf, sizeof(buf),
"\20\1SCANINT\2KDATRDY\3KDATLOST\4B3\5B4\6B5\7B6\10B7"
"\11B8\12B9\13B10\14B11\15B12\16B13\17B14\20B15", reg);
- printf("%s: MKIUINT = 0x%s\n", device_xname(self), buf);
+ printf("%s: MKIUINT = %s\n", device_xname(self), buf);
reg = bus_space_read_2(sc->sc_iot, sc->sc_icuh, VRC4173ICU_MSYSINT1);
snprintb(buf, sizeof(buf),
"\20\1USB\2PCMCIA2\3PCMCIA1\4PS2CH2\5PS2CH1\6PIU\7AIU\10KIU"
"\11GIU\12AC97\13AC97-1\14B11\15B12\16DOZEPIU\17B14\20B15", reg);
- printf("%s: MSYSINT1 = 0x%s\n", device_xname(self), buf);
+ printf("%s: MSYSINT1 = %s\n", device_xname(self), buf);
#if 1
reg = VRC4173ICU_USBINTR | VRC4173ICU_PIUINTR | VRC4173ICU_KIUINTR |
@@ -367,7 +367,7 @@ vrc4173bcu_attach(device_t parent, devic
snprintb(buf, sizeof(buf),
"\20\1USB\2PCMCIA2\3PCMCIA1\4PS2CH2\5PS2CH1\6PIU\7AIU\10KIU"
"\11GIU\12AC97\13AC97-1\14B11\15B12\16DOZEPIU\17B14\20B15", reg);
- printf("%s: MSYSINT1 = 0x%s\n", device_xname(self), buf);
+ printf("%s: MSYSINT1 = %s\n", device_xname(self), buf);
#endif
#endif
Index: src/sys/arch/i386/mca/mca_machdep.c
diff -u src/sys/arch/i386/mca/mca_machdep.c:1.43 src/sys/arch/i386/mca/mca_machdep.c:1.44
--- src/sys/arch/i386/mca/mca_machdep.c:1.43 Thu Sep 1 15:10:31 2011
+++ src/sys/arch/i386/mca/mca_machdep.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mca_machdep.c,v 1.43 2011/09/01 15:10:31 christos Exp $ */
+/* $NetBSD: mca_machdep.c,v 1.44 2017/03/31 08:38:13 msaitoh Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.43 2011/09/01 15:10:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca_machdep.c,v 1.44 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -311,7 +311,7 @@ mca_busprobe(void)
"\017KBDF"
"\020DMA32\n", (scp->feature2 << 8) | scp->feature1);
- aprint_verbose("BIOS CFG: Model-SubM-Rev: %02x-%02x-%02x, 0x%s\n",
+ aprint_verbose("BIOS CFG: Model-SubM-Rev: %02x-%02x-%02x, %s\n",
scp->model, scp->submodel, scp->bios_rev, buf);
MCA_system = (scp->feature1 & FEATURE_MCABUS) ? 1 : 0;
Index: src/sys/arch/macppc/dev/mesh.c
diff -u src/sys/arch/macppc/dev/mesh.c:1.38 src/sys/arch/macppc/dev/mesh.c:1.39
--- src/sys/arch/macppc/dev/mesh.c:1.38 Wed Feb 15 12:39:29 2017
+++ src/sys/arch/macppc/dev/mesh.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mesh.c,v 1.38 2017/02/15 12:39:29 tsutsui Exp $ */
+/* $NetBSD: mesh.c,v 1.39 2017/03/31 08:38:13 msaitoh Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.38 2017/02/15 12:39:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.39 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -343,7 +343,7 @@ mesh_intr(void *arg)
snprintb(buf1, sizeof buf1, MESH_STATUS0_BITMASK, status0);
snprintb(buf2, sizeof buf2, MESH_EXC_BITMASK, exception);
- printf("mesh_intr status0 = 0x%s (%s), exc = 0x%s\n",
+ printf("mesh_intr status0 = %s (%s), exc = %s\n",
buf1, scsi_phase[status0 & 7], buf2);
}
#endif
Index: src/sys/arch/macppc/dev/snapper.c
diff -u src/sys/arch/macppc/dev/snapper.c:1.40 src/sys/arch/macppc/dev/snapper.c:1.41
--- src/sys/arch/macppc/dev/snapper.c:1.40 Fri Jul 15 22:10:47 2016
+++ src/sys/arch/macppc/dev/snapper.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: snapper.c,v 1.40 2016/07/15 22:10:47 macallan Exp $ */
+/* $NetBSD: snapper.c,v 1.41 2017/03/31 08:38:13 msaitoh Exp $ */
/* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */
/* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.40 2016/07/15 22:10:47 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.41 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -2051,7 +2051,7 @@ snapper_init(struct snapper_softc *sc, i
char fcr[32];
snprintb(fcr, sizeof(fcr), FCR3C_BITMASK, obio_read_4(KEYLARGO_FCR1));
- printf("FCR(0x3c) 0x%s\n", fcr);
+ printf("FCR(0x3c) %s\n", fcr);
#endif
headphone_detect_intr = -1;
Index: src/sys/arch/newsmips/apbus/spifi.c
diff -u src/sys/arch/newsmips/apbus/spifi.c:1.17 src/sys/arch/newsmips/apbus/spifi.c:1.18
--- src/sys/arch/newsmips/apbus/spifi.c:1.17 Tue Dec 16 22:35:24 2008
+++ src/sys/arch/newsmips/apbus/spifi.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: spifi.c,v 1.17 2008/12/16 22:35:24 christos Exp $ */
+/* $NetBSD: spifi.c,v 1.18 2017/03/31 08:38:13 msaitoh Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spifi.c,v 1.17 2008/12/16 22:35:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spifi.c,v 1.18 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -455,7 +455,7 @@ spifi_intr(void *v)
#ifdef SPIFI_DEBUG
snprintb(bitmask, sizeof bitmask, INTR_BITMASK, intr);
- printf("spifi_intr intr = 0x%s (%s), ", bitmask,
+ printf("spifi_intr intr = %s (%s), ", bitmask,
scsi_phase_name[(reg->prstat >> 3) & 7]);
printf("state = 0x%x, icond = 0x%x\n", state, icond);
#endif
Index: src/sys/arch/next68k/dev/esp.c
diff -u src/sys/arch/next68k/dev/esp.c:1.63 src/sys/arch/next68k/dev/esp.c:1.64
--- src/sys/arch/next68k/dev/esp.c:1.63 Sat Mar 29 19:20:14 2014
+++ src/sys/arch/next68k/dev/esp.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.63 2014/03/29 19:20:14 christos Exp $ */
+/* $NetBSD: esp.c,v 1.64 2017/03/31 08:38:13 msaitoh Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.63 2014/03/29 19:20:14 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.64 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -505,7 +505,7 @@ esp_dma_intr(struct ncr53c9x_softc *sc)
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
(*(volatile u_long *)IIOV(NEXT_P_INTRSTAT)));
- printf("esp_dma_isintr = 0x%s\n", sbuf);
+ printf("esp_dma_isintr = %s\n", sbuf);
}
#endif
@@ -744,11 +744,11 @@ esp_dma_reset(struct ncr53c9x_softc *sc)
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
(*(volatile u_long *)IIOV(NEXT_P_INTRSTAT)));
- printf(" *intrstat = 0x%s\n", sbuf);
+ printf(" *intrstat = %s\n", sbuf);
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
(*(volatile u_long *)IIOV(NEXT_P_INTRMASK)));
- printf(" *intrmask = 0x%s\n", sbuf);
+ printf(" *intrmask = %s\n", sbuf);
}
#endif
@@ -1932,11 +1932,11 @@ esp_dmacb_shutdown(void *arg)
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
(*(volatile u_long *)IIOV(NEXT_P_INTRSTAT)));
- printf(" *intrstat = 0x%s\n", sbuf);
+ printf(" *intrstat = %s\n", sbuf);
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
(*(volatile u_long *)IIOV(NEXT_P_INTRMASK)));
- printf(" *intrmask = 0x%s\n", sbuf);
+ printf(" *intrmask = %s\n", sbuf);
}
#endif
}
Index: src/sys/arch/next68k/dev/mb8795.c
diff -u src/sys/arch/next68k/dev/mb8795.c:1.57 src/sys/arch/next68k/dev/mb8795.c:1.58
--- src/sys/arch/next68k/dev/mb8795.c:1.57 Thu Dec 15 09:28:03 2016
+++ src/sys/arch/next68k/dev/mb8795.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mb8795.c,v 1.57 2016/12/15 09:28:03 ozaki-r Exp $ */
+/* $NetBSD: mb8795.c,v 1.58 2017/03/31 08:38:13 msaitoh Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.57 2016/12/15 09:28:03 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb8795.c,v 1.58 2017/03/31 08:38:13 msaitoh Exp $");
#include "opt_inet.h"
@@ -342,15 +342,15 @@ mb8795_rint(struct mb8795_softc *sc)
snprintb(sbuf, sizeof(sbuf), MB8795_RXSTAT_BITS,
MB_READ_REG(sc, MB8795_RXSTAT));
- printf("rxstat = 0x%s\n", sbuf);
+ printf("rxstat = %s\n", sbuf);
snprintb(sbuf, sizeof(sbuf), MB8795_RXMASK_BITS,
MB_READ_REG(sc, MB8795_RXMASK));
- printf("rxmask = 0x%s\n", sbuf);
+ printf("rxmask = %s\n", sbuf);
snprintb(sbuf, sizeof(sbuf), MB8795_RXMODE_BITS,
MB_READ_REG(sc, MB8795_RXMODE));
- printf("rxmode = 0x%s\n", sbuf);
+ printf("rxmode = %s\n", sbuf);
}
#endif
Index: src/sys/arch/next68k/dev/nextdma.c
diff -u src/sys/arch/next68k/dev/nextdma.c:1.49 src/sys/arch/next68k/dev/nextdma.c:1.50
--- src/sys/arch/next68k/dev/nextdma.c:1.49 Tue Mar 25 19:41:32 2014
+++ src/sys/arch/next68k/dev/nextdma.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: nextdma.c,v 1.49 2014/03/25 19:41:32 christos Exp $ */
+/* $NetBSD: nextdma.c,v 1.50 2017/03/31 08:38:13 msaitoh Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
* All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nextdma.c,v 1.49 2014/03/25 19:41:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nextdma.c,v 1.50 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -256,7 +256,7 @@ nextdma_init(struct nextdma_softc *nsc)
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
NEXT_I_BIT(nsc->sc_chan->nd_intr));
- printf("DMA init ipl (%ld) intr(0x%s)\n",
+ printf("DMA init ipl (%ld) intr(%s)\n",
NEXT_I_IPL(nsc->sc_chan->nd_intr), sbuf);
}
#endif
@@ -538,7 +538,7 @@ nextdma_enet_intr(void *arg)
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
NEXT_I_BIT(nsc->sc_chan->nd_intr));
- printf("DMA interrupt ipl (%ld) intr(0x%s)\n",
+ printf("DMA interrupt ipl (%ld) intr(%s)\n",
NEXT_I_IPL(nsc->sc_chan->nd_intr), sbuf);
}
#endif
@@ -561,7 +561,7 @@ nextdma_enet_intr(void *arg)
char sbuf[256];
nextdma_print(nsc);
snprintb(sbuf, sizeof(sbuf), DMACSR_BITS, state);
- printf("DMA: state 0x%s\n",sbuf);
+ printf("DMA: state %s\n",sbuf);
panic("DMA complete not set in interrupt");
}
#endif
@@ -622,7 +622,7 @@ nextdma_enet_intr(void *arg)
char sbuf[256];
printf("DMA: please send this output to port-next68k-maintai...@netbsd.org:\n");
snprintb(sbuf, sizeof(sbuf), DMACSR_BITS, state);
- printf("DMA: state 0x%s\n",sbuf);
+ printf("DMA: state %s\n",sbuf);
nextdma_print(nsc);
panic("DMA: condition 0x%02x not yet documented to occur",result);
}
@@ -643,7 +643,7 @@ nextdma_enet_intr(void *arg)
if ((slimit < onext) || (slimit > olimit)) {
char sbuf[256];
snprintb(sbuf, sizeof(sbuf), DMACSR_BITS, state);
- printf("DMA: state 0x%s\n",sbuf);
+ printf("DMA: state %s\n",sbuf);
nextdma_print(nsc);
panic("DMA: Unexpected limit register (0x%08lx) in finish_xfer",slimit);
}
@@ -654,7 +654,7 @@ nextdma_enet_intr(void *arg)
if (slimit != olimit) {
char sbuf[256];
snprintb(sbuf, sizeof(sbuf), DMACSR_BITS, state);
- printf("DMA: state 0x%s\n",sbuf);
+ printf("DMA: state %s\n",sbuf);
nextdma_print(nsc);
panic("DMA: short limit register (0x%08lx) w/o finishing map.",slimit);
}
@@ -685,7 +685,7 @@ nextdma_enet_intr(void *arg)
if (NEXTDMA_DEBUG) {
char sbuf[256];
snprintb(sbuf, sizeof(sbuf), DMACSR_BITS, state);
- printf("CLNDMAP: dd->dd_csr = 0x%s\n", sbuf);
+ printf("CLNDMAP: dd->dd_csr = %s\n", sbuf);
}
#endif
if (state & DMACSR_ENABLE) {
@@ -733,7 +733,7 @@ nextdma_enet_intr(void *arg)
snprintb(sbuf, sizeof(sbuf),
NEXT_INTR_BITS, NEXT_I_BIT(nsc->sc_chan->nd_intr));
- printf("DMA exiting interrupt ipl (%ld) intr(0x%s)\n",
+ printf("DMA exiting interrupt ipl (%ld) intr(%s)\n",
NEXT_I_IPL(nsc->sc_chan->nd_intr), sbuf);
}
#endif
@@ -770,7 +770,7 @@ nextdma_start(struct nextdma_softc *nsc,
snprintb(sbuf, sizeof(sbuf),
NEXT_INTR_BITS, NEXT_I_BIT(nsc->sc_chan->nd_intr));
- panic("DMA trying to start before previous finished on intr(0x%s)", sbuf);
+ panic("DMA trying to start before previous finished on intr(%s)", sbuf);
}
#endif
@@ -780,7 +780,7 @@ nextdma_start(struct nextdma_softc *nsc,
snprintb(sbuf, sizeof(sbuf),
NEXT_INTR_BITS, NEXT_I_BIT(nsc->sc_chan->nd_intr));
- printf("DMA start (%ld) intr(0x%s)\n",
+ printf("DMA start (%ld) intr(%s)\n",
NEXT_I_IPL(nsc->sc_chan->nd_intr), sbuf);
}
#endif
@@ -823,7 +823,7 @@ nextdma_start(struct nextdma_softc *nsc,
snprintb(sbuf, sizeof(sbuf),
NEXT_INTR_BITS, NEXT_I_BIT(nsc->sc_chan->nd_intr));
- printf("DMA initiating DMA %s of %d segments on intr(0x%s)\n",
+ printf("DMA initiating DMA %s of %d segments on intr(%s)\n",
(dmadir == DMACSR_SETREAD ? "read" : "write"), stat->nd_map->dm_nsegs, sbuf);
}
#endif
@@ -879,11 +879,11 @@ nextdma_print(struct nextdma_softc *nsc)
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
*(volatile u_long *)IIOV(NEXT_P_INTRSTAT));
- printf("NDMAP: *intrstat = 0x%s\n", sbuf);
+ printf("NDMAP: *intrstat = %s\n", sbuf);
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
*(volatile u_long *)IIOV(NEXT_P_INTRMASK));
- printf("NDMAP: *intrmask = 0x%s\n", sbuf);
+ printf("NDMAP: *intrmask = %s\n", sbuf);
/* NDMAP is Next DMA Print (really!) */
@@ -937,7 +937,7 @@ nextdma_print(struct nextdma_softc *nsc)
}
snprintb(sbuf, sizeof(sbuf), DMACSR_BITS, dd_csr);
- printf("NDMAP: dd->dd_csr = 0x%s\n", sbuf);
+ printf("NDMAP: dd->dd_csr = %s\n", sbuf);
printf("NDMAP: dd->dd_saved_next = 0x%08lx\n", dd_saved_next);
printf("NDMAP: dd->dd_saved_limit = 0x%08lx\n", dd_saved_limit);
@@ -951,7 +951,7 @@ nextdma_print(struct nextdma_softc *nsc)
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
NEXT_I_BIT(nsc->sc_chan->nd_intr));
- printf("NDMAP: interrupt ipl (%ld) intr(0x%s)\n",
+ printf("NDMAP: interrupt ipl (%ld) intr(%s)\n",
NEXT_I_IPL(nsc->sc_chan->nd_intr), sbuf);
}
@@ -995,7 +995,7 @@ nextdma_debug_enetr_dumpstate(void)
char sbuf[256];
if (nextdma_debug_enetr_state[i]) {
snprintb(sbuf, sizeof(sbuf), DMACSR_BITS, nextdma_debug_enetr_state[i]);
- printf("DMA: 0x%02x state 0x%s\n",i,sbuf);
+ printf("DMA: 0x%02x state %s\n",i,sbuf);
}
i++;
i %= (sizeof(nextdma_debug_enetr_state)/sizeof(unsigned int));
@@ -1014,7 +1014,7 @@ nextdma_debug_scsi_dumpstate(void)
char sbuf[256];
if (nextdma_debug_scsi_state[i]) {
snprintb(sbuf, sizeof(sbuf), DMACSR_BITS, nextdma_debug_scsi_state[i]);
- printf("DMA: 0x%02x state 0x%s\n",i,sbuf);
+ printf("DMA: 0x%02x state %s\n",i,sbuf);
}
i++;
i %= (sizeof(nextdma_debug_scsi_state)/sizeof(unsigned int));
Index: src/sys/arch/next68k/next68k/isr.c
diff -u src/sys/arch/next68k/next68k/isr.c:1.28 src/sys/arch/next68k/next68k/isr.c:1.29
--- src/sys/arch/next68k/next68k/isr.c:1.28 Mon Dec 20 00:25:40 2010
+++ src/sys/arch/next68k/next68k/isr.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.c,v 1.28 2010/12/20 00:25:40 matt Exp $ */
+/* $NetBSD: isr.c,v 1.29 2017/03/31 08:38:13 msaitoh Exp $ */
/*
* This file was taken from mvme68k/mvme68k/isr.c
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.28 2010/12/20 00:25:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.29 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -331,11 +331,11 @@ isrdispatch_autovec(struct clockframe *f
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
(*(volatile u_long *)IIOV(NEXT_P_INTRSTAT)));
- printf(" *intrstat = 0x%s\n", sbuf);
+ printf(" *intrstat = %s\n", sbuf);
snprintb(sbuf, sizeof(sbuf), NEXT_INTR_BITS,
(*(volatile u_long *)IIOV(NEXT_P_INTRMASK)));
- printf(" *intrmask = 0x%s\n", sbuf);
+ printf(" *intrmask = %s\n", sbuf);
}
#endif
Index: src/sys/arch/vax/vax/crl.c
diff -u src/sys/arch/vax/vax/crl.c:1.33 src/sys/arch/vax/vax/crl.c:1.34
--- src/sys/arch/vax/vax/crl.c:1.33 Thu Jul 7 06:55:39 2016
+++ src/sys/arch/vax/vax/crl.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: crl.c,v 1.33 2016/07/07 06:55:39 msaitoh Exp $ */
+/* $NetBSD: crl.c,v 1.34 2017/03/31 08:38:13 msaitoh Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crl.c,v 1.33 2016/07/07 06:55:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crl.c,v 1.34 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -229,7 +229,7 @@ crlintr(void *arg)
crlstat.crl_cs);
snprintb(sbuf2, sizeof(sbuf2), CRLDS_BITS,
crlstat.crl_ds);
- printf("crlcs=0x%s, crlds=0x%s\n", sbuf, sbuf2);
+ printf("crlcs=%s, crlds=%s\n", sbuf, sbuf2);
break;
}
Index: src/sys/arch/vax/vax/ka650.c
diff -u src/sys/arch/vax/vax/ka650.c:1.37 src/sys/arch/vax/vax/ka650.c:1.38
--- src/sys/arch/vax/vax/ka650.c:1.37 Fri Dec 23 07:15:28 2016
+++ src/sys/arch/vax/vax/ka650.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ka650.c,v 1.37 2016/12/23 07:15:28 cherry Exp $ */
+/* $NetBSD: ka650.c,v 1.38 2017/03/31 08:38:13 msaitoh Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka650.c,v 1.37 2016/12/23 07:15:28 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka650.c,v 1.38 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -202,7 +202,7 @@ ka650_mchk(void *cmcf)
mcf->mc65_mrvaddr, mcf->mc65_istate1, mcf->mc65_istate2,
mcf->mc65_pc, mcf->mc65_psl);
snprintb(sbuf, sizeof(sbuf), DMASER_BITS, ka650merr_ptr->merr_dser);
- printf("dmaser=0x%s qbear=0x%x dmaear=0x%x\n", sbuf,
+ printf("dmaser=%s qbear=0x%x dmaear=0x%x\n", sbuf,
(int)ka650merr_ptr->merr_qbear,
(int)ka650merr_ptr->merr_dear);
ka650merr_ptr->merr_dser = DSER_CLEAR;
Index: src/sys/dev/ic/midway.c
diff -u src/sys/dev/ic/midway.c:1.99 src/sys/dev/ic/midway.c:1.100
--- src/sys/dev/ic/midway.c:1.99 Tue Jan 24 09:05:28 2017
+++ src/sys/dev/ic/midway.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: midway.c,v 1.99 2017/01/24 09:05:28 ozaki-r Exp $ */
+/* $NetBSD: midway.c,v 1.100 2017/03/31 08:38:13 msaitoh Exp $ */
/* (sync'd to midway.c 1.68) */
/*
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.99 2017/01/24 09:05:28 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.100 2017/03/31 08:38:13 msaitoh Exp $");
#include "opt_natm.h"
@@ -2592,7 +2592,7 @@ EN_INTR_TYPE en_intr(void *arg)
char sbuf[256];
snprintb(sbuf, sizeof(sbuf), MID_INTBITS, reg);
- printf("%s: interrupt=0x%s\n", device_xname(sc->sc_dev), sbuf);
+ printf("%s: interrupt=%s\n", device_xname(sc->sc_dev), sbuf);
}
#endif
@@ -2604,7 +2604,7 @@ EN_INTR_TYPE en_intr(void *arg)
char sbuf[256];
snprintb(sbuf, sizeof(sbuf), MID_INTBITS, reg);
- printf("%s: unexpected interrupt=0x%s, resetting card\n",
+ printf("%s: unexpected interrupt=%s, resetting card\n",
device_xname(sc->sc_dev), sbuf);
#ifdef EN_DEBUG
#ifdef DDB
@@ -3318,7 +3318,7 @@ int en_dump(int unit, int level)
continue;
snprintb(sbuf, sizeof(sbuf), END_BITS, level);
- printf("dumping device %s at level 0x%s\n", device_xname(sc->sc_dev), sbuf);
+ printf("dumping device %s at level %s\n", device_xname(sc->sc_dev), sbuf);
if (sc->dtq_us == 0) {
printf("<hasn't been en_init'd yet>\n");
@@ -3366,13 +3366,13 @@ int en_dump(int unit, int level)
printf("resid = 0x%x\n", EN_READ(sc, MID_RESID));
snprintb(ybuf, sizeof(ybuf), MID_INTBITS, EN_READ(sc, MID_INTSTAT));
- printf("interrupt status = 0x%s\n", ybuf);
+ printf("interrupt status = %s\n", ybuf);
snprintb(ybuf, sizeof(ybuf), MID_INTBITS, EN_READ(sc, MID_INTENA));
- printf("interrupt enable = 0x%s\n", ybuf);
+ printf("interrupt enable = %s\n", ybuf);
snprintb(ybuf, sizeof(ybuf), MID_MCSRBITS, EN_READ(sc, MID_MAST_CSR));
- printf("mcsr = 0x%s\n", ybuf);
+ printf("mcsr = %s\n", ybuf);
printf("serv_write = [chip=%d] [us=%d]\n", EN_READ(sc, MID_SERV_WRITE),
MID_SL_A2REG(sc->hwslistp));
Index: src/sys/dev/isa/if_iy.c
diff -u src/sys/dev/isa/if_iy.c:1.99 src/sys/dev/isa/if_iy.c:1.100
--- src/sys/dev/isa/if_iy.c:1.99 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/isa/if_iy.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iy.c,v 1.99 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: if_iy.c,v 1.100 2017/03/31 08:38:13 msaitoh Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.99 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.100 2017/03/31 08:38:13 msaitoh Exp $");
#include "opt_inet.h"
@@ -407,14 +407,14 @@ iystop(struct iy_softc *sc)
snprintb(sbuf, sizeof(sbuf),
"\020\6MAX_COL\7HRT_BEAT\010TX_DEF\011UND_RUN"
"\012JERR\013LST_CRS\014LTCOL\016TX_OK\020COLL", v);
- printf("0x%s", sbuf);
+ printf("%s", sbuf);
p = le16toh(bus_space_read_stream_2(iot, ioh, MEM_PORT_REG));
printf(" 0x%04x", p);
v = le16toh(bus_space_read_stream_2(iot, ioh, MEM_PORT_REG));
snprintb(sbuf, sizeof(sbuf), "\020\020Ch", v);
- printf(" 0x%s\n", sbuf);
+ printf(" %s\n", sbuf);
} while (v & 0x8000);
#endif
@@ -499,7 +499,7 @@ iyinit(struct iy_softc *sc)
snprintb(sbuf, sizeof(sbuf),
"\020\1LnkInDis\2PolCor\3TPE\4JabberDis\5NoAport\6BNC",
temp);
- printf("%s: media select was 0x%s ", device_xname(sc->sc_dev),
+ printf("%s: media select was %s ", device_xname(sc->sc_dev),
sbuf);
}
#endif
@@ -540,7 +540,7 @@ iyinit(struct iy_softc *sc)
snprintb(sbuf, sizeof(sbuf),
"\020\1LnkInDis\2PolCor\3TPE\4JabberDis\5NoAport\6BNC",
temp);
- printf("changed to 0x%s\n", sbuf);
+ printf("changed to %s\n", sbuf);
}
#endif
@@ -1141,7 +1141,7 @@ iy_intr_tx(struct iy_softc *sc)
"\011UND_RUN\012JERR\013LST_CRS"
"\014LTCOL\016TX_OK\020COLL", txstat2);
- printf("txstat 0x%x stat2 0x%s next 0x%x len 0x%x\n",
+ printf("txstat 0x%x stat2 %s next 0x%x len 0x%x\n",
txstatus, sbuf, txnext, txlen);
}
#endif
Index: src/sys/dev/marvell/gtidmac.c
diff -u src/sys/dev/marvell/gtidmac.c:1.13 src/sys/dev/marvell/gtidmac.c:1.14
--- src/sys/dev/marvell/gtidmac.c:1.13 Sat Jan 7 14:44:26 2017
+++ src/sys/dev/marvell/gtidmac.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gtidmac.c,v 1.13 2017/01/07 14:44:26 kiyohara Exp $ */
+/* $NetBSD: gtidmac.c,v 1.14 2017/03/31 08:38:13 msaitoh Exp $ */
/*
* Copyright (c) 2008, 2012, 2016 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtidmac.c,v 1.13 2017/01/07 14:44:26 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtidmac.c,v 1.14 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1978,7 +1978,7 @@ gtidmac_dump_xorereg(struct gtidmac_soft
"\177\020"
"b\017RegAccProtect\0b\016DesSwp\0b\015DwrReqSwp\0b\014DrdResSwp\0",
val);
- printf(" Configuration : 0x%s\n", buf);
+ printf(" Configuration : %s\n", buf);
opmode = val & MVXORE_XEXCR_OM_MASK;
printf(" OperationMode : %s operation\n",
opmode == MVXORE_XEXCR_OM_XOR ? "XOR calculate" :
@@ -2076,7 +2076,7 @@ gtidmac_dump_xoredesc(struct gtidmac_sof
snprintb(buf, sizeof(buf), "\177\020b\037Own\0b\036Success\0",
desc->stat);
- printf(" Status : 0x%s\n", buf);
+ printf(" Status : %s\n", buf);
if (desc->cmd & MVXORE_DESC_CMD_CRCLAST && post)
printf(" CRC-32 Result : 0x%08x\n",
desc->result);
@@ -2085,7 +2085,7 @@ gtidmac_dump_xoredesc(struct gtidmac_sof
"b\007Src7Cmd\0b\006Src6Cmd\0b\005Src5Cmd\0b\004Src4Cmd\0"
"b\003Src3Cmd\0b\002Src2Cmd\0b\001Src1Cmd\0b\000Src0Cmd\0",
desc->cmd);
- printf(" Command : 0x%s\n", buf);
+ printf(" Command : %s\n", buf);
printf(" Next Descriptor Address : 0x%08x\n", desc->nextda);
printf(" Byte Count : 0x%06x\n", desc->bcnt);
printf(" Destination Address : 0x%08x\n", desc->dstaddr);
Index: src/sys/dev/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.49 src/sys/dev/pci/ichsmb.c:1.50
--- src/sys/dev/pci/ichsmb.c:1.49 Wed Mar 15 06:40:34 2017
+++ src/sys/dev/pci/ichsmb.c Fri Mar 31 08:38:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.49 2017/03/15 06:40:34 msaitoh Exp $ */
+/* $NetBSD: ichsmb.c,v 1.50 2017/03/31 08:38:13 msaitoh Exp $ */
/* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.49 2017/03/15 06:40:34 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.50 2017/03/31 08:38:13 msaitoh Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -287,7 +287,7 @@ ichsmb_i2c_exec(void *cookie, i2c_op_t o
}
#ifdef ICHIIC_DEBUG
snprintb(fbuf, sizeof(fbuf), LPCIB_SMB_HS_BITS, st);
- printf("%s: exec: st 0x%s\n", device_xname(sc->sc_dev), fbuf);
+ printf("%s: exec: st %s\n", device_xname(sc->sc_dev), fbuf);
#endif
if (st & LPCIB_SMB_HS_BUSY)
return (1);
@@ -379,7 +379,7 @@ timeout:
snprintb(fbuf, sizeof(fbuf), LPCIB_SMB_HS_BITS, st);
aprint_error_dev(sc->sc_dev,
"exec: op %d, addr 0x%02x, cmdlen %zd, len %zd, "
- "flags 0x%02x: timeout, status 0x%s\n",
+ "flags 0x%02x: timeout, status %s\n",
op, addr, cmdlen, len, flags, fbuf);
bus_space_write_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HC,
LPCIB_SMB_HC_KILL);
@@ -387,7 +387,7 @@ timeout:
st = bus_space_read_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS);
if ((st & LPCIB_SMB_HS_FAILED) == 0) {
snprintb(fbuf, sizeof(fbuf), LPCIB_SMB_HS_BITS, st);
- aprint_error_dev(sc->sc_dev, "abort failed, status 0x%s\n",
+ aprint_error_dev(sc->sc_dev, "abort failed, status %s\n",
fbuf);
}
bus_space_write_1(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS, st);
@@ -415,7 +415,7 @@ ichsmb_intr(void *arg)
#ifdef ICHIIC_DEBUG
snprintb(fbuf, sizeof(fbuf), LPCIB_SMB_HS_BITS, st);
- printf("%s: intr st 0x%s\n", device_xname(sc->sc_dev), fbuf);
+ printf("%s: intr st %s\n", device_xname(sc->sc_dev), fbuf);
#endif
/* Clear status bits */
Index: src/sys/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.460 src/sys/kern/vfs_subr.c:1.461
--- src/sys/kern/vfs_subr.c:1.460 Fri Feb 17 08:25:15 2017
+++ src/sys/kern/vfs_subr.c Fri Mar 31 08:38:14 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.460 2017/02/17 08:25:15 hannken Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.461 2017/03/31 08:38:14 msaitoh Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.460 2017/02/17 08:25:15 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.461 2017/03/31 08:38:14 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1510,7 +1510,7 @@ vfs_buf_print(struct buf *bp, int full,
snprintb(bf, sizeof(bf),
buf_flagbits, bp->b_flags | bp->b_oflags | bp->b_cflags);
- (*pr)(" error %d flags 0x%s\n", bp->b_error, bf);
+ (*pr)(" error %d flags %s\n", bp->b_error, bf);
(*pr)(" bufsize 0x%lx bcount 0x%lx resid 0x%lx\n",
bp->b_bufsize, bp->b_bcount, bp->b_resid);
