d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the usb sysctl tree from hw.usb2.* back to hw.usb.*.

Browse Source 
Submitted by:	Hans Petter Selasky
This commit is contained in:
Andrew Thompson 2009-05-21 01:48:42 +00:00
parent 596c08801d
commit 9360ae4073
48 changed files with 103 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UPDATING
View File

@ -22,6 +22,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW:
to maximize performance. (To disable malloc debugging, run to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.) ln -s aj /etc/malloc.conf.)
20090520:
The sysctl tree for the usb stack has renamed from hw.usb2.* to
hw.usb.* and is now consistent again with previous releases.
20090520: 20090520:
802.11 monitor mode support was revised and driver api's 802.11 monitor mode support was revised and driver api's
were changed. Drivers dependent on net80211 now support were changed. Drivers dependent on net80211 now support

4
sys/dev/usb/controller/at91dci.c
View File

@ -73,8 +73,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int at91dcidebug = 0; static int at91dcidebug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, at91dci, CTLFLAG_RW, 0, "USB at91dci"); SYSCTL_NODE(_hw_usb, OID_AUTO, at91dci, CTLFLAG_RW, 0, "USB at91dci");
SYSCTL_INT(_hw_usb2_at91dci, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_at91dci, OID_AUTO, debug, CTLFLAG_RW,
&at91dcidebug, 0, "at91dci debug level"); &at91dcidebug, 0, "at91dci debug level");
#endif #endif

4
sys/dev/usb/controller/atmegadci.c
View File

@ -65,8 +65,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int atmegadci_debug = 0; static int atmegadci_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI"); SYSCTL_NODE(_hw_usb, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI");
SYSCTL_INT(_hw_usb2_atmegadci, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_atmegadci, OID_AUTO, debug, CTLFLAG_RW,
&atmegadci_debug, 0, "ATMEGA DCI debug level"); &atmegadci_debug, 0, "ATMEGA DCI debug level");
#endif #endif

6
sys/dev/usb/controller/ehci.c
View File

@ -73,10 +73,10 @@ __FBSDID("$FreeBSD$");
static int ehcidebug = 0; static int ehcidebug = 0;
static int ehcinohighspeed = 0; static int ehcinohighspeed = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci"); SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci");
SYSCTL_INT(_hw_usb2_ehci, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_ehci, OID_AUTO, debug, CTLFLAG_RW,
&ehcidebug, 0, "Debug level"); &ehcidebug, 0, "Debug level");
SYSCTL_INT(_hw_usb2_ehci, OID_AUTO, no_hs, CTLFLAG_RW, SYSCTL_INT(_hw_usb_ehci, OID_AUTO, no_hs, CTLFLAG_RW,
&ehcinohighspeed, 0, "Disable High Speed USB"); &ehcinohighspeed, 0, "Disable High Speed USB");
static void ehci_dump_regs(ehci_softc_t *sc); static void ehci_dump_regs(ehci_softc_t *sc);

4
sys/dev/usb/controller/musb_otg.c
View File

@ -67,8 +67,8 @@
#if USB_DEBUG #if USB_DEBUG
static int musbotgdebug = 0; static int musbotgdebug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, musbotg, CTLFLAG_RW, 0, "USB musbotg"); SYSCTL_NODE(_hw_usb, OID_AUTO, musbotg, CTLFLAG_RW, 0, "USB musbotg");
SYSCTL_INT(_hw_usb2_musbotg, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_musbotg, OID_AUTO, debug, CTLFLAG_RW,
&musbotgdebug, 0, "Debug level"); &musbotgdebug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/controller/ohci.c
View File

@ -61,8 +61,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int ohcidebug = 0; static int ohcidebug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci"); SYSCTL_NODE(_hw_usb, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci");
SYSCTL_INT(_hw_usb2_ohci, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_ohci, OID_AUTO, debug, CTLFLAG_RW,
&ohcidebug, 0, "ohci debug level"); &ohcidebug, 0, "ohci debug level");
static void ohci_dumpregs(ohci_softc_t *); static void ohci_dumpregs(ohci_softc_t *);
static void ohci_dump_tds(ohci_td_t *); static void ohci_dump_tds(ohci_td_t *);

6
sys/dev/usb/controller/uhci.c
View File

