[src/trunk]: src/sys/dev/usb aprint-ify.

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

details:   https://anonhg.NetBSD.org/src/rev/61fe334125b0
branches:  trunk
changeset: 747087:61fe334125b0
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Sep 01 21:46:07 2009 +0000

description:
aprint-ify.

diffstat:

 sys/dev/usb/ohci.c |  25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diffs (69 lines):

diff -r 34f918bf7777 -r 61fe334125b0 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Tue Sep 01 21:30:17 2009 +0000
+++ b/sys/dev/usb/ohci.c        Tue Sep 01 21:46:07 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.198 2009/04/18 06:27:17 cegger Exp $        */
+/*     $NetBSD: ohci.c,v 1.199 2009/09/01 21:46:07 jmcneill Exp $      */
 /*     $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $       */
 
 /*
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.198 2009/04/18 06:27:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.199 2009/09/01 21:46:07 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -688,11 +688,8 @@
        u_int32_t s, ctl, rwc, ival, hcr, fm, per, rev, desca, descb;
 
        DPRINTF(("ohci_init: start\n"));
-#if defined(__OpenBSD__)
-       printf(",");
-#else
-       printf("%s:", device_xname(sc->sc_dev));
-#endif
+       aprint_normal_dev(sc->sc_dev, "");
+
        sc->sc_hcca = NULL;
        usb_callout_init(sc->sc_tmo_rhsc);
 
@@ -704,12 +701,12 @@
        SIMPLEQ_INIT(&sc->sc_free_xfers);
 
        rev = OREAD4(sc, OHCI_REVISION);
-       printf(" OHCI version %d.%d%s\n", OHCI_REV_HI(rev), OHCI_REV_LO(rev),
-              OHCI_REV_LEGACY(rev) ? ", legacy support" : "");
+       aprint_normal(" OHCI version %d.%d%s\n",
+           OHCI_REV_HI(rev), OHCI_REV_LO(rev),
+           OHCI_REV_LEGACY(rev) ? ", legacy support" : "");
 
        if (OHCI_REV_HI(rev) != 1 || OHCI_REV_LO(rev) != 0) {
-               printf("%s: unsupported OHCI revision\n",
-                      device_xname(sc->sc_dev));
+               aprint_error_dev(sc->sc_dev, "unsupported OHCI revision\n");
                sc->sc_bus.usbrev = USBREV_UNKNOWN;
                return (USBD_INVAL);
        }
@@ -827,8 +824,8 @@
                }
                OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_MIE);
                if ((ctl & OHCI_IR) == 0) {
-                       printf("%s: SMM does not respond, resetting\n",
-                              device_xname(sc->sc_dev));
+                       aprint_error_dev(sc->sc_dev,
+                           "SMM does not respond, resetting\n");
                        OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET | rwc);
                        goto reset;
                }
@@ -868,7 +865,7 @@
                        break;
        }
        if (hcr) {
-               printf("%s: reset timeout\n", device_xname(sc->sc_dev));
+               aprint_error_dev(sc->sc_dev, "reset timeout\n");
                err = USBD_IOERROR;
                goto bad5;
        }