summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorrin <rin@NetBSD.org>2020-02-24 12:38:57 +0000
committerrin <rin@NetBSD.org>2020-02-24 12:38:57 +0000
commit9c8aa8551a641fe8a40f32c0b4122ef15df248d3 (patch)
tree1cbc30148e458237f37a8fba2667378800c47cb7 /sys/dev
parent0ead1e8cf6ed4b240c3338305cd5a74ac92856ee (diff)
0x%#x --> %#x for non-external codes.
Also, stop mixing up 0x%x and %#x in single files as far as possible.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/fdt/fdt_subr.c6
-rw-r--r--sys/dev/tprof/tprof_armv7.c6
-rw-r--r--sys/dev/usb/if_axe.c16
3 files changed, 14 insertions, 14 deletions
diff --git a/sys/dev/fdt/fdt_subr.c b/sys/dev/fdt/fdt_subr.c
index 3ab2954a581..328edf73789 100644
--- a/sys/dev/fdt/fdt_subr.c
+++ b/sys/dev/fdt/fdt_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_subr.c,v 1.34 2020/02/20 01:35:55 jmcneill Exp $ */
+/* $NetBSD: fdt_subr.c,v 1.35 2020/02/24 12:38:57 rin Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.34 2020/02/20 01:35:55 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.35 2020/02/24 12:38:57 rin Exp $");
#include "opt_fdt.h"
@@ -243,7 +243,7 @@ fdtbus_decode_range(int phandle, uint64_t paddr)
buf += size_cells * 4;
#ifdef FDTBUS_DEBUG
- printf("%s: %s: cba=0x%#" PRIx64 ", pba=0x%#" PRIx64 ", cl=0x%#" PRIx64 "\n", __func__, fdt_get_name(fdtbus_get_data(), fdtbus_phandle2offset(phandle), NULL), cba, pba, cl);
+ printf("%s: %s: cba=%#" PRIx64 ", pba=%#" PRIx64 ", cl=%#" PRIx64 "\n", __func__, fdt_get_name(fdtbus_get_data(), fdtbus_phandle2offset(phandle), NULL), cba, pba, cl);
#endif
if (paddr >= cba && paddr < cba + cl)
diff --git a/sys/dev/tprof/tprof_armv7.c b/sys/dev/tprof/tprof_armv7.c
index 5a7edab029f..9a182856a35 100644
--- a/sys/dev/tprof/tprof_armv7.c
+++ b/sys/dev/tprof/tprof_armv7.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tprof_armv7.c,v 1.2 2018/07/16 10:56:42 jmcneill Exp $ */
+/* $NetBSD: tprof_armv7.c,v 1.3 2020/02/24 12:38:57 rin Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcneill@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tprof_armv7.c,v 1.2 2018/07/16 10:56:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof_armv7.c,v 1.3 2020/02/24 12:38:57 rin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -173,7 +173,7 @@ armv7_pmu_start(const tprof_param_t *param)
uint64_t xc;
if (!armv7_pmu_event_implemented(param->p_event)) {
- printf("%s: event 0x%#llx not implemented on this CPU\n",
+ printf("%s: event %#llx not implemented on this CPU\n",
__func__, param->p_event);
return EINVAL;
}
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index c769a4f474d..72291fb2e6d 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.122 2020/01/29 06:24:10 thorpej Exp $ */
+/* $NetBSD: if_axe.c,v 1.123 2020/02/24 12:38:57 rin Exp $ */
/* $OpenBSD: if_axe.c,v 1.137 2016/04/13 11:03:37 mpi Exp $ */
/*
@@ -87,7 +87,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.122 2020/01/29 06:24:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.123 2020/02/24 12:38:57 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -321,7 +321,7 @@ axe_mii_read_reg(struct usbnet *un, int phy, int reg, uint16_t *val)
usbd_status err;
uint16_t data;
- DPRINTFN(30, "phy 0x%jx reg 0x%jx\n", phy, reg, 0, 0);
+ DPRINTFN(30, "phy %#jx reg %#jx\n", phy, reg, 0, 0);
if (un->un_phyno != phy)
return EINVAL;
@@ -347,7 +347,7 @@ axe_mii_read_reg(struct usbnet *un, int phy, int reg, uint16_t *val)
*val &= ~BMSR_EXTCAP;
}
- DPRINTFN(30, "phy 0x%jx reg 0x%jx val %#jx", phy, reg, *val, 0);
+ DPRINTFN(30, "phy %#jx reg %#jx val %#jx", phy, reg, *val, 0);
return 0;
}
@@ -417,7 +417,7 @@ axe_mii_statchg(struct ifnet *ifp)
}
}
- DPRINTF("val=0x%jx", val, 0, 0, 0);
+ DPRINTF("val=%#jx", val, 0, 0, 0);
usbnet_lock_mii(un);
err = axe_cmd(sc, AXE_CMD_WRITE_MEDIA, 0, val, NULL);
usbnet_unlock_mii(un);
@@ -597,7 +597,7 @@ axe_ax88178_init(struct axe_softc *sc)
eeprom = le16toh(eeprom);
- DPRINTF("EEPROM is 0x%jx", eeprom, 0, 0, 0);
+ DPRINTF("EEPROM is %#jx", eeprom, 0, 0, 0);
/* if EEPROM is invalid we have to use to GPIO0 */
if (eeprom == 0xffff) {
@@ -1040,7 +1040,7 @@ axe_rx_loop(struct usbnet * un, struct usbnet_chain *c, uint32_t total_len)
memcpy(&hdr, buf, sizeof(hdr));
- DPRINTFN(20, "total_len %#jx len %jx ilen %#jx",
+ DPRINTFN(20, "total_len %#jx len %#jx ilen %#jx",
total_len,
(le16toh(hdr.len) & AXE_RH1M_RXLEN_MASK),
(le16toh(hdr.ilen) & AXE_RH1M_RXLEN_MASK), 0);
@@ -1331,7 +1331,7 @@ axe_init_locked(struct ifnet *ifp)
if (ifp->if_flags & IFF_BROADCAST)
rxmode |= AXE_RXCMD_BROADCAST;
- DPRINTF("rxmode 0x%#jx", rxmode, 0, 0, 0);
+ DPRINTF("rxmode %#jx", rxmode, 0, 0, 0);
axe_cmd(sc, AXE_CMD_RXCTL_WRITE, 0, rxmode, NULL);