Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/usb fix more broken kernhist formats (now I got them...
details: https://anonhg.NetBSD.org/src/rev/93ce668c6cb7
branches: trunk
changeset: 745841:93ce668c6cb7
user: christos <christos%NetBSD.org@localhost>
date: Sat Mar 14 03:01:36 2020 +0000
description:
fix more broken kernhist formats (now I got them all).
diffstat:
sys/dev/usb/if_aue.c | 12 ++++++------
sys/dev/usb/if_smsc.c | 10 +++++-----
sys/dev/usb/umass.c | 8 ++++----
sys/dev/usb/uplcom.c | 32 ++++++++++++++++----------------
sys/dev/usb/usb_quirks.c | 16 ++++++++--------
sys/dev/usb/usb_subr.c | 6 +++---
sys/dev/usb/usbnet.c | 14 +++++++-------
sys/dev/usb/xhci.c | 8 ++++----
8 files changed, 53 insertions(+), 53 deletions(-)
diffs (truncated from 453 to 300 lines):
diff -r 6b8dc3f34086 -r 93ce668c6cb7 sys/dev/usb/if_aue.c
--- a/sys/dev/usb/if_aue.c Sat Mar 14 02:35:33 2020 +0000
+++ b/sys/dev/usb/if_aue.c Sat Mar 14 03:01:36 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.166 2020/03/14 02:35:33 christos Exp $ */
+/* $NetBSD: if_aue.c,v 1.167 2020/03/14 03:01:36 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.166 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.167 2020/03/14 03:01:36 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -533,7 +533,7 @@
}
if (i == AUE_TIMEOUT) {
- DPRINTF("aue%d: phy=%#jx reg=%#jx val=%#jx write timed out",
+ DPRINTF("aue%jd: phy=%#jx reg=%#jx val=%#jx write timed out",
device_unit(un->un_dev), phy, reg, val);
return ETIMEDOUT;
}
@@ -587,7 +587,7 @@
usbnet_unlock_mii(un);
if (usbnet_havelink(un) != hadlink) {
- DPRINTFN(5, "aue%d: exit link %d",
+ DPRINTFN(5, "aue%jd: exit link %jd",
device_unit(un->un_dev), usbnet_havelink(un), 0, 0);
}
}
@@ -736,7 +736,7 @@
delay(10000); /* XXX */
//usbd_delay_ms(un->un_udev, 10); /* XXX */
- DPRINTFN(2, "aue%d: exit", device_unit(un->un_dev), 0, 0, 0);
+ DPRINTFN(2, "aue%jd: exit", device_unit(un->un_dev), 0, 0, 0);
}
/*
@@ -959,7 +959,7 @@
buf[1] = (uint8_t)(m->m_pkthdr.len >> 8);
total_len = m->m_pkthdr.len + 2;
- DPRINTFN(5, "aue%d: send %d bytes",
+ DPRINTFN(5, "aue%jd: send %jd bytes",
device_unit(un->un_dev), total_len, 0, 0);
return total_len;
diff -r 6b8dc3f34086 -r 93ce668c6cb7 sys/dev/usb/if_smsc.c
--- a/sys/dev/usb/if_smsc.c Sat Mar 14 02:35:33 2020 +0000
+++ b/sys/dev/usb/if_smsc.c Sat Mar 14 03:01:36 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.66 2020/03/14 02:35:33 christos Exp $ */
+/* $NetBSD: if_smsc.c,v 1.67 2020/03/14 03:01:36 christos Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.66 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.67 2020/03/14 03:01:36 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -539,10 +539,10 @@
int err;
uint32_t val;
- DPRINTF("setting mac address to %02jx:%02jx:%02jx:...", addr[0], addr[1],
- addr[2], 0);
+ DPRINTF("setting mac address to %02jx:%02jx:%02jx:...", addr[0],
+ addr[1], addr[2], 0);
- DPRINTF("... %02jx:%0j2x:%02jx", addr[3], addr[4], addr[5], 0);
+ DPRINTF("... %02jx:%02jx:%02jx", addr[3], addr[4], addr[5], 0);
val = ((uint32_t)addr[3] << 24) | (addr[2] << 16) | (addr[1] << 8)
| addr[0];
diff -r 6b8dc3f34086 -r 93ce668c6cb7 sys/dev/usb/umass.c
--- a/sys/dev/usb/umass.c Sat Mar 14 02:35:33 2020 +0000
+++ b/sys/dev/usb/umass.c Sat Mar 14 03:01:36 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.182 2020/03/14 02:35:33 christos Exp $ */
+/* $NetBSD: umass.c,v 1.183 2020/03/14 03:01:36 christos Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.182 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.183 2020/03/14 03:01:36 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1021,7 +1021,7 @@
err = usbd_transfer(xfer);
DPRINTFM(UDMASS_XFER, "start xfer buffer=%#jx buflen=%jd flags=%#jx "
- "timeout=%d", (uintptr_t)buffer, buflen, flags, sc->timeout);
+ "timeout=%jd", (uintptr_t)buffer, buflen, flags, sc->timeout);
if (err && err != USBD_IN_PROGRESS) {
DPRINTFM(UDMASS_BBB, "failed to setup transfer... err=%jd",
err, 0, 0, 0);
@@ -1880,7 +1880,7 @@
if (err) {
DPRINTFM(UDMASS_CBI, "sc %#jx: Data dir %jd "
- "err %d failed",
+ "err %jd failed",
(uintptr_t)sc, sc->transfer_dir,
sc->transfer_datalen, err);
diff -r 6b8dc3f34086 -r 93ce668c6cb7 sys/dev/usb/uplcom.c
--- a/sys/dev/usb/uplcom.c Sat Mar 14 02:35:33 2020 +0000
+++ b/sys/dev/usb/uplcom.c Sat Mar 14 03:01:36 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.88 2020/03/14 02:35:33 christos Exp $ */
+/* $NetBSD: uplcom.c,v 1.89 2020/03/14 03:01:36 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.88 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.89 2020/03/14 03:01:36 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -453,7 +453,7 @@
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev);
- DPRINTF("in=%#x out=%#x intr=%#x",
+ DPRINTF("in=%#jx out=%#jx intr=%#jx",
ucaa.ucaa_bulkin, ucaa.ucaa_bulkout, sc->sc_intr_number, 0);
sc->sc_subdev = config_found_sm_loc(self, "ucombus", NULL, &ucaa,
ucomprint, ucomsubmatch);
@@ -497,7 +497,7 @@
int rv = 0;
UPLCOMHIST_FUNC(); UPLCOMHIST_CALLED();
- DPRINTF("sc=%#jx flags=%d", (uintptr_t)sc, flags, 0, 0);
+ DPRINTF("sc=%#jx flags=%jd", (uintptr_t)sc, flags, 0, 0);
sc->sc_dying = true;
@@ -643,7 +643,7 @@
{
UPLCOMHIST_FUNC(); UPLCOMHIST_CALLED();
- DPRINTF("onoff=%d", onoff, 0, 0, 0);
+ DPRINTF("onoff=%jd", onoff, 0, 0, 0);
if (sc->sc_dtr != -1 && !sc->sc_dtr == !onoff)
return;
@@ -657,7 +657,7 @@
uplcom_rts(struct uplcom_softc *sc, int onoff)
{
UPLCOMHIST_FUNC(); UPLCOMHIST_CALLED();
- DPRINTF("onoff=%d", onoff, 0, 0, 0);
+ DPRINTF("onoff=%jd", onoff, 0, 0, 0);
if (sc->sc_rts != -1 && !sc->sc_rts == !onoff)
return;
@@ -673,7 +673,7 @@
usb_device_request_t req;
UPLCOMHIST_FUNC(); UPLCOMHIST_CALLED();
- DPRINTF("onoff=%d", onoff, 0, 0, 0);
+ DPRINTF("onoff=%jd", onoff, 0, 0, 0);
req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
req.bRequest = UCDC_SEND_BREAK;
@@ -703,7 +703,7 @@
err = usbd_do_request(sc->sc_udev, &req, 0);
if (err) {
- DPRINTF("failed, err=%d", err, 0, 0, 0);
+ DPRINTF("failed, err=%jd", err, 0, 0, 0);
return err;
}
@@ -718,7 +718,7 @@
UPLCOMHIST_FUNC(); UPLCOMHIST_CALLED();
- DPRINTF("rate=%d fmt=%d parity=%d bits=%d",
+ DPRINTF("rate=%jd fmt=%jd parity=%jd bits=%jd",
UGETDW(state->dwDTERate), state->bCharFormat,
state->bParityType, state->bDataBits);
@@ -735,7 +735,7 @@
err = usbd_do_request(sc->sc_udev, &req, state);
if (err) {
- DPRINTF("failed, err=%u", err, 0, 0, 0);
+ DPRINTF("failed, err=%ju", err, 0, 0, 0);
return err;
}
@@ -786,7 +786,7 @@
err = uplcom_set_line_coding(sc, &ls);
if (err) {
- DPRINTF("err=%d", err, 0, 0, 0);
+ DPRINTF("err=%jd", err, 0, 0, 0);
return EIO;
}
@@ -797,7 +797,7 @@
uplcom_set_line_state(sc);
if (err) {
- DPRINTF("err=%d", err, 0, 0, 0);
+ DPRINTF("err=%jd", err, 0, 0, 0);
return EIO;
}
@@ -822,7 +822,7 @@
err = usbd_do_request(dev, &req, NULL);
if (err) {
- DPRINTF("vendor write failed, err=%d", err, 0, 0, 0);
+ DPRINTF("vendor write failed, err=%jd", err, 0, 0, 0);
}
return err;
@@ -853,7 +853,7 @@
sc->sc_intr_buf, sc->sc_isize,
uplcom_intr, USBD_DEFAULT_INTERVAL);
if (err) {
- DPRINTF("cannot open interrupt pipe (addr %d)",
+ DPRINTF("cannot open interrupt pipe (addr %jd)",
sc->sc_intr_number, 0, 0, 0);
}
}
@@ -894,12 +894,12 @@
if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
return;
- DPRINTF("abnormal status: %u", status, 0, 0, 0);
+ DPRINTF("abnormal status: %ju", status, 0, 0, 0);
usbd_clear_endpoint_stall_async(sc->sc_intr_pipe);
return;
}
- DPRINTF("uplcom status = %02x", buf[8], 0, 0, 0);
+ DPRINTF("uplcom status = %02jx", buf[8], 0, 0, 0);
sc->sc_lsr = sc->sc_msr = 0;
pstatus = buf[8];
diff -r 6b8dc3f34086 -r 93ce668c6cb7 sys/dev/usb/usb_quirks.c
--- a/sys/dev/usb/usb_quirks.c Sat Mar 14 02:35:33 2020 +0000
+++ b/sys/dev/usb/usb_quirks.c Sat Mar 14 03:01:36 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.94 2020/03/14 02:35:33 christos Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.95 2020/03/14 03:01:36 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.94 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.95 2020/03/14 03:01:36 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -128,7 +128,7 @@
usbd_status err = USBD_INVAL;
if (dev->ud_quirks == NULL || dev->ud_quirks->desc == NULL) {
- DPRINTF("%04x/%04x: no fake descriptors",
+ DPRINTF("%04jx/%04j: no fake descriptors",
UGETW(dd->idVendor), UGETW(dd->idProduct), 0, 0);
goto out;
}
@@ -140,7 +140,7 @@
}
if (dev->ud_quirks->desc[j] == NULL) {
- DPRINTF("%04x/%04x: no fake descriptor type = %d, len = %d",
+ DPRINTF("%04jx/%04jx: no fake descriptor type = %jd, len = %jd",
UGETW(dd->idVendor), UGETW(dd->idProduct), type, len);
goto out;
}
@@ -149,14 +149,14 @@
Home |
Main Index |
Thread Index |
Old Index