[src/trunk]: src/sys/dev/usb more changes from sc.dying in PR/55068

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

details:   https://anonhg.NetBSD.org/src/rev/e0952bddab55
branches:  trunk
changeset: 849774:e0952bddab55
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Mar 14 02:22:16 2020 +0000

description:
more changes from sc.dying in PR/55068

diffstat:

 sys/dev/usb/if_aue.c |  16 ++++++++--------
 sys/dev/usb/usbdi.c  |   6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (99 lines):

diff -r f70ebe8922bc -r e0952bddab55 sys/dev/usb/if_aue.c
--- a/sys/dev/usb/if_aue.c      Fri Mar 13 23:27:54 2020 +0000
+++ b/sys/dev/usb/if_aue.c      Sat Mar 14 02:22:16 2020 +0000
@@ -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 @@
 
        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 @@
 
        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 @@
        }
 
        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 @@
        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 @@
        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 @@
        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;
diff -r f70ebe8922bc -r e0952bddab55 sys/dev/usb/usbdi.c
--- a/sys/dev/usb/usbdi.c       Fri Mar 13 23:27:54 2020 +0000
+++ b/sys/dev/usb/usbdi.c       Sat Mar 14 02:22:16 2020 +0000
@@ -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 @@
            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);