[src/trunk]: src/sys/dev/usb fix debug variables.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/dev/usb fix debug variables.
From: christos <christos%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 00:04:05 +0000
details:   https://anonhg.NetBSD.org/src/rev/34bf4865ec74
branches:  trunk
changeset: 783724:34bf4865ec74
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 05 23:34:16 2013 +0000

description:
fix debug variables.
- include opt_usb.h in usb.h so that USB_DEBUG gets set properly in it.
- normalize and sort debugging variables

diffstat:

 sys/dev/usb/ehci.c       |   7 +---
 sys/dev/usb/ezload.c     |  10 ++-----
 sys/dev/usb/if_atu.c     |  12 +-------
 sys/dev/usb/if_otus.c    |  12 +-------
 sys/dev/usb/if_rum.c     |  12 +-------
 sys/dev/usb/if_run.c     |  12 +-------
 sys/dev/usb/if_ural.c    |  12 +-------
 sys/dev/usb/if_urtw.c    |  12 +-------
 sys/dev/usb/if_urtwn.c   |  12 +-------
 sys/dev/usb/if_zyd.c     |  12 +-------
 sys/dev/usb/ohci.c       |  12 ++------
 sys/dev/usb/uhci.c       |   8 +----
 sys/dev/usb/uhub.c       |   8 +----
 sys/dev/usb/ums.c        |  12 ++-----
 sys/dev/usb/usb.c        |   5 +--
 sys/dev/usb/usb.h        |  67 ++++++++++++++++++++++++++++++-----------------
 sys/dev/usb/usb_mem.c    |   8 +----
 sys/dev/usb/usb_quirks.c |   8 +----
 sys/dev/usb/usb_subr.c   |   5 +--
 sys/dev/usb/usbdi.c      |   5 +--
 sys/dev/usb/usbdi_util.c |   8 +----
 sys/dev/usb/uthum.c      |  12 +-------
 sys/dev/usb/uts.c        |  12 ++-----
 sys/dev/usb/uyurex.c     |  12 +-------
 24 files changed, 94 insertions(+), 201 deletions(-)

diffs (truncated from 776 to 300 lines):

diff -r 1b4c4e9c8ae7 -r 34bf4865ec74 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Sat Jan 05 21:16:22 2013 +0000
+++ b/sys/dev/usb/ehci.c        Sat Jan 05 23:34:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.195 2013/01/05 01:30:15 christos Exp $ */
+/*     $NetBSD: ehci.c,v 1.196 2013/01/05 23:34:16 christos Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,13 +53,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.195 2013/01/05 01:30:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.196 2013/01/05 23:34:16 christos Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 1b4c4e9c8ae7 -r 34bf4865ec74 sys/dev/usb/ezload.c
--- a/sys/dev/usb/ezload.c      Sat Jan 05 21:16:22 2013 +0000
+++ b/sys/dev/usb/ezload.c      Sat Jan 05 23:34:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ezload.c,v 1.14 2013/01/05 01:30:15 christos Exp $     */
+/*     $NetBSD: ezload.c,v 1.15 2013/01/05 23:34:16 christos Exp $     */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,11 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.14 2013/01/05 01:30:15 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.15 2013/01/05 23:34:16 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,7 +75,7 @@
  * device.
  */
 
-#ifdef USB_DEBUG
+#ifdef EZLOAD_DEBUG
 #define DPRINTF(x)     if (ezloaddebug) printf x
 #define DPRINTFN(n,x)  if (ezloaddebug>(n)) printf x
 int ezloaddebug = 0;
