[src/nick-nhusb]: src/sys/dev/usb Consistency with USBHIST_LOGN

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

details:   https://anonhg.NetBSD.org/src/rev/c48fa6b83787
branches:  nick-nhusb
changeset: 804439:c48fa6b83787
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Nov 01 10:18:43 2015 +0000

description:
Consistency with USBHIST_LOGN

diffstat:

 sys/dev/usb/uhci.c |  30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diffs (135 lines):

diff -r e7cf02584be2 -r c48fa6b83787 sys/dev/usb/uhci.c
--- a/sys/dev/usb/uhci.c        Sun Nov 01 10:14:18 2015 +0000
+++ b/sys/dev/usb/uhci.c        Sun Nov 01 10:18:43 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhci.c,v 1.264.4.42 2015/11/01 10:14:18 skrll Exp $    */
+/*     $NetBSD: uhci.c,v 1.264.4.43 2015/11/01 10:18:43 skrll Exp $    */
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.42 2015/11/01 10:14:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.43 2015/11/01 10:18:43 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -418,7 +418,7 @@
 #ifdef UHCI_DEBUG
        thesc = sc;
 
-       if (uhcidebug > 2)
+       if (uhcidebug >= 2)
                uhci_dumpregs(sc);
 #endif
 
@@ -698,7 +698,7 @@
                callout_reset(&sc->sc_poll_handle, sc->sc_ival, uhci_poll_hub,
                    sc->sc_intr_xfer);
 #ifdef UHCI_DEBUG
-       if (uhcidebug > 2)
+       if (uhcidebug >= 2)
                uhci_dumpregs(sc);
 #endif
 
@@ -719,7 +719,7 @@
        cmd = UREAD2(sc, UHCI_CMD);
 
 #ifdef UHCI_DEBUG
-       if (uhcidebug > 2)
+       if (uhcidebug >= 2)
                uhci_dumpregs(sc);
 #endif
        if (sc->sc_intr_xfer != NULL)
@@ -1531,7 +1531,7 @@
                for (i = 0; i < nframes; i++) {
                        std = stds[n];
 #ifdef UHCI_DEBUG
-                       if (uhcidebug > 5) {
+                       if (uhcidebug >= 5) {
                                DPRINTF("isoc TD %d", i, 0, 0, 0);
                                uhci_dump_td(std);
                        }
@@ -1556,7 +1556,7 @@
 #ifdef UHCI_DEBUG
        DPRINTFN(10, "ux=%p, xfer=%p, pipe=%p ready",
            ux, xfer, upipe, 0);
-       if (uhcidebug > 10)
+       if (uhcidebug >= 10)
                uhci_dump_tds(ux->ux_stdstart);
 #endif
 
@@ -2072,7 +2072,7 @@
 
 
 #ifdef UHCI_DEBUG
-       if (uhcidebug > 8) {
+       if (uhcidebug >= 8) {
                DPRINTFN(8, "data(1)", 0, 0, 0, 0);
                uhci_dump_tds(data);
        }
@@ -2101,7 +2101,7 @@
        xfer->ux_status = USBD_IN_PROGRESS;
 
 #ifdef UHCI_DEBUG
-       if (uhcidebug > 10) {
+       if (uhcidebug >= 10) {
                DPRINTFN(10, "data(2)", 0, 0, 0, 0);
                uhci_dump_tds(data);
        }
@@ -2349,7 +2349,7 @@
 
        DPRINTFN(10, "--- dump start ---", 0, 0, 0, 0);
 #ifdef UHCI_DEBUG
-       if (uhcidebug > 10) {
+       if (uhcidebug >= 10) {
                uhci_dump_tds(data);
                uhci_dump_qh(upipe->intr.qhs[0]);
        }
@@ -2380,7 +2380,7 @@
 
        DPRINTFN(10, "--- dump start ---", 0, 0, 0, 0);
 #ifdef UHCI_DEBUG
-       if (uhcidebug > 10) {
+       if (uhcidebug >= 10) {
                uhci_dump_tds(data);
                uhci_dump_qh(upipe->intr.qhs[0]);
        }
@@ -2530,7 +2530,7 @@
 
        DPRINTFN(10, "--- dump start ---", 0, 0, 0, 0);
 #ifdef UHCI_DEBUG
-       if (uhcidebug > 10) {
+       if (uhcidebug >= 10) {
                DPRINTFN(10, "before transfer", 0, 0, 0, 0);
                uhci_dump_tds(setup);
        }
@@ -2556,7 +2556,7 @@
        uhci_add_intr_info(sc, uxfer);
        DPRINTFN(12, "--- dump start ---", 0, 0, 0, 0);
 #ifdef UHCI_DEBUG
-       if (uhcidebug > 12) {
+       if (uhcidebug >= 12) {
                uhci_soft_td_t *std;
                uhci_soft_qh_t *xqh;
                uhci_soft_qh_t *sxqh;
@@ -2685,7 +2685,7 @@
                    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
                DPRINTFN(5, "--- dump start ---", 0, 0, 0, 0);
 #ifdef UHCI_DEBUG
-               if (uhcidebug > 5) {
+               if (uhcidebug >= 5) {
                        DPRINTF("TD %d", i, 0, 0, 0);
                        uhci_dump_td(std);
                }
@@ -3036,7 +3036,7 @@
 
                DPRINTFN(10, "--- dump start ---", 0, 0, 0, 0);
 #ifdef UHCI_DEBUG
-               if (uhcidebug > 10) {
+               if (uhcidebug >= 10) {
                        uhci_dump_tds(data);
                        uhci_dump_qh(upipe->intr.qhs[0]);
                }