Module Name: src
Committed By: msaitoh
Date: Wed Mar 29 09:04:36 UTC 2017
Modified Files:
src/sys/arch/evbarm/stand/boot2440: dm9000.c
src/sys/arch/xen/xen: xpci_xenbus.c
src/sys/dev/ic: wdc.c wi.c
src/sys/dev/isa: nsclpcsio_isa.c
src/sys/dev/pci: piixpm.c
Log Message:
Fix 0x%d and 0x%u.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/stand/boot2440/dm9000.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/xen/xen/xpci_xenbus.c
cvs rdiff -u -r1.282 -r1.283 src/sys/dev/ic/wdc.c
cvs rdiff -u -r1.242 -r1.243 src/sys/dev/ic/wi.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/isa/nsclpcsio_isa.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/piixpm.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/evbarm/stand/boot2440/dm9000.c
diff -u src/sys/arch/evbarm/stand/boot2440/dm9000.c:1.2 src/sys/arch/evbarm/stand/boot2440/dm9000.c:1.3
--- src/sys/arch/evbarm/stand/boot2440/dm9000.c:1.2 Thu Feb 23 22:20:51 2012
+++ src/sys/arch/evbarm/stand/boot2440/dm9000.c Wed Mar 29 09:04:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000.c,v 1.2 2012/02/23 22:20:51 nisimura Exp $ */
+/* $NetBSD: dm9000.c,v 1.3 2017/03/29 09:04:35 msaitoh Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -193,7 +193,7 @@ dm9k_init(unsigned int tag, void *aux)
unsigned int val, fdx;
val = CSR_READ_1(l, CHIPR);
- printf("DM9000 rev. 0x%d", val);
+ printf("DM9000 rev. %#x", val);
val = CSR_READ_1(l, ISR);
printf(", %d bit mode\n", (val & 1<<7) ? 8 : 16);
Index: src/sys/arch/xen/xen/xpci_xenbus.c
diff -u src/sys/arch/xen/xen/xpci_xenbus.c:1.14 src/sys/arch/xen/xen/xpci_xenbus.c:1.15
--- src/sys/arch/xen/xen/xpci_xenbus.c:1.14 Sun Oct 13 12:29:42 2013
+++ src/sys/arch/xen/xen/xpci_xenbus.c Wed Mar 29 09:04:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: xpci_xenbus.c,v 1.14 2013/10/13 12:29:42 tsutsui Exp $ */
+/* $NetBSD: xpci_xenbus.c,v 1.15 2017/03/29 09:04:35 msaitoh Exp $ */
/*
* Copyright (c) 2009 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.14 2013/10/13 12:29:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.15 2017/03/29 09:04:35 msaitoh Exp $");
#include "opt_xen.h"
@@ -188,7 +188,7 @@ xpci_xenbus_resume(void *p)
error = xenbus_grant_ring(sc->sc_xbusd, ma, &sc->sc_shared_gntref);
if (error)
return error;
- DPRINTF(("shared %p ma 0x%jx ref 0x%u\n", shared, (uintmax_t)ma,
+ DPRINTF(("shared %p ma 0x%jx ref %#x\n", shared, (uintmax_t)ma,
sc->sc_shared_gntref));
error = xenbus_alloc_evtchn(sc->sc_xbusd, &sc->sc_evtchn);
if (error)
Index: src/sys/dev/ic/wdc.c
diff -u src/sys/dev/ic/wdc.c:1.282 src/sys/dev/ic/wdc.c:1.283
--- src/sys/dev/ic/wdc.c:1.282 Wed Aug 17 22:03:02 2016
+++ src/sys/dev/ic/wdc.c Wed Mar 29 09:04:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc.c,v 1.282 2016/08/17 22:03:02 skrll Exp $ */
+/* $NetBSD: wdc.c,v 1.283 2017/03/29 09:04:35 msaitoh Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.282 2016/08/17 22:03:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.283 2017/03/29 09:04:35 msaitoh Exp $");
#include "opt_ata.h"
#include "opt_wdc.h"
@@ -698,7 +698,7 @@ wdcprobe1(struct ata_channel *chp, int p
ret_value = __wdcwait_reset(chp, ret_value, poll);
s = splbio();
#endif
- ATADEBUG_PRINT(("%s:%d: after reset, ret_value=0x%d\n",
+ ATADEBUG_PRINT(("%s:%d: after reset, ret_value=%#x\n",
__func__, chp->ch_channel, ret_value), DEBUG_PROBE);
/* if reset failed, there's nothing here */
Index: src/sys/dev/ic/wi.c
diff -u src/sys/dev/ic/wi.c:1.242 src/sys/dev/ic/wi.c:1.243
--- src/sys/dev/ic/wi.c:1.242 Thu Feb 2 10:05:35 2017
+++ src/sys/dev/ic/wi.c Wed Mar 29 09:04:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: wi.c,v 1.242 2017/02/02 10:05:35 nonaka Exp $ */
+/* $NetBSD: wi.c,v 1.243 2017/03/29 09:04:35 msaitoh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.242 2017/02/02 10:05:35 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.243 2017/03/29 09:04:35 msaitoh Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@@ -3393,7 +3393,7 @@ wi_dump_pkt(struct wi_frame *wh, struct
ni ? ni->ni_rates.rs_rates[ni->ni_txrate] & IEEE80211_RATE_VAL
: -1,
rssi);
- printf(" status 0x%x rx_tstamp1 %u rx_tstamp0 0x%u rx_silence %u\n",
+ printf(" status 0x%x rx_tstamp1 %#x rx_tstamp0 %#x rx_silence %u\n",
le16toh(wh->wi_status), le16toh(wh->wi_rx_tstamp1),
le16toh(wh->wi_rx_tstamp0), wh->wi_rx_silence);
printf(" rx_signal %u rx_rate %u rx_flow %u\n",
Index: src/sys/dev/isa/nsclpcsio_isa.c
diff -u src/sys/dev/isa/nsclpcsio_isa.c:1.31 src/sys/dev/isa/nsclpcsio_isa.c:1.32
--- src/sys/dev/isa/nsclpcsio_isa.c:1.31 Thu Apr 23 23:23:00 2015
+++ src/sys/dev/isa/nsclpcsio_isa.c Wed Mar 29 09:04:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: nsclpcsio_isa.c,v 1.31 2015/04/23 23:23:00 pgoyette Exp $ */
+/* $NetBSD: nsclpcsio_isa.c,v 1.32 2017/03/29 09:04:36 msaitoh Exp $ */
/*
* Copyright (c) 2002
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.31 2015/04/23 23:23:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.32 2017/03/29 09:04:36 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -357,7 +357,7 @@ nsclpcsio_isa_attach(device_t parent, de
return;
}
- aprint_normal(": NSC PC87366 rev. 0x%d ",
+ aprint_normal(": NSC PC87366 rev. %d ",
nsread(sc->sc_iot, sc->sc_ioh, SIO_REG_SRID));
/* Configure all supported logical devices */
Index: src/sys/dev/pci/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.51 src/sys/dev/pci/piixpm.c:1.52
--- src/sys/dev/pci/piixpm.c:1.51 Thu Oct 13 17:11:09 2016
+++ src/sys/dev/pci/piixpm.c Wed Mar 29 09:04:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.51 2016/10/13 17:11:09 jdolecek Exp $ */
+/* $NetBSD: piixpm.c,v 1.52 2017/03/29 09:04:36 msaitoh Exp $ */
/* $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.51 2016/10/13 17:11:09 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.52 2017/03/29 09:04:36 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -490,7 +490,7 @@ piixpm_i2c_exec(void *cookie, i2c_op_t o
break;
DELAY(PIIXPM_DELAY);
}
- DPRINTF(("%s: exec: st 0x%d\n", device_xname(sc->sc_dev), st & 0xff));
+ DPRINTF(("%s: exec: st %#x\n", device_xname(sc->sc_dev), st & 0xff));
if (st & PIIX_SMB_HS_BUSY)
return (1);
@@ -615,7 +615,7 @@ piixpm_intr(void *arg)
/* Interrupt was not for us */
return (0);
- DPRINTF(("%s: intr st 0x%d\n", device_xname(sc->sc_dev), st & 0xff));
+ DPRINTF(("%s: intr st %#x\n", device_xname(sc->sc_dev), st & 0xff));
/* Clear status bits */
bus_space_write_1(sc->sc_smb_iot, sc->sc_smb_ioh, PIIX_SMB_HS, st);
