Module Name: src
Committed By: christos
Date: Sat Jan 5 23:34:21 UTC 2013
Modified Files:
src/sys/dev/usb: ehci.c ezload.c if_atu.c if_otus.c if_rum.c if_run.c
if_ural.c if_urtw.c if_urtwn.c if_zyd.c ohci.c uhci.c uhub.c ums.c
usb.c usb.h usb_mem.c usb_quirks.c usb_subr.c usbdi.c usbdi_util.c
uthum.c uts.c uyurex.c
Log Message:
fix debug variables.
- include opt_usb.h in usb.h so that USB_DEBUG gets set properly in it.
- normalize and sort debugging variables
To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/ezload.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/usb/if_atu.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/if_otus.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/if_rum.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/if_ural.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/if_urtw.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/if_urtwn.c src/sys/dev/usb/uyurex.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/usb/if_zyd.c
cvs rdiff -u -r1.228 -r1.229 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.250 -r1.251 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.120 -r1.121 src/sys/dev/usb/uhub.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/usb/ums.c
cvs rdiff -u -r1.137 -r1.138 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/usb/usb.h
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/usb/usb_mem.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/usb/usb_quirks.c
cvs rdiff -u -r1.186 -r1.187 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.141 -r1.142 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/uthum.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/uts.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.195 src/sys/dev/usb/ehci.c:1.196
--- src/sys/dev/usb/ehci.c:1.195 Fri Jan 4 20:30:15 2013
+++ src/sys/dev/usb/ehci.c Sat Jan 5 18:34:16 2013
@@ -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>
Index: src/sys/dev/usb/ezload.c
diff -u src/sys/dev/usb/ezload.c:1.14 src/sys/dev/usb/ezload.c:1.15
--- src/sys/dev/usb/ezload.c:1.14 Fri Jan 4 20:30:15 2013
+++ src/sys/dev/usb/ezload.c Sat Jan 5 18:34:16 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1
* 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;
Index: src/sys/dev/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.46 src/sys/dev/usb/if_atu.c:1.47
--- src/sys/dev/usb/if_atu.c:1.46 Fri Jan 4 20:30:15 2013
+++ src/sys/dev/usb/if_atu.c Sat Jan 5 18:34:16 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1
#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
Index: src/sys/dev/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.18 src/sys/dev/usb/if_otus.c:1.19
--- src/sys/dev/usb/if_otus.c:1.18 Fri Jan 4 20:32:50 2013
+++ src/sys/dev/usb/if_otus.c Sat Jan 5 18:34:17 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_otus.c,v
#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, ...) \
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.45 src/sys/dev/usb/if_rum.c:1.46
--- src/sys/dev/usb/if_rum.c:1.45 Fri Jan 4 20:30:16 2013
+++ src/sys/dev/usb/if_rum.c Sat Jan 5 18:34:17 2013
@@ -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 <[email protected]>
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1
#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)
Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.6 src/sys/dev/usb/if_run.c:1.7
--- src/sys/dev/usb/if_run.c:1.6 Fri Jan 4 20:30:16 2013
+++ src/sys/dev/usb/if_run.c Sat Jan 5 18:34:17 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1
#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)
Index: src/sys/dev/usb/if_ural.c
diff -u src/sys/dev/usb/if_ural.c:1.42 src/sys/dev/usb/if_ural.c:1.43
--- src/sys/dev/usb/if_ural.c:1.42 Fri Jan 4 20:30:16 2013
+++ src/sys/dev/usb/if_ural.c Sat Jan 5 18:34:17 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_ural.c,v
#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)
Index: src/sys/dev/usb/if_urtw.c
diff -u src/sys/dev/usb/if_urtw.c:1.3 src/sys/dev/usb/if_urtw.c:1.4
--- src/sys/dev/usb/if_urtw.c:1.3 Fri Jan 4 20:30:16 2013
+++ src/sys/dev/usb/if_urtw.c Sat Jan 5 18:34:17 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v
#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)
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.8 src/sys/dev/usb/if_urtwn.c:1.9
--- src/sys/dev/usb/if_urtwn.c:1.8 Fri Jan 4 20:32:50 2013
+++ src/sys/dev/usb/if_urtwn.c Sat Jan 5 18:34:18 2013
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v
#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)
Index: src/sys/dev/usb/uyurex.c
diff -u src/sys/dev/usb/uyurex.c:1.8 src/sys/dev/usb/uyurex.c:1.9
--- src/sys/dev/usb/uyurex.c:1.8 Fri Jan 4 20:30:18 2013
+++ src/sys/dev/usb/uyurex.c Sat Jan 5 18:34:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uyurex.c,v 1.8 2013/01/05 01:30:18 christos Exp $ */
+/* $NetBSD: uyurex.c,v 1.9 2013/01/05 23:34:21 christos Exp $ */
/* $OpenBSD: uyurex.c,v 1.3 2010/03/04 03:47:22 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1.8 2013/01/05 01:30:18 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1.9 2013/01/05 23:34:21 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -47,10 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1
#include <dev/usb/uhidev.h>
#include <dev/usb/hid.h>
-#ifdef USB_DEBUG
-#define UYUREX_DEBUG
-#endif
-
#define CMD_NONE 0xf0
#define CMD_EOF 0x0d
#define CMD_ACK 0x21
Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.34 src/sys/dev/usb/if_zyd.c:1.35
--- src/sys/dev/usb/if_zyd.c:1.34 Fri Jan 4 20:32:50 2013
+++ src/sys/dev/usb/if_zyd.c Sat Jan 5 18:34:18 2013
@@ -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 <[email protected]>
@@ -23,11 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.34 2013/01/05 01:32:50 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.35 2013/01/05 23:34:18 christos Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -70,10 +66,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1
#include <dev/usb/if_zydreg.h>
-#ifdef USB_DEBUG
-#define ZYD_DEBUG
-#endif
-
#ifdef ZYD_DEBUG
#define DPRINTF(x) do { if (zyddebug > 0) printf x; } while (0)
#define DPRINTFN(n, x) do { if (zyddebug > (n)) printf x; } while (0)
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.228 src/sys/dev/usb/ohci.c:1.229
--- src/sys/dev/usb/ohci.c:1.228 Fri Jan 4 20:30:16 2013
+++ src/sys/dev/usb/ohci.c Sat Jan 5 18:34:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.228 2013/01/05 01:30:16 christos Exp $ */
+/* $NetBSD: ohci.c,v 1.229 2013/01/05 23:34:18 christos Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,11 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.228 2013/01/05 01:30:16 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.229 2013/01/05 23:34:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2264,10 +2260,8 @@ ohci_close_pipe(usbd_pipe_handle pipe, o
(int)O32TOH(sed->ed.ed_headp),
(int)O32TOH(sed->ed.ed_tailp),
pipe, std);
-#ifdef USB_DEBUG
- usbd_dump_pipe(&opipe->pipe);
-#endif
#ifdef OHCI_DEBUG
+ usbd_dump_pipe(&opipe->pipe);
ohci_dump_ed(sc, sed);
if (std)
ohci_dump_td(sc, std);
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.250 src/sys/dev/usb/uhci.c:1.251
--- src/sys/dev/usb/uhci.c:1.250 Fri Jan 4 20:30:17 2013
+++ src/sys/dev/usb/uhci.c Sat Jan 5 18:34:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.250 2013/01/05 01:30:17 christos Exp $ */
+/* $NetBSD: uhci.c,v 1.251 2013/01/05 23:34:18 christos Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,11 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.250 2013/01/05 01:30:17 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.251 2013/01/05 23:34:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.120 src/sys/dev/usb/uhub.c:1.121
--- src/sys/dev/usb/uhub.c:1.120 Fri Jan 4 20:30:17 2013
+++ src/sys/dev/usb/uhub.c Sat Jan 5 18:34:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.120 2013/01/05 01:30:17 christos Exp $ */
+/* $NetBSD: uhub.c,v 1.121 2013/01/05 23:34:19 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/*
@@ -36,11 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.120 2013/01/05 01:30:17 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.121 2013/01/05 23:34:19 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/ums.c
diff -u src/sys/dev/usb/ums.c:1.85 src/sys/dev/usb/ums.c:1.86
--- src/sys/dev/usb/ums.c:1.85 Fri Jan 4 20:30:17 2013
+++ src/sys/dev/usb/ums.c Sat Jan 5 18:34:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.85 2013/01/05 01:30:17 christos Exp $ */
+/* $NetBSD: ums.c,v 1.86 2013/01/05 23:34:19 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,11 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.85 2013/01/05 01:30:17 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.86 2013/01/05 23:34:19 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.85
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsmousevar.h>
-#ifdef USB_DEBUG
+#ifdef UMS_DEBUG
#define DPRINTF(x) if (umsdebug) printf x
#define DPRINTFN(n,x) if (umsdebug>(n)) printf x
int umsdebug = 0;
@@ -351,7 +347,7 @@ ums_attach(device_t parent, device_t sel
sc->flags & UMS_BARREL_SWITCH ? ", barrel" : "",
sc->flags & UMS_ERASER ? ", eraser" : "");
-#ifdef USB_DEBUG
+#ifdef UMS_DEBUG
DPRINTF(("ums_attach: sc=%p\n", sc));
DPRINTF(("ums_attach: X\t%d/%d\n",
sc->sc_loc_x.pos, sc->sc_loc_x.size));
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.137 src/sys/dev/usb/usb.c:1.138
--- src/sys/dev/usb/usb.c:1.137 Fri Jan 4 20:30:17 2013
+++ src/sys/dev/usb/usb.c Sat Jan 5 18:34:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.137 2013/01/05 01:30:17 christos Exp $ */
+/* $NetBSD: usb.c,v 1.138 2013/01/05 23:34:19 christos Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,11 +37,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.137 2013/01/05 01:30:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.138 2013/01/05 23:34:19 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
-#include "opt_usb.h"
#endif
#include <sys/param.h>
Index: src/sys/dev/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.96 src/sys/dev/usb/usb.h:1.97
--- src/sys/dev/usb/usb.h:1.96 Fri Aug 24 05:01:23 2012
+++ src/sys/dev/usb/usb.h Sat Jan 5 18:34:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.h,v 1.96 2012/08/24 09:01:23 msaitoh Exp $ */
+/* $NetBSD: usb.h,v 1.97 2013/01/05 23:34:19 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */
/*
@@ -40,6 +40,10 @@
#include <sys/ioctl.h>
+#if defined(_KERNEL_OPT)
+#include "opt_usb.h" /* for USB_DEBUG */
+#endif
+
#if defined(_KERNEL)
#include <sys/mallocvar.h>
@@ -52,40 +56,53 @@ MALLOC_DECLARE(M_USBHC);
#endif
#ifdef USB_DEBUG
-#define UKBD_DEBUG 1
-#define UHIDEV_DEBUG 1
-#define UHID_DEBUG 1
+#define ATU_DEBUG 1
+#define AUE_DEBUG 1
+#define AXE_DEBUG 1
+#define CUE_DEBUG 1
+#define EHCI_DEBUG 1
+#define EZLOAD_DEBUG 1
+#define KUE_DEBUG 1
#define OHCI_DEBUG 1
+#define OTUS_DEBUG 1
+#define RUM_DEBUG 1
+#define RUN_DEBUG 1
+#define UAUDIO_DEBUG 1
+#define UBT_DEBUG 1
+#define UCOM_DEBUG 1
+#define UCYCOM_DEBUG 1
+#define UDSBR_DEBUG 1
+#define UFTDI_DEBUG 1
#define UGEN_DEBUG 1
#define UHCI_DEBUG 1
+#define UHIDEV_DEBUG 1
+#define UHID_DEBUG 1
+#define UHSO_DEBUG 1
#define UHUB_DEBUG 1
+#define UIPAQ_DEBUG 1
+#define UIRDA_DEBUG 1
+#define UISDATA_DEBUG 1
+#define UKBD_DEBUG 1
#define ULPT_DEBUG 1
-#define UCOM_DEBUG 1
-#define UPLCOM_DEBUG 1
#define UMCT_DEBUG 1
#define UMODEM_DEBUG 1
-#define UAUDIO_DEBUG 1
-#define AUE_DEBUG 1
-#define CUE_DEBUG 1
-#define KUE_DEBUG 1
-#define URL_DEBUG 1
-#define UVISOR_DEBUG 1
+#define UMS_DEBUG 1
+#define UPLCOM_DEBUG 1
#define UPL_DEBUG 1
-#define UZCOM_DEBUG 1
+#define URAL_DEBUG 1
#define URIO_DEBUG 1
-#define UFTDI_DEBUG 1
+#define URL_DEBUG 1
+#define URTWN_DEBUG 1
+#define URTW_DEBUG 1
#define USCANNER_DEBUG 1
#define USSCANNER_DEBUG 1
-#define EHCI_DEBUG 1
-#define UIRDA_DEBUG 1
#define USTIR_DEBUG 1
-#define UISDATA_DEBUG 1
-#define UDSBR_DEBUG 1
-#define UBT_DEBUG 1
-#define AXE_DEBUG 1
-#define UIPAQ_DEBUG 1
-#define UCYCOM_DEBUG 1
-#define UHSO_DEBUG 1
+#define UTHUM_DEBUG 1
+#define UTS_DEBUG 1
+#define UVISOR_DEBUG 1
+#define UYUREX_DEBUG 1
+#define UZCOM_DEBUG 1
+#define ZYD_DEBUG 1
#define Static
#else
#define Static static
Index: src/sys/dev/usb/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.53 src/sys/dev/usb/usb_mem.c:1.54
--- src/sys/dev/usb/usb_mem.c:1.53 Sun Jun 10 02:15:54 2012
+++ src/sys/dev/usb/usb_mem.c Sat Jan 5 18:34:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.53 2012/06/10 06:15:54 mrg Exp $ */
+/* $NetBSD: usb_mem.c,v 1.54 2013/01/05 23:34:20 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,11 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.53 2012/06/10 06:15:54 mrg Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.54 2013/01/05 23:34:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.76 src/sys/dev/usb/usb_quirks.c:1.77
--- src/sys/dev/usb/usb_quirks.c:1.76 Fri Jan 4 20:30:17 2013
+++ src/sys/dev/usb/usb_quirks.c Sat Jan 5 18:34:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.76 2013/01/05 01:30:17 christos Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.77 2013/01/05 23:34:20 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,11 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.76 2013/01/05 01:30:17 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.77 2013/01/05 23:34:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.186 src/sys/dev/usb/usb_subr.c:1.187
--- src/sys/dev/usb/usb_subr.c:1.186 Fri Jan 4 20:30:17 2013
+++ src/sys/dev/usb/usb_subr.c Sat Jan 5 18:34:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.186 2013/01/05 01:30:17 christos Exp $ */
+/* $NetBSD: usb_subr.c,v 1.187 2013/01/05 23:34:20 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,12 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.186 2013/01/05 01:30:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.187 2013/01/05 23:34:20 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
#include "opt_usbverbose.h"
-#include "opt_usb.h"
#endif
#include <sys/param.h>
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.141 src/sys/dev/usb/usbdi.c:1.142
--- src/sys/dev/usb/usbdi.c:1.141 Fri Jan 4 20:30:17 2013
+++ src/sys/dev/usb/usbdi.c Sat Jan 5 18:34:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.141 2013/01/05 01:30:17 christos Exp $ */
+/* $NetBSD: usbdi.c,v 1.142 2013/01/05 23:34:20 christos Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,11 +31,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.141 2013/01/05 01:30:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.142 2013/01/05 23:34:20 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
-#include "opt_usb.h"
#endif
#include <sys/param.h>
Index: src/sys/dev/usb/usbdi_util.c
diff -u src/sys/dev/usb/usbdi_util.c:1.58 src/sys/dev/usb/usbdi_util.c:1.59
--- src/sys/dev/usb/usbdi_util.c:1.58 Fri Jan 4 20:30:18 2013
+++ src/sys/dev/usb/usbdi_util.c Sat Jan 5 18:34:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.c,v 1.58 2013/01/05 01:30:18 christos Exp $ */
+/* $NetBSD: usbdi_util.c,v 1.59 2013/01/05 23:34:21 christos Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,11 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.58 2013/01/05 01:30:18 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.59 2013/01/05 23:34:21 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/dev/usb/uthum.c
diff -u src/sys/dev/usb/uthum.c:1.9 src/sys/dev/usb/uthum.c:1.10
--- src/sys/dev/usb/uthum.c:1.9 Fri Jan 4 20:30:18 2013
+++ src/sys/dev/usb/uthum.c Sat Jan 5 18:34:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uthum.c,v 1.9 2013/01/05 01:30:18 christos Exp $ */
+/* $NetBSD: uthum.c,v 1.10 2013/01/05 23:34:21 christos Exp $ */
/* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.9 2013/01/05 01:30:18 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.10 2013/01/05 23:34:21 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -46,10 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.
#include <dev/usb/uhidev.h>
#include <dev/usb/hid.h>
-#ifdef USB_DEBUG
-#define UTHUM_DEBUG
-#endif
-
#ifdef UTHUM_DEBUG
int uthumdebug = 0;
#define DPRINTFN(n, x) do { if (uthumdebug > (n)) printf x; } while (0)
Index: src/sys/dev/usb/uts.c
diff -u src/sys/dev/usb/uts.c:1.2 src/sys/dev/usb/uts.c:1.3
--- src/sys/dev/usb/uts.c:1.2 Fri Jan 4 20:30:18 2013
+++ src/sys/dev/usb/uts.c Sat Jan 5 18:34:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uts.c,v 1.2 2013/01/05 01:30:18 christos Exp $ */
+/* $NetBSD: uts.c,v 1.3 2013/01/05 23:34:21 christos Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,11 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.2 2013/01/05 01:30:18 christos Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_usb.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.3 2013/01/05 23:34:21 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.2
#include <dev/wscons/wsmousevar.h>
#include <dev/wscons/tpcalibvar.h>
-#ifdef USB_DEBUG
+#ifdef UTS_DEBUG
#define DPRINTF(x) if (utsdebug) printf x
#define DPRINTFN(n,x) if (utsdebug>(n)) printf x
int utsdebug = 0;
@@ -213,7 +209,7 @@ uts_attach(device_t parent, device_t sel
/* multi-touch support would need HUD_CONTACTID and HUD_CONTACTMAX */
-#ifdef USB_DEBUG
+#ifdef UTS_DEBUG
DPRINTF(("uts_attach: sc=%p\n", sc));
DPRINTF(("uts_attach: X\t%d/%d\n",
sc->sc_loc_x.pos, sc->sc_loc_x.size));