@ -66,10 +66,10 @@ __FBSDID("$FreeBSD$");
static int uhcidebug = 0; static int uhcidebug = 0;
static int uhcinoloop = 0; static int uhcinoloop = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, uhci, CTLFLAG_RW, 0, "USB uhci"); SYSCTL_NODE(_hw_usb, OID_AUTO, uhci, CTLFLAG_RW, 0, "USB uhci");
SYSCTL_INT(_hw_usb2_uhci, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_uhci, OID_AUTO, debug, CTLFLAG_RW,
&uhcidebug, 0, "uhci debug level"); &uhcidebug, 0, "uhci debug level");
SYSCTL_INT(_hw_usb2_uhci, OID_AUTO, loop, CTLFLAG_RW, SYSCTL_INT(_hw_usb_uhci, OID_AUTO, loop, CTLFLAG_RW,
&uhcinoloop, 0, "uhci noloop"); &uhcinoloop, 0, "uhci noloop");
static void uhci_dumpregs(uhci_softc_t *sc); static void uhci_dumpregs(uhci_softc_t *sc);
static void uhci_dump_tds(uhci_td_t *td); static void uhci_dump_tds(uhci_td_t *td);

4
sys/dev/usb/controller/usb_controller.c
View File

@ -55,8 +55,8 @@ static void usb2_post_init(void *);
#if USB_DEBUG #if USB_DEBUG
static int usb2_ctrl_debug = 0; static int usb2_ctrl_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ctrl, CTLFLAG_RW, 0, "USB controller"); SYSCTL_NODE(_hw_usb, OID_AUTO, ctrl, CTLFLAG_RW, 0, "USB controller");
SYSCTL_INT(_hw_usb2_ctrl, OID_AUTO, debug, CTLFLAG_RW, &usb2_ctrl_debug, 0, SYSCTL_INT(_hw_usb_ctrl, OID_AUTO, debug, CTLFLAG_RW, &usb2_ctrl_debug, 0,
"Debug level"); "Debug level");
#endif #endif

4
sys/dev/usb/controller/uss820dci.c
View File

@ -62,8 +62,8 @@
#if USB_DEBUG #if USB_DEBUG
static int uss820dcidebug = 0; static int uss820dcidebug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, uss820dci, CTLFLAG_RW, 0, "USB uss820dci"); SYSCTL_NODE(_hw_usb, OID_AUTO, uss820dci, CTLFLAG_RW, 0, "USB uss820dci");
SYSCTL_INT(_hw_usb2_uss820dci, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_uss820dci, OID_AUTO, debug, CTLFLAG_RW,
&uss820dcidebug, 0, "uss820dci debug level"); &uss820dcidebug, 0, "uss820dci debug level");
#endif #endif

4
sys/dev/usb/input/uhid.c
View File

@ -76,8 +76,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int uhid_debug = 0; static int uhid_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid"); SYSCTL_NODE(_hw_usb, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid");
SYSCTL_INT(_hw_usb2_uhid, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_uhid, OID_AUTO, debug, CTLFLAG_RW,
&uhid_debug, 0, "Debug level"); &uhid_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/input/ukbd.c
View File

@ -86,8 +86,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int ukbd_debug = 0; static int ukbd_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ukbd, CTLFLAG_RW, 0, "USB ukbd"); SYSCTL_NODE(_hw_usb, OID_AUTO, ukbd, CTLFLAG_RW, 0, "USB ukbd");
SYSCTL_INT(_hw_usb2_ukbd, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, debug, CTLFLAG_RW,
&ukbd_debug, 0, "Debug level"); &ukbd_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/input/ums.c
View File

@ -72,8 +72,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int ums_debug = 0; static int ums_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums"); SYSCTL_NODE(_hw_usb, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums");
SYSCTL_INT(_hw_usb2_ums, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_ums, OID_AUTO, debug, CTLFLAG_RW,
&ums_debug, 0, "Debug level"); &ums_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/misc/udbp.c
View File

@ -83,8 +83,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int udbp_debug = 0; static int udbp_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, udbp, CTLFLAG_RW, 0, "USB udbp"); SYSCTL_NODE(_hw_usb, OID_AUTO, udbp, CTLFLAG_RW, 0, "USB udbp");
SYSCTL_INT(_hw_usb2_udbp, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_udbp, OID_AUTO, debug, CTLFLAG_RW,
&udbp_debug, 0, "udbp debug level"); &udbp_debug, 0, "udbp debug level");
#endif #endif

