[src/trunk]: src/sys/dev/usb In xhci_init() use aprint_debug_dev() instead of...

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

details:   https://anonhg.NetBSD.org/src/rev/0fdf4403cf0e
branches:  trunk
changeset: 791973:0fdf4403cf0e
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Dec 14 16:03:04 2013 +0000

description:
In xhci_init() use aprint_debug_dev() instead of device_printf().

diffstat:

 sys/dev/usb/xhci.c |  26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diffs (96 lines):

diff -r 0933384189f7 -r 0fdf4403cf0e sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Sat Dec 14 15:47:18 2013 +0000
+++ b/sys/dev/usb/xhci.c        Sat Dec 14 16:03:04 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.11 2013/12/10 19:39:42 dsl Exp $    */
+/*     $NetBSD: xhci.c,v 1.12 2013/12/14 16:03:04 jakllsch Exp $       */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.11 2013/12/10 19:39:42 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.12 2013/12/14 16:03:04 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -610,14 +610,14 @@
 
        sc->sc_ac64 = XHCI_HCC_AC64(hcc);
        sc->sc_ctxsz = XHCI_HCC_CSZ(hcc) ? 64 : 32;
-       device_printf(sc->sc_dev, "ac64 %d ctxsz %d\n", sc->sc_ac64,
+       aprint_debug_dev(sc->sc_dev, "ac64 %d ctxsz %d\n", sc->sc_ac64,
            sc->sc_ctxsz);
 
-       device_printf(sc->sc_dev, "xECP %x\n", XHCI_HCC_XECP(hcc) * 4);
+       aprint_debug_dev(sc->sc_dev, "xECP %x\n", XHCI_HCC_XECP(hcc) * 4);
        ecp = XHCI_HCC_XECP(hcc) * 4;
        while (ecp != 0) {
                ecr = xhci_read_4(sc, ecp);
-               device_printf(sc->sc_dev, "ECR %x: %08x\n", ecp, ecr);
+               aprint_debug_dev(sc->sc_dev, "ECR %x: %08x\n", ecp, ecr);
                switch (XHCI_XECP_ID(ecr)) {
                case XHCI_ID_PROTOCOLS: {
                        uint32_t w0, w4, w8;
@@ -626,7 +626,7 @@
                        w2 = (w0 >> 16) & 0xffff;
                        w4 = xhci_read_4(sc, ecp + 4);
                        w8 = xhci_read_4(sc, ecp + 8);
-                       device_printf(sc->sc_dev, "SP: %08x %08x %08x\n",
+                       aprint_debug_dev(sc->sc_dev, "SP: %08x %08x %08x\n",
                            w0, w4, w8);
                        if (w4 == 0x20425355 && w2 == 0x0300) {
                                sc->sc_ss_port_start = (w8 >> 0) & 0xff;;
@@ -704,19 +704,19 @@
                return USBD_IOERROR;
 
        pagesize = xhci_op_read_4(sc, XHCI_PAGESIZE);
-       device_printf(sc->sc_dev, "PAGESIZE 0x%08x\n", pagesize);
+       aprint_debug_dev(sc->sc_dev, "PAGESIZE 0x%08x\n", pagesize);
        pagesize = ffs(pagesize);
        if (pagesize == 0)
                return USBD_IOERROR;
        sc->sc_pgsz = 1 << (12 + (pagesize - 1));
-       device_printf(sc->sc_dev, "sc_pgsz 0x%08x\n", (uint32_t)sc->sc_pgsz);
-       device_printf(sc->sc_dev, "sc_maxslots 0x%08x\n",
+       aprint_debug_dev(sc->sc_dev, "sc_pgsz 0x%08x\n", (uint32_t)sc->sc_pgsz);
+       aprint_debug_dev(sc->sc_dev, "sc_maxslots 0x%08x\n",
            (uint32_t)sc->sc_maxslots);
 
        usbd_status err;
 
        sc->sc_maxspbuf = XHCI_HCS2_MAXSPBUF(hcs2);
-       device_printf(sc->sc_dev, "sc_maxspbuf %d\n", sc->sc_maxspbuf);
+       aprint_debug_dev(sc->sc_dev, "sc_maxspbuf %d\n", sc->sc_maxspbuf);
        if (sc->sc_maxspbuf != 0) {
                err = usb_allocmem(&sc->sc_bus,
                    sizeof(uint64_t) * sc->sc_maxspbuf, sizeof(uint64_t),
@@ -774,7 +774,7 @@
                err = usb_allocmem(&sc->sc_bus, size, align, dma);
                memset(KERNADDR(dma, 0), 0, size);
                usb_syncmem(dma, 0, size, BUS_DMASYNC_PREWRITE);
-               device_printf(sc->sc_dev, "eventst: %s %016jx %p %zx\n",
+               aprint_debug_dev(sc->sc_dev, "eventst: %s %016jx %p %zx\n",
                    usbd_errstr(err),
                    (uintmax_t)DMAADDR(&sc->sc_eventst_dma, 0),
                    KERNADDR(&sc->sc_eventst_dma, 0),
@@ -794,7 +794,7 @@
                            htole64(DMAADDR(&sc->sc_spbufarray_dma, 0));
                }
                usb_syncmem(dma, 0, size, BUS_DMASYNC_PREWRITE);
-               device_printf(sc->sc_dev, "dcbaa: %s %016jx %p %zx\n",
+               aprint_debug_dev(sc->sc_dev, "dcbaa: %s %016jx %p %zx\n",
                    usbd_errstr(err),
                    (uintmax_t)DMAADDR(&sc->sc_dcbaa_dma, 0),
                    KERNADDR(&sc->sc_dcbaa_dma, 0),
@@ -831,7 +831,7 @@
        xhci_rt_write_4(sc, XHCI_IMOD(0), 0);
 
        xhci_op_write_4(sc, XHCI_USBCMD, XHCI_CMD_INTE|XHCI_CMD_RS); /* Go! */
-       device_printf(sc->sc_dev, "USBCMD %08"PRIx32"\n",
+       aprint_debug_dev(sc->sc_dev, "USBCMD %08"PRIx32"\n",
            xhci_op_read_4(sc, XHCI_USBCMD));
 
        mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SOFTUSB);