diff -r 1b4c4e9c8ae7 -r 34bf4865ec74 sys/dev/usb/if_atu.c
--- a/sys/dev/usb/if_atu.c      Sat Jan 05 21:16:22 2013 +0000
+++ b/sys/dev/usb/if_atu.c      Sat Jan 05 23:34:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_atu.c,v 1.46 2013/01/05 01:30:15 christos Exp $ */
+/*     $NetBSD: if_atu.c,v 1.47 2013/01/05 23:34:16 christos Exp $ */
 /*     $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
 /*
  * Copyright (c) 2003, 2004
@@ -48,11 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.46 2013/01/05 01:30:15 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.47 2013/01/05 23:34:16 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -95,10 +91,6 @@
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
 
-#ifdef USB_DEBUG
-#define ATU_DEBUG
-#endif
-
 #include <dev/usb/if_atureg.h>
 
 #ifdef ATU_DEBUG
diff -r 1b4c4e9c8ae7 -r 34bf4865ec74 sys/dev/usb/if_otus.c
--- a/sys/dev/usb/if_otus.c     Sat Jan 05 21:16:22 2013 +0000
+++ b/sys/dev/usb/if_otus.c     Sat Jan 05 23:34:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_otus.c,v 1.18 2013/01/05 01:32:50 christos Exp $    */
+/*     $NetBSD: if_otus.c,v 1.19 2013/01/05 23:34:17 christos Exp $    */
 /*     $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $        */
 
 /*-
@@ -23,11 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.18 2013/01/05 01:32:50 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.19 2013/01/05 23:34:17 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -70,10 +66,6 @@
 #include <dev/usb/if_otusreg.h>
 #include <dev/usb/if_otusvar.h>
 
-#ifdef USB_DEBUG
-#define OTUS_DEBUG
-#endif
-
 #ifdef OTUS_DEBUG
 int otus_debug = 0;
 #define DPRINTFN(n, ...) \
diff -r 1b4c4e9c8ae7 -r 34bf4865ec74 sys/dev/usb/if_rum.c
--- a/sys/dev/usb/if_rum.c      Sat Jan 05 21:16:22 2013 +0000
+++ b/sys/dev/usb/if_rum.c      Sat Jan 05 23:34:16 2013 +0000
@@ -1,5 +1,5 @@
 /*     $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $      */
-/*     $NetBSD: if_rum.c,v 1.45 2013/01/05 01:30:16 christos Exp $     */
+/*     $NetBSD: if_rum.c,v 1.46 2013/01/05 23:34:17 christos Exp $     */
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini%free.fr@localhost>
@@ -24,11 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.45 2013/01/05 01:30:16 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.46 2013/01/05 23:34:17 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -74,10 +70,6 @@
 #include <dev/usb/if_rumreg.h>
 #include <dev/usb/if_rumvar.h>
 
-#ifdef USB_DEBUG
-#define RUM_DEBUG
-#endif
-
 #ifdef RUM_DEBUG
 #define DPRINTF(x)     do { if (rum_debug) printf x; } while (0)
 #define DPRINTFN(n, x) do { if (rum_debug >= (n)) printf x; } while (0)
diff -r 1b4c4e9c8ae7 -r 34bf4865ec74 sys/dev/usb/if_run.c
--- a/sys/dev/usb/if_run.c      Sat Jan 05 21:16:22 2013 +0000
+++ b/sys/dev/usb/if_run.c      Sat Jan 05 23:34:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_run.c,v 1.6 2013/01/05 01:30:16 christos Exp $      */
+/*     $NetBSD: if_run.c,v 1.7 2013/01/05 23:34:17 christos Exp $      */
 /*     $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */
 
 /*-
@@ -23,11 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.6 2013/01/05 01:30:16 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.7 2013/01/05 23:34:17 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -69,10 +65,6 @@
 #include <dev/ic/rt2860reg.h>          /* shared with ral(4) */
 #include <dev/usb/if_runvar.h>
 
-#ifdef USB_DEBUG
-#define RUN_DEBUG
-#endif
-
 #ifdef RUN_DEBUG
 #define DPRINTF(x)     do { if (run_debug) printf x; } while (0)
 #define DPRINTFN(n, x) do { if (run_debug >= (n)) printf x; } while (0)
