[src/trunk]: src/sys/dev/usb Slighty tweak the interrupt debug printfs.

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

details:   https://anonhg.NetBSD.org/src/rev/4353f5d12df6
branches:  trunk
changeset: 759746:4353f5d12df6
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Dec 15 23:48:15 2010 +0000

description:
Slighty tweak the interrupt debug printfs.

diffstat:

 sys/dev/usb/ohci.c |  18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diffs (50 lines):

diff -r 632776b3cdeb -r 4353f5d12df6 sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Wed Dec 15 23:43:02 2010 +0000
+++ b/sys/dev/usb/ohci.c        Wed Dec 15 23:48:15 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.210 2010/11/13 13:52:12 uebayasi Exp $      */
+/*     $NetBSD: ohci.c,v 1.211 2010/12/15 23:48:15 matt 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.210 2010/11/13 13:52:12 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.211 2010/12/15 23:48:15 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -897,7 +897,7 @@
        sc->sc_control = sc->sc_intre = 0;
 
        /* Finally, turn on interrupts. */
-       DPRINTFN(1,("ohci_init: enabling\n"));
+       DPRINTFN(1,("ohci_init: enabling %#x\n", sc->sc_eintrs | OHCI_MIE));
        OWRITE4(sc, OHCI_INTERRUPT_ENABLE, sc->sc_eintrs | OHCI_MIE);
 
        return (USBD_NORMAL_COMPLETION);
@@ -1145,15 +1145,17 @@
 
        OWRITE4(sc, OHCI_INTERRUPT_STATUS, intrs & ~(OHCI_MIE|OHCI_WDH)); /* Acknowledge */
        eintrs = intrs & sc->sc_eintrs;
-       if (!eintrs)
+       DPRINTFN(7, ("ohci_intr: sc=%p intrs=%#x(%#x) eintrs=%#x(%#x)\n",
+                    sc, (u_int)intrs, OREAD4(sc, OHCI_INTERRUPT_STATUS),
+                    (u_int)eintrs, sc->sc_eintrs));
+
+       if (!eintrs) {
+               OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_MIE); /* Disable */
                return (0);
+       }
 
        sc->sc_bus.intr_context++;
        sc->sc_bus.no_intrs++;
-       DPRINTFN(7, ("ohci_intr: sc=%p intrs=0x%x(0x%x) eintrs=0x%x\n",
-                    sc, (u_int)intrs, OREAD4(sc, OHCI_INTERRUPT_STATUS),
-                    (u_int)eintrs));
-
        if (eintrs & OHCI_SO) {
                sc->sc_overrun_cnt++;
                if (usbd_ratecheck(&sc->sc_overrun_ntc)) {