Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Remove extra 0x. This bug was added when replacing bitma...
details: https://anonhg.NetBSD.org/src/rev/4e500dbed6cc
branches: trunk
changeset: 822675:4e500dbed6cc
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Fri Mar 31 08:38:13 2017 +0000
description:
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".
diffstat:
sys/arch/hpcmips/vr/vrc4173bcu.c | 12 ++++++------
sys/arch/i386/mca/mca_machdep.c | 6 +++---
sys/arch/macppc/dev/mesh.c | 6 +++---
sys/arch/macppc/dev/snapper.c | 6 +++---
sys/arch/newsmips/apbus/spifi.c | 6 +++---
sys/arch/next68k/dev/esp.c | 14 +++++++-------
sys/arch/next68k/dev/mb8795.c | 10 +++++-----
sys/arch/next68k/dev/nextdma.c | 38 +++++++++++++++++++-------------------
sys/arch/next68k/next68k/isr.c | 8 ++++----
sys/arch/vax/vax/crl.c | 6 +++---
sys/arch/vax/vax/ka650.c | 6 +++---
sys/dev/ic/midway.c | 16 ++++++++--------
sys/dev/isa/if_iy.c | 14 +++++++-------
sys/dev/marvell/gtidmac.c | 10 +++++-----
sys/dev/pci/ichsmb.c | 12 ++++++------
sys/kern/vfs_subr.c | 6 +++---
16 files changed, 88 insertions(+), 88 deletions(-)
diffs (truncated from 753 to 300 lines):
diff -r da9940317176 -r 4e500dbed6cc sys/arch/hpcmips/vr/vrc4173bcu.c
--- a/sys/arch/hpcmips/vr/vrc4173bcu.c Fri Mar 31 06:49:44 2017 +0000
+++ b/sys/arch/hpcmips/vr/vrc4173bcu.c Fri Mar 31 08:38:13 2017 +0000
@@ -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 @@
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 @@
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
diff -r da9940317176 -r 4e500dbed6cc sys/arch/i386/mca/mca_machdep.c
--- a/sys/arch/i386/mca/mca_machdep.c Fri Mar 31 06:49:44 2017 +0000
+++ b/sys/arch/i386/mca/mca_machdep.c Fri Mar 31 08:38:13 2017 +0000
@@ -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 @@
"\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;
diff -r da9940317176 -r 4e500dbed6cc sys/arch/macppc/dev/mesh.c
--- a/sys/arch/macppc/dev/mesh.c Fri Mar 31 06:49:44 2017 +0000
+++ b/sys/arch/macppc/dev/mesh.c Fri Mar 31 08:38:13 2017 +0000
@@ -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 @@
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
diff -r da9940317176 -r 4e500dbed6cc sys/arch/macppc/dev/snapper.c
--- a/sys/arch/macppc/dev/snapper.c Fri Mar 31 06:49:44 2017 +0000
+++ b/sys/arch/macppc/dev/snapper.c Fri Mar 31 08:38:13 2017 +0000
@@ -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 @@
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;
diff -r da9940317176 -r 4e500dbed6cc sys/arch/newsmips/apbus/spifi.c
--- a/sys/arch/newsmips/apbus/spifi.c Fri Mar 31 06:49:44 2017 +0000
+++ b/sys/arch/newsmips/apbus/spifi.c Fri Mar 31 08:38:13 2017 +0000
@@ -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 @@
#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
diff -r da9940317176 -r 4e500dbed6cc sys/arch/next68k/dev/esp.c
--- a/sys/arch/next68k/dev/esp.c Fri Mar 31 06:49:44 2017 +0000
+++ b/sys/arch/next68k/dev/esp.c Fri Mar 31 08:38:13 2017 +0000
@@ -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 @@
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 @@
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 @@
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
}
diff -r da9940317176 -r 4e500dbed6cc sys/arch/next68k/dev/mb8795.c
--- a/sys/arch/next68k/dev/mb8795.c Fri Mar 31 06:49:44 2017 +0000
+++ b/sys/arch/next68k/dev/mb8795.c Fri Mar 31 08:38:13 2017 +0000
@@ -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 @@
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
diff -r da9940317176 -r 4e500dbed6cc sys/arch/next68k/dev/nextdma.c
--- a/sys/arch/next68k/dev/nextdma.c Fri Mar 31 06:49:44 2017 +0000
+++ b/sys/arch/next68k/dev/nextdma.c Fri Mar 31 08:38:13 2017 +0000
@@ -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 @@
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 @@
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 @@
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 @@
char sbuf[256];
printf("DMA: please send this output to port-next68k-maintainer%NetBSD.org@localhost:\n");
snprintb(sbuf, sizeof(sbuf), DMACSR_BITS, state);
- printf("DMA: state 0x%s\n",sbuf);
Home |
Main Index |
Thread Index |
Old Index