[src/trunk]: src/sys/external/bsd/dwc2 Fix debug build. Also make formats mor...

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

details:   https://anonhg.NetBSD.org/src/rev/cfdf833c7371
branches:  trunk
changeset: 365265:cfdf833c7371
user:      rin <rin%NetBSD.org@localhost>
date:      Fri Aug 10 04:24:46 2018 +0000

description:
Fix debug build. Also make formats more consistent with others in
DPRINTF added in the previous commit.

diffstat:

 sys/external/bsd/dwc2/dwc2.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 663be14288ca -r cfdf833c7371 sys/external/bsd/dwc2/dwc2.c
--- a/sys/external/bsd/dwc2/dwc2.c      Fri Aug 10 00:19:09 2018 +0000
+++ b/sys/external/bsd/dwc2/dwc2.c      Fri Aug 10 04:24:46 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwc2.c,v 1.52 2018/08/09 06:26:47 mrg Exp $    */
+/*     $NetBSD: dwc2.c,v 1.53 2018/08/10 04:24:46 rin Exp $    */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.52 2018/08/09 06:26:47 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.53 2018/08/10 04:24:46 rin Exp $");
 
 #include "opt_usb.h"
 
@@ -324,7 +324,7 @@
        struct dwc2_softc *sc = DWC2_XFER2SC(xfer);
        struct usbd_device *dev = xfer->ux_pipe->up_dev;
 
-       DPRINTF("dxfer=%p\n", dxfer);
+       DPRINTF("xfer=%p\n", xfer);
 
        mutex_enter(&sc->sc_lock);
        if (!sc->sc_dying && xfer->ux_status == USBD_IN_PROGRESS)
@@ -450,7 +450,7 @@
        KASSERTMSG((status == USBD_CANCELLED || status == USBD_TIMEOUT),
            "invalid status for abort: %d", (int)status);
 
-       DPRINTF("xfer %pjx pipe %pjx status %jd", xfer, xfer->ux_pipe, status);
+       DPRINTF("xfer %p pipe %p status 0x%08x", xfer, xfer->ux_pipe, status);
 
        KASSERT(mutex_owned(&sc->sc_lock));
        ASSERT_SLEEPABLE();
@@ -492,8 +492,7 @@
         * software that we're done.
         */
        if (sc->sc_dying) {
-               DPRINTFN(4, "xfer %#jx dying %ju", (uintptr_t)xfer,
-                   xfer->ux_status, 0, 0);
+               DPRINTFN(4, "xfer %p dying 0x%08x", xfer, xfer->ux_status);
                goto dying;
        }