diff -r 1b4c4e9c8ae7 -r 34bf4865ec74 sys/dev/usb/if_ural.c
--- a/sys/dev/usb/if_ural.c     Sat Jan 05 21:16:22 2013 +0000
+++ b/sys/dev/usb/if_ural.c     Sat Jan 05 23:34:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ural.c,v 1.42 2013/01/05 01:30:16 christos Exp $ */
+/*     $NetBSD: if_ural.c,v 1.43 2013/01/05 23:34:17 christos Exp $ */
 /*     $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $        */
 
 /*-
@@ -24,11 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.42 2013/01/05 01:30:16 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.43 2013/01/05 23:34:17 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -71,10 +67,6 @@
 #include <dev/usb/if_uralreg.h>
 #include <dev/usb/if_uralvar.h>
 
-#ifdef USB_DEBUG
-#define URAL_DEBUG
-#endif
-
 #ifdef URAL_DEBUG
 #define DPRINTF(x)     do { if (ural_debug) printf x; } while (0)
 #define DPRINTFN(n, x) do { if (ural_debug >= (n)) printf x; } while (0)
diff -r 1b4c4e9c8ae7 -r 34bf4865ec74 sys/dev/usb/if_urtw.c
--- a/sys/dev/usb/if_urtw.c     Sat Jan 05 21:16:22 2013 +0000
+++ b/sys/dev/usb/if_urtw.c     Sat Jan 05 23:34:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_urtw.c,v 1.3 2013/01/05 01:30:16 christos Exp $     */
+/*     $NetBSD: if_urtw.c,v 1.4 2013/01/05 23:34:17 christos Exp $     */
 /*     $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $    */
 
 /*-
@@ -19,11 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.3 2013/01/05 01:30:16 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.4 2013/01/05 23:34:17 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -65,10 +61,6 @@
 
 #include "if_urtwreg.h"
 
-#ifdef USB_DEBUG
-#define        URTW_DEBUG
-#endif
-
 #ifdef URTW_DEBUG
 #define        DPRINTF(x)      do { if (urtw_debug) printf x; } while (0)
 #define        DPRINTFN(n, x)  do { if (urtw_debug >= (n)) printf x; } while (0)
diff -r 1b4c4e9c8ae7 -r 34bf4865ec74 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Sat Jan 05 21:16:22 2013 +0000
+++ b/sys/dev/usb/if_urtwn.c    Sat Jan 05 23:34:16 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_urtwn.c,v 1.8 2013/01/05 01:32:50 christos Exp $    */
+/*     $NetBSD: if_urtwn.c,v 1.9 2013/01/05 23:34:18 christos Exp $    */
 /*     $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $   */
 
 /*-
@@ -22,11 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.8 2013/01/05 01:32:50 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.9 2013/01/05 23:34:18 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -73,10 +69,6 @@
 #include <dev/usb/if_urtwnvar.h>
 #include <dev/usb/if_urtwn_data.h>
 
-#ifdef USB_DEBUG
-#define URTWN_DEBUG
-#endif
-
 #ifdef URTWN_DEBUG
 #define        DBG_INIT        __BIT(0)
 #define        DBG_FN          __BIT(1)
diff -r 1b4c4e9c8ae7 -r 34bf4865ec74 sys/dev/usb/if_zyd.c
--- a/sys/dev/usb/if_zyd.c      Sat Jan 05 21:16:22 2013 +0000
+++ b/sys/dev/usb/if_zyd.c      Sat Jan 05 23:34:16 2013 +0000
@@ -1,5 +1,5 @@
 /*     $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/*     $NetBSD: if_zyd.c,v 1.34 2013/01/05 01:32:50 christos Exp $     */
+/*     $NetBSD: if_zyd.c,v 1.35 2013/01/05 23:34:18 christos Exp $     */
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini%free.fr@localhost>
@@ -23,11 +23,7 @@
  */
Prev by Date: [src/trunk]: src/sys/netinet6 PR/47408: Anthony Mallet: sendto(2) issue with ...
Next by Date: [src/trunk]: src/tests/net/net new udp test
Previous by Thread: [src/trunk]: src/sys/netinet6 PR/47408: Anthony Mallet: sendto(2) issue with ...
Next by Thread: [src/trunk]: src/tests/net/net new udp test
Indexes:
Home | Main Index | Thread Index | Old Index