4
sys/dev/usb/net/if_aue.c
View File

@ -89,8 +89,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int aue_debug = 0; static int aue_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue"); SYSCTL_NODE(_hw_usb, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue");
SYSCTL_INT(_hw_usb2_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0, SYSCTL_INT(_hw_usb_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0,
"Debug level"); "Debug level");
#endif #endif

4
sys/dev/usb/net/if_axe.c
View File

@ -112,8 +112,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int axe_debug = 0; static int axe_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, axe, CTLFLAG_RW, 0, "USB axe"); SYSCTL_NODE(_hw_usb, OID_AUTO, axe, CTLFLAG_RW, 0, "USB axe");
SYSCTL_INT(_hw_usb2_axe, OID_AUTO, debug, CTLFLAG_RW, &axe_debug, 0, SYSCTL_INT(_hw_usb_axe, OID_AUTO, debug, CTLFLAG_RW, &axe_debug, 0,
"Debug level"); "Debug level");
#endif #endif

4
sys/dev/usb/net/if_cdce.c
View File

@ -88,8 +88,8 @@ static uint32_t cdce_m_crc32(struct mbuf *, uint32_t, uint32_t);
#if USB_DEBUG #if USB_DEBUG
static int cdce_debug = 0; static int cdce_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, cdce, CTLFLAG_RW, 0, "USB CDC-Ethernet"); SYSCTL_NODE(_hw_usb, OID_AUTO, cdce, CTLFLAG_RW, 0, "USB CDC-Ethernet");
SYSCTL_INT(_hw_usb2_cdce, OID_AUTO, debug, CTLFLAG_RW, &cdce_debug, 0, SYSCTL_INT(_hw_usb_cdce, OID_AUTO, debug, CTLFLAG_RW, &cdce_debug, 0,
"Debug level"); "Debug level");
#endif #endif

4
sys/dev/usb/net/if_cue.c
View File

@ -109,8 +109,8 @@ static void cue_reset(struct cue_softc *);
#if USB_DEBUG #if USB_DEBUG
static int cue_debug = 0; static int cue_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, cue, CTLFLAG_RW, 0, "USB cue"); SYSCTL_NODE(_hw_usb, OID_AUTO, cue, CTLFLAG_RW, 0, "USB cue");
SYSCTL_INT(_hw_usb2_cue, OID_AUTO, debug, CTLFLAG_RW, &cue_debug, 0, SYSCTL_INT(_hw_usb_cue, OID_AUTO, debug, CTLFLAG_RW, &cue_debug, 0,
"Debug level"); "Debug level");
#endif #endif

4
sys/dev/usb/net/if_kue.c
View File

@ -151,8 +151,8 @@ static void kue_reset(struct kue_softc *);
#if USB_DEBUG #if USB_DEBUG
static int kue_debug = 0; static int kue_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, kue, CTLFLAG_RW, 0, "USB kue"); SYSCTL_NODE(_hw_usb, OID_AUTO, kue, CTLFLAG_RW, 0, "USB kue");
SYSCTL_INT(_hw_usb2_kue, OID_AUTO, debug, CTLFLAG_RW, &kue_debug, 0, SYSCTL_INT(_hw_usb_kue, OID_AUTO, debug, CTLFLAG_RW, &kue_debug, 0,
"Debug level"); "Debug level");
#endif #endif

4
sys/dev/usb/net/if_rue.c
View File

@ -86,8 +86,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int rue_debug = 0; static int rue_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, rue, CTLFLAG_RW, 0, "USB rue"); SYSCTL_NODE(_hw_usb, OID_AUTO, rue, CTLFLAG_RW, 0, "USB rue");
SYSCTL_INT(_hw_usb2_rue, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_rue, OID_AUTO, debug, CTLFLAG_RW,
&rue_debug, 0, "Debug level"); &rue_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/net/if_udav.c
View File

