[src/trunk]: src/sys Fix 0x%d and 0x%u.

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4cda8bee9ff5
branches:  trunk
changeset: 822631:4cda8bee9ff5
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Mar 29 09:04:35 2017 +0000

description:
Fix 0x%d and 0x%u.

diffstat:

 sys/arch/evbarm/stand/boot2440/dm9000.c |  4 ++--
 sys/arch/xen/xen/xpci_xenbus.c          |  6 +++---
 sys/dev/ic/wdc.c                        |  6 +++---
 sys/dev/ic/wi.c                         |  6 +++---
 sys/dev/isa/nsclpcsio_isa.c             |  6 +++---
 sys/dev/pci/piixpm.c                    |  8 ++++----
 6 files changed, 18 insertions(+), 18 deletions(-)

diffs (162 lines):

diff -r 3e735c21208e -r 4cda8bee9ff5 sys/arch/evbarm/stand/boot2440/dm9000.c
--- a/sys/arch/evbarm/stand/boot2440/dm9000.c   Wed Mar 29 08:09:51 2017 +0000
+++ b/sys/arch/evbarm/stand/boot2440/dm9000.c   Wed Mar 29 09:04:35 2017 +0000
@@ -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 @@
        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);
 
diff -r 3e735c21208e -r 4cda8bee9ff5 sys/arch/xen/xen/xpci_xenbus.c
--- a/sys/arch/xen/xen/xpci_xenbus.c    Wed Mar 29 08:09:51 2017 +0000
+++ b/sys/arch/xen/xen/xpci_xenbus.c    Wed Mar 29 09:04:35 2017 +0000
@@ -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 @@
        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)
diff -r 3e735c21208e -r 4cda8bee9ff5 sys/dev/ic/wdc.c
--- a/sys/dev/ic/wdc.c  Wed Mar 29 08:09:51 2017 +0000
+++ b/sys/dev/ic/wdc.c  Wed Mar 29 09:04:35 2017 +0000
@@ -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 @@
        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 */
diff -r 3e735c21208e -r 4cda8bee9ff5 sys/dev/ic/wi.c
--- a/sys/dev/ic/wi.c   Wed Mar 29 08:09:51 2017 +0000
+++ b/sys/dev/ic/wi.c   Wed Mar 29 09:04:35 2017 +0000
@@ -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 @@
            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",
diff -r 3e735c21208e -r 4cda8bee9ff5 sys/dev/isa/nsclpcsio_isa.c
--- a/sys/dev/isa/nsclpcsio_isa.c       Wed Mar 29 08:09:51 2017 +0000
+++ b/sys/dev/isa/nsclpcsio_isa.c       Wed Mar 29 09:04:35 2017 +0000
@@ -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 @@
                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 */
diff -r 3e735c21208e -r 4cda8bee9ff5 sys/dev/pci/piixpm.c
--- a/sys/dev/pci/piixpm.c      Wed Mar 29 08:09:51 2017 +0000
+++ b/sys/dev/pci/piixpm.c      Wed Mar 29 09:04:35 2017 +0000
@@ -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 @@
                        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 @@
                /* 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);