Use the hw.usb sysctl tree instead of debug.usb.
Requested by: imp
This commit is contained in:
parent
12355fce84
commit
2925e337b8
@ -90,7 +90,8 @@
|
||||
#define DPRINTF(x) if (uaudiodebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (uaudiodebug>(n)) logprintf x
|
||||
int uaudiodebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, uaudio, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio");
|
||||
SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&uaudiodebug, 0, "uaudio debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -94,7 +94,8 @@ struct cfdriver ohci_cd = {
|
||||
#define DPRINTF(x) if (ohcidebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (ohcidebug>(n)) logprintf x
|
||||
int ohcidebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, ohci, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci");
|
||||
SYSCTL_INT(_hw_usb_ohci, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&ohcidebug, 0, "ohci debug level");
|
||||
#ifndef __NetBSD__
|
||||
#define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f))
|
||||
|
@ -102,7 +102,8 @@
|
||||
|
||||
#ifdef USB_DEBUG
|
||||
static int ucomdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, ucom, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, ucom, CTLFLAG_RW, 0, "USB ucom");
|
||||
SYSCTL_INT(_hw_usb_ucom, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&ucomdebug, 0, "ucom debug level");
|
||||
#define DPRINTF(x) do { \
|
||||
if (ucomdebug) \
|
||||
|
@ -108,7 +108,8 @@
|
||||
#define DPRINTF(x) if (udbpdebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (udbpdebug>(n)) logprintf x
|
||||
int udbpdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, udbp, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, udbp, CTLFLAG_RW, 0, "USB udbp");
|
||||
SYSCTL_INT(_hw_usb_udbp, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&udbpdebug, 0, "udbp debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -68,7 +68,8 @@
|
||||
#define DPRINTF(x) if (ufmdebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (ufmdebug>(n)) logprintf x
|
||||
int ufmdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, ufm, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, ufm, CTLFLAG_RW, 0, "USB ufm");
|
||||
SYSCTL_INT(_hw_usb_ufm, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&ufmdebug, 0, "ufm debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -73,7 +73,8 @@
|
||||
#define DPRINTF(x) if (ugendebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (ugendebug>(n)) logprintf x
|
||||
int ugendebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, ugen, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, ugen, CTLFLAG_RW, 0, "USB ugen");
|
||||
SYSCTL_INT(_hw_usb_ugen, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&ugendebug, 0, "ugen debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -103,8 +103,11 @@ uhci_softc_t *thesc;
|
||||
#define DPRINTFN(n,x) if (uhcidebug>(n)) printf x
|
||||
int uhcidebug = 0;
|
||||
int uhcinoloop = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, uhci, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, uhci, CTLFLAG_RW, 0, "USB uhci");
|
||||
SYSCTL_INT(_hw_usb_uhci, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&uhcidebug, 0, "uhci debug level");
|
||||
SYSCTL_INT(_hw_usb_uhci, OID_AUTO, loop, CTLFLAG_RW,
|
||||
&uhcinoloop, 0, "uhci noloop");
|
||||
#ifndef __NetBSD__
|
||||
#define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f))
|
||||
#endif
|
||||
|
@ -87,7 +87,8 @@
|
||||
#define DPRINTF(x) if (uhiddebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (uhiddebug>(n)) logprintf x
|
||||
int uhiddebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, uhid, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid");
|
||||
SYSCTL_INT(_hw_usb_uhid, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&uhiddebug, 0, "uhid debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -69,7 +69,8 @@
|
||||
#define DPRINTF(x) if (uhubdebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (uhubdebug>(n)) logprintf x
|
||||
int uhubdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, uhub, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, uhub, CTLFLAG_RW, 0, "USB uhub");
|
||||
SYSCTL_INT(_hw_usb_uhub, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&uhubdebug, 0, "uhub debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -80,7 +80,8 @@
|
||||
#define DPRINTF(x) if (ukbddebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (ukbddebug>(n)) logprintf x
|
||||
int ukbddebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, ukbd, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, ukbd, CTLFLAG_RW, 0, "USB ukbd");
|
||||
SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&ukbddebug, 0, "ukbd debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -76,7 +76,8 @@
|
||||
#define DPRINTF(x) if (ulptdebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (ulptdebug>(n)) logprintf x
|
||||
int ulptdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, ulpt, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, ulpt, CTLFLAG_RW, 0, "USB ulpt");
|
||||
SYSCTL_INT(_hw_usb_ulpt, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&ulptdebug, 0, "ulpt debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -135,7 +135,8 @@
|
||||
#define UDMASS_WIRE (UDMASS_BBB|UDMASS_CBI)
|
||||
#define UDMASS_ALL 0xffff0000 /* all of the above */
|
||||
int umassdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, umass, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, umass, CTLFLAG_RW, 0, "USB umass");
|
||||
SYSCTL_INT(_hw_usb_umass, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&umassdebug, 0, "umass debug level");
|
||||
#else
|
||||
#define DIF(m, x) /* nop */
|
||||
|
@ -91,7 +91,8 @@
|
||||
#define DPRINTF(x) if(umodemdebug) logprintf x
|
||||
#define DPRINTFN(n, x) if(umodemdebug > (n)) logprintf x
|
||||
int umodemdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, umodem, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, umodem, CTLFLAG_RW, 0, "USB umodem");
|
||||
SYSCTL_INT(_hw_usb_umodem, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&umodemdebug, 0, "umodem debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -75,7 +75,8 @@
|
||||
#define DPRINTF(x) if (umsdebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (umsdebug>(n)) logprintf x
|
||||
int umsdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, ums, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums");
|
||||
SYSCTL_INT(_hw_usb_ums, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&umsdebug, 0, "ums debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -103,7 +103,8 @@
|
||||
|
||||
#ifdef USB_DEBUG
|
||||
static int uplcomdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, uplcom, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, uplcom, CTLFLAG_RW, 0, "USB uplcom");
|
||||
SYSCTL_INT(_hw_usb_uplcom, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&uplcomdebug, 0, "uplcom debug level");
|
||||
|
||||
#define DPRINTFN(n, x) do { \
|
||||
|
@ -80,7 +80,8 @@
|
||||
#define DPRINTF(x) if (uriodebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (uriodebug>(n)) logprintf x
|
||||
int uriodebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, urio, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, urio, CTLFLAG_RW, 0, "USB urio");
|
||||
SYSCTL_INT(_hw_usb_urio, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&uriodebug, 0, "urio debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -95,13 +95,13 @@ MALLOC_DEFINE(M_USBHC, "USBHC", "USB host controller");
|
||||
/* Define this unconditionally in case a kernel module is loaded that
|
||||
* has been compiled with debugging options.
|
||||
*/
|
||||
SYSCTL_NODE(_debug, OID_AUTO, usb, CTLFLAG_RW, 0, "USB debugging");
|
||||
SYSCTL_NODE(_hw, OID_AUTO, usb, CTLFLAG_RW, 0, "USB debugging");
|
||||
|
||||
#ifdef USB_DEBUG
|
||||
#define DPRINTF(x) if (usbdebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (usbdebug>(n)) logprintf x
|
||||
int usbdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, usb, CTLFLAG_RW,
|
||||
SYSCTL_INT(_hw_usb, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&usbdebug, 0, "usb debug level");
|
||||
#ifdef USB_DEBUG
|
||||
extern int uhcidebug;
|
||||
|
@ -479,7 +479,7 @@ __CONCAT(dname,_detach)(device_t self)
|
||||
#define logprintf printf
|
||||
|
||||
#ifdef SYSCTL_DECL
|
||||
SYSCTL_DECL(_debug_usb);
|
||||
SYSCTL_DECL(_hw_usb);
|
||||
#endif
|
||||
|
||||
#endif /* __FreeBSD__ */
|
||||
|
@ -76,7 +76,8 @@
|
||||
#define DPRINTF(x) if (uscannerdebug) logprintf x
|
||||
#define DPRINTFN(n,x) if (uscannerdebug>(n)) logprintf x
|
||||
int uscannerdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, uscanner, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, uscanner, CTLFLAG_RW, 0, "USB uscanner");
|
||||
SYSCTL_INT(_hw_usb_uscanner, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&uscannerdebug, 0, "uscanner debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -79,7 +79,8 @@
|
||||
#define DPRINTF(x) if (uvisordebug) printf x
|
||||
#define DPRINTFN(n,x) if (uvisordebug>(n)) printf x
|
||||
int uvisordebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, uvisor, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, uvisor, CTLFLAG_RW, 0, "USB uvisor");
|
||||
SYSCTL_INT(_hw_usb_uvisor, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&uvisordebug, 0, "uvisor debug level");
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
|
@ -71,7 +71,8 @@
|
||||
|
||||
#ifdef USB_DEBUG
|
||||
static int uvscomdebug = 0;
|
||||
SYSCTL_INT(_debug_usb, OID_AUTO, uvscom, CTLFLAG_RW,
|
||||
SYSCTL_NODE(_hw_usb, OID_AUTO, uvscom, CTLFLAG_RW, 0, "USB uvscom");
|
||||
SYSCTL_INT(_hw_usb_uvscom, OID_AUTO, debug, CTLFLAG_RW,
|
||||
&uvscomdebug, 0, "uvscom debug level");
|
||||
|
||||
#define DPRINTFN(n, x) do { \
|
||||
|
Loading…
Reference in New Issue
Block a user