@ -174,8 +174,8 @@ static const struct usb2_ether_methods udav_ue_methods = {
#if USB_DEBUG #if USB_DEBUG
static int udav_debug = 0; static int udav_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, udav, CTLFLAG_RW, 0, "USB udav"); SYSCTL_NODE(_hw_usb, OID_AUTO, udav, CTLFLAG_RW, 0, "USB udav");
SYSCTL_INT(_hw_usb2_udav, OID_AUTO, debug, CTLFLAG_RW, &udav_debug, 0, SYSCTL_INT(_hw_usb_udav, OID_AUTO, debug, CTLFLAG_RW, &udav_debug, 0,
"Debug level"); "Debug level");
#endif #endif

4
sys/dev/usb/serial/u3g.c
View File

@ -53,8 +53,8 @@
#if USB_DEBUG #if USB_DEBUG
static int u3g_debug = 0; static int u3g_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, u3g, CTLFLAG_RW, 0, "USB 3g"); SYSCTL_NODE(_hw_usb, OID_AUTO, u3g, CTLFLAG_RW, 0, "USB 3g");
SYSCTL_INT(_hw_usb2_u3g, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug, CTLFLAG_RW,
&u3g_debug, 0, "Debug level"); &u3g_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/serial/ubsa.c
View File

@ -83,8 +83,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int ubsa_debug = 0; static int ubsa_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ubsa, CTLFLAG_RW, 0, "USB ubsa"); SYSCTL_NODE(_hw_usb, OID_AUTO, ubsa, CTLFLAG_RW, 0, "USB ubsa");
SYSCTL_INT(_hw_usb2_ubsa, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_ubsa, OID_AUTO, debug, CTLFLAG_RW,
&ubsa_debug, 0, "ubsa debug level"); &ubsa_debug, 0, "ubsa debug level");
#endif #endif

4
sys/dev/usb/serial/ubser.c
View File

@ -104,8 +104,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int ubser_debug = 0; static int ubser_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ubser, CTLFLAG_RW, 0, "USB ubser"); SYSCTL_NODE(_hw_usb, OID_AUTO, ubser, CTLFLAG_RW, 0, "USB ubser");
SYSCTL_INT(_hw_usb2_ubser, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_ubser, OID_AUTO, debug, CTLFLAG_RW,
&ubser_debug, 0, "ubser debug level"); &ubser_debug, 0, "ubser debug level");
#endif #endif

4
sys/dev/usb/serial/uchcom.c
View File

@ -91,8 +91,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int uchcom_debug = 0; static int uchcom_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, uchcom, CTLFLAG_RW, 0, "USB uchcom"); SYSCTL_NODE(_hw_usb, OID_AUTO, uchcom, CTLFLAG_RW, 0, "USB uchcom");
SYSCTL_INT(_hw_usb2_uchcom, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_uchcom, OID_AUTO, debug, CTLFLAG_RW,
&uchcom_debug, 0, "uchcom debug level"); &uchcom_debug, 0, "uchcom debug level");
#endif #endif

4
sys/dev/usb/serial/uftdi.c
View File

@ -70,8 +70,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int uftdi_debug = 0; static int uftdi_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, uftdi, CTLFLAG_RW, 0, "USB uftdi"); SYSCTL_NODE(_hw_usb, OID_AUTO, uftdi, CTLFLAG_RW, 0, "USB uftdi");
SYSCTL_INT(_hw_usb2_uftdi, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_uftdi, OID_AUTO, debug, CTLFLAG_RW,
&uftdi_debug, 0, "Debug level"); &uftdi_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/serial/ulpt.c
View File

@ -68,8 +68,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int ulpt_debug = 0; static int ulpt_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ulpt, CTLFLAG_RW, 0, "USB ulpt"); SYSCTL_NODE(_hw_usb, OID_AUTO, ulpt, CTLFLAG_RW, 0, "USB ulpt");
SYSCTL_INT(_hw_usb2_ulpt, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_ulpt, OID_AUTO, debug, CTLFLAG_RW,
&ulpt_debug, 0, "Debug level"); &ulpt_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/serial/umodem.c
View File

@ -103,8 +103,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int umodem_debug = 0; static int umodem_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, umodem, CTLFLAG_RW, 0, "USB umodem"); SYSCTL_NODE(_hw_usb, OID_AUTO, umodem, CTLFLAG_RW, 0, "USB umodem");
SYSCTL_INT(_hw_usb2_umodem, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_umodem, OID_AUTO, debug, CTLFLAG_RW,
&umodem_debug, 0, "Debug level"); &umodem_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/serial/umoscom.c
View File

