Module Name: src
Committed By: christos
Date: Sat Mar 14 02:22:16 UTC 2020
Modified Files:
src/sys/dev/usb: if_aue.c usbdi.c
Log Message:
more changes from sc.dying in PR/55068
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.196 -r1.197 src/sys/dev/usb/usbdi.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/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.164 src/sys/dev/usb/if_aue.c:1.165
--- src/sys/dev/usb/if_aue.c:1.164 Fri Mar 13 14:17:40 2020
+++ src/sys/dev/usb/if_aue.c Fri Mar 13 22:22:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.164 2020/03/13 18:17:40 christos Exp $ */
+/* $NetBSD: if_aue.c,v 1.165 2020/03/14 02:22:16 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.164 2020/03/13 18:17:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.165 2020/03/14 02:22:16 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -330,7 +330,7 @@ aue_csr_read_2(struct aue_softc *sc, int
if (err) {
AUEHIST_FUNC();
- AUEHIST_CALLARGS("auw%jd: reg=%#jx err=%jd",
+ AUEHIST_CALLARGS("aue%jd: reg=%#jx err=%jd",
device_unit(un->un_dev), reg, err, 0);
return 0;
}
@@ -362,7 +362,7 @@ aue_csr_write_1(struct aue_softc *sc, in
if (err) {
AUEHIST_FUNC();
- AUEHIST_CALLARGS("%jd: reg=%#jx err=%jd",
+ AUEHIST_CALLARGS("aue%jd: reg=%#jx err=%jd",
device_unit(un->un_dev), reg, err, 0);
return -1;
}
@@ -533,7 +533,7 @@ aue_mii_write_reg(struct usbnet *un, int
}
if (i == AUE_TIMEOUT) {
- DPRINTF("%d: phy=%#jx reg=%#jx val=%#jx write timed out",
+ DPRINTF("aue%d: phy=%#jx reg=%#jx val=%#jx write timed out",
device_unit(un->un_dev), phy, reg, val);
return ETIMEDOUT;
}
@@ -587,7 +587,7 @@ aue_mii_statchg(struct ifnet *ifp)
usbnet_unlock_mii(un);
if (usbnet_havelink(un) != hadlink) {
- DPRINTFN(5, "%d: exit link %d",
+ DPRINTFN(5, "aue%d: exit link %d",
device_unit(un->un_dev), usbnet_havelink(un), 0, 0);
}
}
@@ -736,7 +736,7 @@ aue_reset(struct aue_softc *sc)
delay(10000); /* XXX */
//usbd_delay_ms(un->un_udev, 10); /* XXX */
- DPRINTFN(2, "%d: exit", device_unit(un->un_dev), 0, 0, 0);
+ DPRINTFN(2, "aue%d: exit", device_unit(un->un_dev), 0, 0, 0);
}
/*
@@ -959,7 +959,7 @@ aue_tx_prepare(struct usbnet *un, struct
buf[1] = (uint8_t)(m->m_pkthdr.len >> 8);
total_len = m->m_pkthdr.len + 2;
- DPRINTFN(5, "%d: send %d bytes",
+ DPRINTFN(5, "aue%d: send %d bytes",
device_unit(un->un_dev), total_len, 0, 0);
return total_len;
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.196 src/sys/dev/usb/usbdi.c:1.197
--- src/sys/dev/usb/usbdi.c:1.196 Fri Mar 13 14:17:41 2020
+++ src/sys/dev/usb/usbdi.c Fri Mar 13 22:22:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.196 2020/03/13 18:17:41 christos Exp $ */
+/* $NetBSD: usbdi.c,v 1.197 2020/03/14 02:22:16 christos Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.196 2020/03/13 18:17:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.197 2020/03/14 02:22:16 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1006,7 +1006,7 @@ usb_transfer_complete(struct usbd_xfer *
xfer->ux_status == USBD_TIMEOUT &&
!usbd_xfer_isread(xfer)) {
USBHIST_LOG(usbdebug, "Possible output ack miss for xfer %#jx: "
- "hiding write timeout to %d.%s for %d bytes written",
+ "hiding write timeout to %jd.%jd for %ju bytes written",
(uintptr_t)xfer, curlwp->l_proc->p_pid, curlwp->l_lid,
xfer->ux_length);
