From: Sascha Wildner Date: Thu, 12 Mar 2015 21:56:49 +0000 (+0100) Subject: kernel/usb4bsd: Unbreak building with USB_DEBUG in the config. X-Git-Tag: v4.2.0rc~574 X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/a9b765b780f7f2d365fcd96e0f99b8e463369497 kernel/usb4bsd: Unbreak building with USB_DEBUG in the config. --- diff --git a/sys/bus/u4b/controller/usb_controller.c b/sys/bus/u4b/controller/usb_controller.c index 9e96aa8600..29f751f376 100644 --- a/sys/bus/u4b/controller/usb_controller.c +++ b/sys/bus/u4b/controller/usb_controller.c @@ -78,7 +78,7 @@ static void usb_attach_sub(device_t, struct usb_bus *); static int usb_ctrl_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, ctrl, CTLFLAG_RW, 0, "USB controller"); -SYSCTL_INT(_hw_usb_ctrl, OID_AUTO, debug, CTLFLAG_RWTUN, &usb_ctrl_debug, 0, +SYSCTL_INT(_hw_usb_ctrl, OID_AUTO, debug, CTLFLAG_RW, &usb_ctrl_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/input/uep.c b/sys/bus/u4b/input/uep.c index fa2b70e4fb..908cc9da95 100644 --- a/sys/bus/u4b/input/uep.c +++ b/sys/bus/u4b/input/uep.c @@ -58,7 +58,7 @@ static int uep_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, uep, CTLFLAG_RW, 0, "USB uep"); -SYSCTL_INT(_hw_usb_uep, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_uep, OID_AUTO, debug, CTLFLAG_RW, &uep_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/input/uhid.c b/sys/bus/u4b/input/uhid.c index 14ea005e49..9997834f3f 100644 --- a/sys/bus/u4b/input/uhid.c +++ b/sys/bus/u4b/input/uhid.c @@ -74,7 +74,7 @@ static int uhid_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid"); -SYSCTL_INT(_hw_usb_uhid, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_uhid, OID_AUTO, debug, CTLFLAG_RW, &uhid_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/input/ums.c b/sys/bus/u4b/input/ums.c index 5e4b29941b..e3e993d26a 100644 --- a/sys/bus/u4b/input/ums.c +++ b/sys/bus/u4b/input/ums.c @@ -71,7 +71,7 @@ static int ums_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums"); -SYSCTL_INT(_hw_usb_ums, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_ums, OID_AUTO, debug, CTLFLAG_RW, &ums_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/net/if_aue.c b/sys/bus/u4b/net/if_aue.c index c2c78232e4..4199c40d44 100644 --- a/sys/bus/u4b/net/if_aue.c +++ b/sys/bus/u4b/net/if_aue.c @@ -104,7 +104,7 @@ static int aue_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue"); -SYSCTL_INT(_hw_usb_aue, OID_AUTO, debug, CTLFLAG_RWTUN, &aue_debug, 0, +SYSCTL_INT(_hw_usb_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/net/if_axe.c b/sys/bus/u4b/net/if_axe.c index 23198c952a..dd2d991e13 100644 --- a/sys/bus/u4b/net/if_axe.c +++ b/sys/bus/u4b/net/if_axe.c @@ -130,7 +130,7 @@ static int axe_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, axe, CTLFLAG_RW, 0, "USB axe"); -SYSCTL_INT(_hw_usb_axe, OID_AUTO, debug, CTLFLAG_RWTUN, &axe_debug, 0, +SYSCTL_INT(_hw_usb_axe, OID_AUTO, debug, CTLFLAG_RW, &axe_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/net/if_axge.c b/sys/bus/u4b/net/if_axge.c index 90c79b469b..715a7a37d9 100644 --- a/sys/bus/u4b/net/if_axge.c +++ b/sys/bus/u4b/net/if_axge.c @@ -133,7 +133,7 @@ static void axge_csum_cfg(struct usb_ether *); static int axge_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, axge, CTLFLAG_RW, 0, "USB axge"); -SYSCTL_INT(_hw_usb_axge, OID_AUTO, debug, CTLFLAG_RWTUN, &axge_debug, 0, +SYSCTL_INT(_hw_usb_axge, OID_AUTO, debug, CTLFLAG_RW, &axge_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/net/if_cue.c b/sys/bus/u4b/net/if_cue.c index 707f6d61af..d481404d4d 100644 --- a/sys/bus/u4b/net/if_cue.c +++ b/sys/bus/u4b/net/if_cue.c @@ -126,7 +126,7 @@ static void cue_reset(struct cue_softc *); static int cue_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, cue, CTLFLAG_RW, 0, "USB cue"); -SYSCTL_INT(_hw_usb_cue, OID_AUTO, debug, CTLFLAG_RWTUN, &cue_debug, 0, +SYSCTL_INT(_hw_usb_cue, OID_AUTO, debug, CTLFLAG_RW, &cue_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/net/if_ipheth.c b/sys/bus/u4b/net/if_ipheth.c index 4e7f93f999..a6731a2d27 100644 --- a/sys/bus/u4b/net/if_ipheth.c +++ b/sys/bus/u4b/net/if_ipheth.c @@ -83,7 +83,7 @@ static uether_fn_t ipheth_setpromisc; static int ipheth_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, ipheth, CTLFLAG_RW, 0, "USB iPhone ethernet"); -SYSCTL_INT(_hw_usb_ipheth, OID_AUTO, debug, CTLFLAG_RWTUN, &ipheth_debug, 0, "Debug level"); +SYSCTL_INT(_hw_usb_ipheth, OID_AUTO, debug, CTLFLAG_RW, &ipheth_debug, 0, "Debug level"); #endif static const struct usb_config ipheth_config[IPHETH_N_TRANSFER] = { diff --git a/sys/bus/u4b/net/if_kue.c b/sys/bus/u4b/net/if_kue.c index add3fd417d..0c3829b44e 100644 --- a/sys/bus/u4b/net/if_kue.c +++ b/sys/bus/u4b/net/if_kue.c @@ -167,7 +167,7 @@ static void kue_reset(struct kue_softc *); static int kue_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, kue, CTLFLAG_RW, 0, "USB kue"); -SYSCTL_INT(_hw_usb_kue, OID_AUTO, debug, CTLFLAG_RWTUN, &kue_debug, 0, +SYSCTL_INT(_hw_usb_kue, OID_AUTO, debug, CTLFLAG_RW, &kue_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/net/if_mos.c b/sys/bus/u4b/net/if_mos.c index 1e79d32879..4bf859ff25 100644 --- a/sys/bus/u4b/net/if_mos.c +++ b/sys/bus/u4b/net/if_mos.c @@ -134,7 +134,7 @@ static int mos_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, mos, CTLFLAG_RW, 0, "USB mos"); -SYSCTL_INT(_hw_usb_mos, OID_AUTO, debug, CTLFLAG_RWTUN, &mos_debug, 0, +SYSCTL_INT(_hw_usb_mos, OID_AUTO, debug, CTLFLAG_RW, &mos_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/net/if_udav.c b/sys/bus/u4b/net/if_udav.c index ba8f7ebd45..678fc5b693 100644 --- a/sys/bus/u4b/net/if_udav.c +++ b/sys/bus/u4b/net/if_udav.c @@ -191,7 +191,7 @@ static const struct usb_ether_methods udav_ue_methods_nophy = { static int udav_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, udav, CTLFLAG_RW, 0, "USB udav"); -SYSCTL_INT(_hw_usb_udav, OID_AUTO, debug, CTLFLAG_RWTUN, &udav_debug, 0, +SYSCTL_INT(_hw_usb_udav, OID_AUTO, debug, CTLFLAG_RW, &udav_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/net/if_urndis.c b/sys/bus/u4b/net/if_urndis.c index 833e7a4852..74ff239959 100644 --- a/sys/bus/u4b/net/if_urndis.c +++ b/sys/bus/u4b/net/if_urndis.c @@ -85,7 +85,7 @@ static uint32_t urndis_ctrl_init(struct urndis_softc *); #ifdef USB_DEBUG static int urndis_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, urndis, CTLFLAG_RW, 0, "USB RNDIS-Ethernet"); -SYSCTL_INT(_hw_usb_urndis, OID_AUTO, debug, CTLFLAG_RWTUN, &urndis_debug, 0, +SYSCTL_INT(_hw_usb_urndis, OID_AUTO, debug, CTLFLAG_RW, &urndis_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/serial/u3g.c b/sys/bus/u4b/serial/u3g.c index a038bb0388..0c3b424e76 100644 --- a/sys/bus/u4b/serial/u3g.c +++ b/sys/bus/u4b/serial/u3g.c @@ -65,7 +65,7 @@ static int u3g_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, u3g, CTLFLAG_RW, 0, "USB 3g"); -SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug, CTLFLAG_RW, &u3g_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/serial/ubsa.c b/sys/bus/u4b/serial/ubsa.c index a7f3cf684c..4c6138b3ec 100644 --- a/sys/bus/u4b/serial/ubsa.c +++ b/sys/bus/u4b/serial/ubsa.c @@ -91,7 +91,7 @@ static int ubsa_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, ubsa, CTLFLAG_RW, 0, "USB ubsa"); -SYSCTL_INT(_hw_usb_ubsa, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_ubsa, OID_AUTO, debug, CTLFLAG_RW, &ubsa_debug, 0, "ubsa debug level"); #endif diff --git a/sys/bus/u4b/serial/ubser.c b/sys/bus/u4b/serial/ubser.c index 443d9c4346..772d8c1d50 100644 --- a/sys/bus/u4b/serial/ubser.c +++ b/sys/bus/u4b/serial/ubser.c @@ -112,7 +112,7 @@ static int ubser_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, ubser, CTLFLAG_RW, 0, "USB ubser"); -SYSCTL_INT(_hw_usb_ubser, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_ubser, OID_AUTO, debug, CTLFLAG_RW, &ubser_debug, 0, "ubser debug level"); #endif diff --git a/sys/bus/u4b/serial/uchcom.c b/sys/bus/u4b/serial/uchcom.c index 22ff400bbf..7504747f3e 100644 --- a/sys/bus/u4b/serial/uchcom.c +++ b/sys/bus/u4b/serial/uchcom.c @@ -99,7 +99,7 @@ static int uchcom_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, uchcom, CTLFLAG_RW, 0, "USB uchcom"); -SYSCTL_INT(_hw_usb_uchcom, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_uchcom, OID_AUTO, debug, CTLFLAG_RW, &uchcom_debug, 0, "uchcom debug level"); #endif diff --git a/sys/bus/u4b/serial/ulpt.c b/sys/bus/u4b/serial/ulpt.c index 0d3e585220..df3e7d09e2 100644 --- a/sys/bus/u4b/serial/ulpt.c +++ b/sys/bus/u4b/serial/ulpt.c @@ -68,7 +68,7 @@ static int ulpt_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, ulpt, CTLFLAG_RW, 0, "USB ulpt"); -SYSCTL_INT(_hw_usb_ulpt, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_ulpt, OID_AUTO, debug, CTLFLAG_RW, &ulpt_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/serial/umcs.c b/sys/bus/u4b/serial/umcs.c index e2ab0875bc..50a2f40bd7 100644 --- a/sys/bus/u4b/serial/umcs.c +++ b/sys/bus/u4b/serial/umcs.c @@ -75,7 +75,7 @@ static int umcs_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, umcs, CTLFLAG_RW, 0, "USB umcs quadport serial adapter"); -SYSCTL_INT(_hw_usb_umcs, OID_AUTO, debug, CTLFLAG_RWTUN, &umcs_debug, 0, "Debug level"); +SYSCTL_INT(_hw_usb_umcs, OID_AUTO, debug, CTLFLAG_RW, &umcs_debug, 0, "Debug level"); #endif /* USB_DEBUG */ diff --git a/sys/bus/u4b/serial/umodem.c b/sys/bus/u4b/serial/umodem.c index 0fcd87341f..4192a66b5b 100644 --- a/sys/bus/u4b/serial/umodem.c +++ b/sys/bus/u4b/serial/umodem.c @@ -115,7 +115,7 @@ static int umodem_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, umodem, CTLFLAG_RW, 0, "USB umodem"); -SYSCTL_INT(_hw_usb_umodem, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_umodem, OID_AUTO, debug, CTLFLAG_RW, &umodem_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/serial/umoscom.c b/sys/bus/u4b/serial/umoscom.c index 33efefef32..94e45deefa 100644 --- a/sys/bus/u4b/serial/umoscom.c +++ b/sys/bus/u4b/serial/umoscom.c @@ -49,7 +49,7 @@ static int umoscom_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, umoscom, CTLFLAG_RW, 0, "USB umoscom"); -SYSCTL_INT(_hw_usb_umoscom, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_umoscom, OID_AUTO, debug, CTLFLAG_RW, &umoscom_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/serial/uplcom.c b/sys/bus/u4b/serial/uplcom.c index 081db257d2..41ba9980dd 100644 --- a/sys/bus/u4b/serial/uplcom.c +++ b/sys/bus/u4b/serial/uplcom.c @@ -114,7 +114,7 @@ static int uplcom_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, uplcom, CTLFLAG_RW, 0, "USB uplcom"); -SYSCTL_INT(_hw_usb_uplcom, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_uplcom, OID_AUTO, debug, CTLFLAG_RW, &uplcom_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/serial/usb_serial.c b/sys/bus/u4b/serial/usb_serial.c index b237cef265..e4a457e34f 100644 --- a/sys/bus/u4b/serial/usb_serial.c +++ b/sys/bus/u4b/serial/usb_serial.c @@ -119,7 +119,7 @@ TUNABLE_INT("hw.usb.ucom.pss_mode", &ucom_pps_mode); #ifdef USB_DEBUG static int ucom_debug = 0; -SYSCTL_INT(_hw_usb_ucom, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_ucom, OID_AUTO, debug, CTLFLAG_RW, &ucom_debug, 0, "ucom debug level"); #endif diff --git a/sys/bus/u4b/serial/uslcom.c b/sys/bus/u4b/serial/uslcom.c index eff578e19f..a280ec0121 100644 --- a/sys/bus/u4b/serial/uslcom.c +++ b/sys/bus/u4b/serial/uslcom.c @@ -49,7 +49,7 @@ static int uslcom_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, uslcom, CTLFLAG_RW, 0, "USB uslcom"); -SYSCTL_INT(_hw_usb_uslcom, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_uslcom, OID_AUTO, debug, CTLFLAG_RW, &uslcom_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/serial/uvisor.c b/sys/bus/u4b/serial/uvisor.c index 2d203bbab7..dda188ca67 100644 --- a/sys/bus/u4b/serial/uvisor.c +++ b/sys/bus/u4b/serial/uvisor.c @@ -78,7 +78,7 @@ static int uvisor_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, uvisor, CTLFLAG_RW, 0, "USB uvisor"); -SYSCTL_INT(_hw_usb_uvisor, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_uvisor, OID_AUTO, debug, CTLFLAG_RW, &uvisor_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/serial/uvscom.c b/sys/bus/u4b/serial/uvscom.c index d536ca4e43..fc69d3ee12 100644 --- a/sys/bus/u4b/serial/uvscom.c +++ b/sys/bus/u4b/serial/uvscom.c @@ -66,7 +66,7 @@ static int uvscom_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, uvscom, CTLFLAG_RW, 0, "USB uvscom"); -SYSCTL_INT(_hw_usb_uvscom, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_uvscom, OID_AUTO, debug, CTLFLAG_RW, &uvscom_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/storage/urio.c b/sys/bus/u4b/storage/urio.c index 783f0ce71c..496e7ce8ce 100644 --- a/sys/bus/u4b/storage/urio.c +++ b/sys/bus/u4b/storage/urio.c @@ -76,7 +76,7 @@ static int urio_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, urio, CTLFLAG_RW, 0, "USB urio"); -SYSCTL_INT(_hw_usb_urio, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_urio, OID_AUTO, debug, CTLFLAG_RW, &urio_debug, 0, "urio debug level"); #endif diff --git a/sys/bus/u4b/storage/ustorage_fs.c b/sys/bus/u4b/storage/ustorage_fs.c index 1ad8690907..46168c5c74 100644 --- a/sys/bus/u4b/storage/ustorage_fs.c +++ b/sys/bus/u4b/storage/ustorage_fs.c @@ -65,7 +65,7 @@ static int ustorage_fs_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ustorage_fs, CTLFLAG_RW, 0, "USB ustorage_fs"); -SYSCTL_INT(_hw_usb_ustorage_fs, OID_AUTO, debug, CTLFLAG_RWTUN, +SYSCTL_INT(_hw_usb_ustorage_fs, OID_AUTO, debug, CTLFLAG_RW, &ustorage_fs_debug, 0, "ustorage_fs debug level"); #endif diff --git a/sys/bus/u4b/wlan/if_rum.c b/sys/bus/u4b/wlan/if_rum.c index 376c619c1a..d962c27ae9 100644 --- a/sys/bus/u4b/wlan/if_rum.c +++ b/sys/bus/u4b/wlan/if_rum.c @@ -75,7 +75,7 @@ static int rum_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, rum, CTLFLAG_RW, 0, "USB rum"); -SYSCTL_INT(_hw_usb_rum, OID_AUTO, debug, CTLFLAG_RWTUN, &rum_debug, 0, +SYSCTL_INT(_hw_usb_rum, OID_AUTO, debug, CTLFLAG_RW, &rum_debug, 0, "Debug level"); #endif diff --git a/sys/bus/u4b/wlan/if_run.c b/sys/bus/u4b/wlan/if_run.c index b0ba10136e..02edb51443 100644 --- a/sys/bus/u4b/wlan/if_run.c +++ b/sys/bus/u4b/wlan/if_run.c @@ -80,7 +80,7 @@ #ifdef RUN_DEBUG int run_debug = 0; static SYSCTL_NODE(_hw_usb, OID_AUTO, run, CTLFLAG_RW, 0, "USB run"); -SYSCTL_INT(_hw_usb_run, OID_AUTO, debug, CTLFLAG_RWTUN, &run_debug, 0, +SYSCTL_INT(_hw_usb_run, OID_AUTO, debug, CTLFLAG_RW, &run_debug, 0, "run debug level"); #endif diff --git a/sys/bus/u4b/wlan/if_urtwn.c b/sys/bus/u4b/wlan/if_urtwn.c index 3372eba56e..c7eeb07793 100644 --- a/sys/bus/u4b/wlan/if_urtwn.c +++ b/sys/bus/u4b/wlan/if_urtwn.c @@ -74,7 +74,7 @@ static int urtwn_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, urtwn, CTLFLAG_RW, 0, "USB urtwn"); -SYSCTL_INT(_hw_usb_urtwn, OID_AUTO, debug, CTLFLAG_RWTUN, &urtwn_debug, 0, +SYSCTL_INT(_hw_usb_urtwn, OID_AUTO, debug, CTLFLAG_RW, &urtwn_debug, 0, "Debug level"); #endif