@ -38,8 +38,8 @@
#if USB_DEBUG #if USB_DEBUG
static int umoscom_debug = 0; static int umoscom_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, umoscom, CTLFLAG_RW, 0, "USB umoscom"); SYSCTL_NODE(_hw_usb, OID_AUTO, umoscom, CTLFLAG_RW, 0, "USB umoscom");
SYSCTL_INT(_hw_usb2_umoscom, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_umoscom, OID_AUTO, debug, CTLFLAG_RW,
&umoscom_debug, 0, "Debug level"); &umoscom_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/serial/uplcom.c
View File

@ -105,8 +105,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int uplcom_debug = 0; static int uplcom_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, uplcom, CTLFLAG_RW, 0, "USB uplcom"); SYSCTL_NODE(_hw_usb, OID_AUTO, uplcom, CTLFLAG_RW, 0, "USB uplcom");
SYSCTL_INT(_hw_usb2_uplcom, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_uplcom, OID_AUTO, debug, CTLFLAG_RW,
&uplcom_debug, 0, "Debug level"); &uplcom_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/serial/usb_serial.c
View File

@ -87,8 +87,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int usb2_com_debug = 0; static int usb2_com_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ucom, CTLFLAG_RW, 0, "USB ucom"); SYSCTL_NODE(_hw_usb, OID_AUTO, ucom, CTLFLAG_RW, 0, "USB ucom");
SYSCTL_INT(_hw_usb2_ucom, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_ucom, OID_AUTO, debug, CTLFLAG_RW,
&usb2_com_debug, 0, "ucom debug level"); &usb2_com_debug, 0, "ucom debug level");
#endif #endif

4
sys/dev/usb/serial/uslcom.c
View File

@ -39,8 +39,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int uslcom_debug = 0; static int uslcom_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, uslcom, CTLFLAG_RW, 0, "USB uslcom"); SYSCTL_NODE(_hw_usb, OID_AUTO, uslcom, CTLFLAG_RW, 0, "USB uslcom");
SYSCTL_INT(_hw_usb2_uslcom, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_uslcom, OID_AUTO, debug, CTLFLAG_RW,
&uslcom_debug, 0, "Debug level"); &uslcom_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/serial/uvisor.c
View File

@ -76,8 +76,8 @@
#if USB_DEBUG #if USB_DEBUG
static int uvisor_debug = 0; static int uvisor_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, uvisor, CTLFLAG_RW, 0, "USB uvisor"); SYSCTL_NODE(_hw_usb, OID_AUTO, uvisor, CTLFLAG_RW, 0, "USB uvisor");
SYSCTL_INT(_hw_usb2_uvisor, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_uvisor, OID_AUTO, debug, CTLFLAG_RW,
&uvisor_debug, 0, "Debug level"); &uvisor_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/serial/uvscom.c
View File

@ -58,8 +58,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int uvscom_debug = 0; static int uvscom_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, uvscom, CTLFLAG_RW, 0, "USB uvscom"); SYSCTL_NODE(_hw_usb, OID_AUTO, uvscom, CTLFLAG_RW, 0, "USB uvscom");
SYSCTL_INT(_hw_usb2_uvscom, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_uvscom, OID_AUTO, debug, CTLFLAG_RW,
&uvscom_debug, 0, "Debug level"); &uvscom_debug, 0, "Debug level");
#endif #endif

4
sys/dev/usb/storage/umass.c
View File

@ -159,8 +159,8 @@ __FBSDID("$FreeBSD$");
#define UDMASS_ALL 0xffff0000 /* all of the above */ #define UDMASS_ALL 0xffff0000 /* all of the above */
static int umass_debug = 0; static int umass_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, umass, CTLFLAG_RW, 0, "USB umass"); SYSCTL_NODE(_hw_usb, OID_AUTO, umass, CTLFLAG_RW, 0, "USB umass");
SYSCTL_INT(_hw_usb2_umass, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_umass, OID_AUTO, debug, CTLFLAG_RW,
&umass_debug, 0, "umass debug level"); &umass_debug, 0, "umass debug level");
#else #else
#define DIF(...) do { } while (0) #define DIF(...) do { } while (0)

