From 2925e337b88ce6094d3823ef79a07f76a8a42618 Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 8 Aug 2002 12:05:51 +0000 Subject: Use the hw.usb sysctl tree instead of debug.usb. Requested by: imp --- sys/dev/sound/usb/uaudio.c | 3 ++- sys/dev/usb/ohci.c | 3 ++- sys/dev/usb/ucom.c | 3 ++- sys/dev/usb/udbp.c | 3 ++- sys/dev/usb/ufm.c | 3 ++- sys/dev/usb/ugen.c | 3 ++- sys/dev/usb/uhci.c | 5 ++++- sys/dev/usb/uhid.c | 3 ++- sys/dev/usb/uhub.c | 3 ++- sys/dev/usb/ukbd.c | 3 ++- sys/dev/usb/ulpt.c | 3 ++- sys/dev/usb/umass.c | 3 ++- sys/dev/usb/umodem.c | 3 ++- sys/dev/usb/ums.c | 3 ++- sys/dev/usb/uplcom.c | 3 ++- sys/dev/usb/urio.c | 3 ++- sys/dev/usb/usb.c | 4 ++-- sys/dev/usb/usb_port.h | 2 +- sys/dev/usb/uscanner.c | 3 ++- sys/dev/usb/uvisor.c | 3 ++- sys/dev/usb/uvscom.c | 3 ++- 21 files changed, 43 insertions(+), 22 deletions(-) (limited to 'sys/dev') diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 3ee6406..e79a70c 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -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) diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 13126df..501fd80 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -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)) diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index e654a02..49bb643 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -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) \ diff --git a/sys/dev/usb/udbp.c b/sys/dev/usb/udbp.c index 11555dc..a0519da 100644 --- a/sys/dev/usb/udbp.c +++ b/sys/dev/usb/udbp.c @@ -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) diff --git a/sys/dev/usb/ufm.c b/sys/dev/usb/ufm.c index e940257..16859d5 100644 --- a/sys/dev/usb/ufm.c +++ b/sys/dev/usb/ufm.c @@ -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) diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index 08221af..72cde8f 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -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) diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 218f9bf..382c295 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -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 diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index bf18fdc..2570aa1 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -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) diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index e05b4d3..5fc4c45 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -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) diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index 11463d0..e2fc59e 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -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) diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 3ac0b8f..6bd5ba3 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -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) diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 3232d19..b5deb99 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -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 */ diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c index c6151e7..d0775f0 100644 --- a/sys/dev/usb/umodem.c +++ b/sys/dev/usb/umodem.c @@ -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) diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index d99d058..e313d3e 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -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) diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index 1347311..d6bf054 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -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 { \ diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c index 05e42f8..af4219b 100644 --- a/sys/dev/usb/urio.c +++ b/sys/dev/usb/urio.c @@ -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) diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 9a36055..73dde62 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -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; diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 1637cc1..03dcbb1 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -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__ */ diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 03c9091..3b7a8cd 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -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) diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c index 6cc5b9e..b654a0a 100644 --- a/sys/dev/usb/uvisor.c +++ b/sys/dev/usb/uvisor.c @@ -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) diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c index ebf48944..afeb56d 100644 --- a/sys/dev/usb/uvscom.c +++ b/sys/dev/usb/uvscom.c @@ -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 { \ -- cgit v1.1