4
sys/dev/usb/storage/urio.c
View File

@ -67,8 +67,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int urio_debug = 0; static int urio_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, urio, CTLFLAG_RW, 0, "USB urio"); SYSCTL_NODE(_hw_usb, OID_AUTO, urio, CTLFLAG_RW, 0, "USB urio");
SYSCTL_INT(_hw_usb2_urio, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_urio, OID_AUTO, debug, CTLFLAG_RW,
&urio_debug, 0, "urio debug level"); &urio_debug, 0, "urio debug level");
#endif #endif

4
sys/dev/usb/storage/ustorage_fs.c
View File

@ -52,8 +52,8 @@
#if USB_DEBUG #if USB_DEBUG
static int ustorage_fs_debug = 0; static int ustorage_fs_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ustorage_fs, CTLFLAG_RW, 0, "USB ustorage_fs"); SYSCTL_NODE(_hw_usb, OID_AUTO, ustorage_fs, CTLFLAG_RW, 0, "USB ustorage_fs");
SYSCTL_INT(_hw_usb2_ustorage_fs, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_ustorage_fs, OID_AUTO, debug, CTLFLAG_RW,
&ustorage_fs_debug, 0, "ustorage_fs debug level"); &ustorage_fs_debug, 0, "ustorage_fs debug level");
#endif #endif

4
sys/dev/usb/usb_debug.c
View File

@ -39,8 +39,8 @@
*/ */
int usb2_debug = 0; int usb2_debug = 0;
SYSCTL_NODE(_hw, OID_AUTO, usb2, CTLFLAG_RW, 0, "USB debugging"); SYSCTL_NODE(_hw, OID_AUTO, usb, CTLFLAG_RW, 0, "USB debugging");
SYSCTL_INT(_hw_usb2, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb, OID_AUTO, debug, CTLFLAG_RW,
&usb2_debug, 0, "Debug level"); &usb2_debug, 0, "Debug level");
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*

2
sys/dev/usb/usb_debug.h
View File

@ -30,7 +30,7 @@
#define _USB2_DEBUG_H_ #define _USB2_DEBUG_H_
/* Declare parent SYSCTL USB node. */ /* Declare parent SYSCTL USB node. */
SYSCTL_DECL(_hw_usb2); SYSCTL_DECL(_hw_usb);
/* Declare global USB debug variable. */ /* Declare global USB debug variable. */
extern int usb2_debug; extern int usb2_debug;

4
sys/dev/usb/usb_dev.c
View File

@ -59,8 +59,8 @@
#if USB_DEBUG #if USB_DEBUG
static int usb2_fifo_debug = 0; static int usb2_fifo_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, dev, CTLFLAG_RW, 0, "USB device"); SYSCTL_NODE(_hw_usb, OID_AUTO, dev, CTLFLAG_RW, 0, "USB device");
SYSCTL_INT(_hw_usb2_dev, OID_AUTO, debug, CTLFLAG_RW, SYSCTL_INT(_hw_usb_dev, OID_AUTO, debug, CTLFLAG_RW,
&usb2_fifo_debug, 0, "Debug Level"); &usb2_fifo_debug, 0, "Debug Level");
#endif #endif

2
sys/dev/usb/usb_device.c
View File

@ -87,7 +87,7 @@ static void usb2_cdev_cleanup(void *);
int usb2_template = 0; int usb2_template = 0;
SYSCTL_INT(_hw_usb2, OID_AUTO, template, CTLFLAG_RW, SYSCTL_INT(_hw_usb, OID_AUTO, template, CTLFLAG_RW,
&usb2_template, 0, "Selected USB device side template"); &usb2_template, 0, "Selected USB device side template");
static const char* statestr[USB_STATE_MAX] = { static const char* statestr[USB_STATE_MAX] = {

4
sys/dev/usb/usb_generic.c
View File

@ -105,8 +105,8 @@ struct usb2_fifo_methods usb2_ugen_methods = {
#if USB_DEBUG #if USB_DEBUG
static int ugen_debug = 0; static int ugen_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ugen, CTLFLAG_RW, 0, "USB generic"); SYSCTL_NODE(_hw_usb, OID_AUTO, ugen, CTLFLAG_RW, 0, "USB generic");
SYSCTL_INT(_hw_usb2_ugen, OID_AUTO, debug, CTLFLAG_RW, &ugen_debug, SYSCTL_INT(_hw_usb_ugen, OID_AUTO, debug, CTLFLAG_RW, &ugen_debug,
0, "Debug level"); 0, "Debug level");
#endif #endif

6
sys/dev/usb/usb_hub.c
View File

@ -57,15 +57,15 @@
#if USB_DEBUG #if USB_DEBUG
static int uhub_debug = 0; static int uhub_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, uhub, CTLFLAG_RW, 0, "USB HUB"); SYSCTL_NODE(_hw_usb, OID_AUTO, uhub, CTLFLAG_RW, 0, "USB HUB");
SYSCTL_INT(_hw_usb2_uhub, OID_AUTO, debug, CTLFLAG_RW, &uhub_debug, 0, SYSCTL_INT(_hw_usb_uhub, OID_AUTO, debug, CTLFLAG_RW, &uhub_debug, 0,
"Debug level"); "Debug level");
#endif #endif
#if USB_HAVE_POWERD #if USB_HAVE_POWERD
static int usb2_power_timeout = 30; /* seconds */ static int usb2_power_timeout = 30; /* seconds */
SYSCTL_INT(_hw_usb2, OID_AUTO, power_timeout, CTLFLAG_RW, SYSCTL_INT(_hw_usb, OID_AUTO, power_timeout, CTLFLAG_RW,
&usb2_power_timeout, 0, "USB power timeout"); &usb2_power_timeout, 0, "USB power timeout");
#endif #endif

4
sys/dev/usb/usb_process.c
View File

@ -55,8 +55,8 @@
#if USB_DEBUG #if USB_DEBUG
static int usb2_proc_debug; static int usb2_proc_debug;
SYSCTL_NODE(_hw_usb2, OID_AUTO, proc, CTLFLAG_RW, 0, "USB process"); SYSCTL_NODE(_hw_usb, OID_AUTO, proc, CTLFLAG_RW, 0, "USB process");
SYSCTL_INT(_hw_usb2_proc, OID_AUTO, debug, CTLFLAG_RW, &usb2_proc_debug, 0, SYSCTL_INT(_hw_usb_proc, OID_AUTO, debug, CTLFLAG_RW, &usb2_proc_debug, 0,
"Debug level"); "Debug level");
#endif #endif

6
sys/dev/usb/usb_request.c
View File

@ -53,11 +53,11 @@ static int usb2_pr_poll_delay = USB_PORT_RESET_DELAY;
static int usb2_pr_recovery_delay = USB_PORT_RESET_RECOVERY; static int usb2_pr_recovery_delay = USB_PORT_RESET_RECOVERY;
static int usb2_ss_delay = 0; static int usb2_ss_delay = 0;
SYSCTL_INT(_hw_usb2, OID_AUTO, pr_poll_delay, CTLFLAG_RW, SYSCTL_INT(_hw_usb, OID_AUTO, pr_poll_delay, CTLFLAG_RW,
&usb2_pr_poll_delay, 0, "USB port reset poll delay in ms"); &usb2_pr_poll_delay, 0, "USB port reset poll delay in ms");
SYSCTL_INT(_hw_usb2, OID_AUTO, pr_recovery_delay, CTLFLAG_RW, SYSCTL_INT(_hw_usb, OID_AUTO, pr_recovery_delay, CTLFLAG_RW,
&usb2_pr_recovery_delay, 0, "USB port reset recovery delay in ms"); &usb2_pr_recovery_delay, 0, "USB port reset recovery delay in ms");
SYSCTL_INT(_hw_usb2, OID_AUTO, ss_delay, CTLFLAG_RW, SYSCTL_INT(_hw_usb, OID_AUTO, ss_delay, CTLFLAG_RW,
&usb2_ss_delay, 0, "USB status stage delay in ms"); &usb2_ss_delay, 0, "USB status stage delay in ms");
#endif #endif

4
sys/dev/usb/wlan/if_rum.c
View File

@ -85,8 +85,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int rum_debug = 0; static int rum_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, rum, CTLFLAG_RW, 0, "USB rum"); SYSCTL_NODE(_hw_usb, OID_AUTO, rum, CTLFLAG_RW, 0, "USB rum");
SYSCTL_INT(_hw_usb2_rum, OID_AUTO, debug, CTLFLAG_RW, &rum_debug, 0, SYSCTL_INT(_hw_usb_rum, OID_AUTO, debug, CTLFLAG_RW, &rum_debug, 0,
"Debug level"); "Debug level");
#endif #endif

10
sys/dev/usb/wlan/if_uath.c
View File

@ -116,19 +116,19 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/wlan/if_uathreg.h> #include <dev/usb/wlan/if_uathreg.h>
#include <dev/usb/wlan/if_uathvar.h> #include <dev/usb/wlan/if_uathvar.h>
SYSCTL_NODE(_hw_usb2, OID_AUTO, uath, CTLFLAG_RW, 0, "USB Atheros"); SYSCTL_NODE(_hw_usb, OID_AUTO, uath, CTLFLAG_RW, 0, "USB Atheros");
static int uath_countrycode = CTRY_DEFAULT; /* country code */ static int uath_countrycode = CTRY_DEFAULT; /* country code */
SYSCTL_INT(_hw_usb2_uath, OID_AUTO, countrycode, CTLFLAG_RW, &uath_countrycode, SYSCTL_INT(_hw_usb_uath, OID_AUTO, countrycode, CTLFLAG_RW, &uath_countrycode,
0, "country code"); 0, "country code");
TUNABLE_INT("hw.usb2.uath.countrycode", &uath_countrycode); TUNABLE_INT("hw.usb.uath.countrycode", &uath_countrycode);
static int uath_regdomain = 0; /* regulatory domain */ static int uath_regdomain = 0; /* regulatory domain */
SYSCTL_INT(_hw_usb2_uath, OID_AUTO, regdomain, CTLFLAG_RD, &uath_regdomain, SYSCTL_INT(_hw_usb_uath, OID_AUTO, regdomain, CTLFLAG_RD, &uath_regdomain,
0, "regulatory domain"); 0, "regulatory domain");
#ifdef UATH_DEBUG #ifdef UATH_DEBUG
int uath_debug = 0; int uath_debug = 0;
SYSCTL_INT(_hw_usb2_uath, OID_AUTO, debug, CTLFLAG_RW, &uath_debug, 0, SYSCTL_INT(_hw_usb_uath, OID_AUTO, debug, CTLFLAG_RW, &uath_debug, 0,
"uath debug level"); "uath debug level");
TUNABLE_INT("hw.usb.uath.debug", &uath_debug); TUNABLE_INT("hw.usb.uath.debug", &uath_debug);
enum { enum {

4
sys/dev/usb/wlan/if_ural.c
View File

@ -87,8 +87,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int ural_debug = 0; static int ural_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, ural, CTLFLAG_RW, 0, "USB ural"); SYSCTL_NODE(_hw_usb, OID_AUTO, ural, CTLFLAG_RW, 0, "USB ural");
SYSCTL_INT(_hw_usb2_ural, OID_AUTO, debug, CTLFLAG_RW, &ural_debug, 0, SYSCTL_INT(_hw_usb_ural, OID_AUTO, debug, CTLFLAG_RW, &ural_debug, 0,
"Debug level"); "Debug level");
#endif #endif

4
sys/dev/usb/wlan/if_zyd.c
View File

@ -82,8 +82,8 @@ __FBSDID("$FreeBSD$");
#if USB_DEBUG #if USB_DEBUG
static int zyd_debug = 0; static int zyd_debug = 0;
SYSCTL_NODE(_hw_usb2, OID_AUTO, zyd, CTLFLAG_RW, 0, "USB zyd"); SYSCTL_NODE(_hw_usb, OID_AUTO, zyd, CTLFLAG_RW, 0, "USB zyd");
SYSCTL_INT(_hw_usb2_zyd, OID_AUTO, debug, CTLFLAG_RW, &zyd_debug, 0, SYSCTL_INT(_hw_usb_zyd, OID_AUTO, debug, CTLFLAG_RW, &zyd_debug, 0,
"zyd debug level"); "zyd debug level");
enum { enum {