Date: Mon, 18 May 2009 19:02:11 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 162273 for review Message-ID: <200905181902.n4IJ2BV3078984@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=162273 Change 162273 by hselasky@hselasky_laptop001 on 2009/05/18 19:02:00 USB global: - rename "usb2_mode" varible into "usb_mode". "usb2_xxx" variables are a leftover from script I ran in the past. - move all USB sysctls from "hw.usb2" into "hw.usb". Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#41 edit .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#16 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ng_ubt.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ubtbcmfw.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#7 edit .. //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#17 edit .. //depot/projects/usb/src/sys/dev/usb/usb_debug.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_debug.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#31 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#21 edit .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#15 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/usb_process.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#146 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#11 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#41 (text) ==== @@ -281,7 +281,7 @@ struct usb2_attach_arg *uaa = device_get_ivars(dev); struct usb2_interface_descriptor *id; - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if (uaa->use_generic == 0) { ==== //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#16 (text+ko) ==== @@ -136,7 +136,7 @@ struct drvdb_ent *db; struct usb2_attach_arg *uaa = device_get_ivars(self); - if (uaa->usb2_mode != USB_MODE_HOST) + if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); if (uaa->info.bConfigIndex != NDISUSB_CONFIG_NO) return (ENXIO); ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#40 (text+ko) ==== @@ -87,14 +87,14 @@ #if USB_DEBUG static int uaudio_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio"); -SYSCTL_INT(_hw_usb2_uaudio, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio"); +SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RW, &uaudio_debug, 0, "uaudio debug level"); -SYSCTL_INT(_hw_usb2_uaudio, OID_AUTO, default_rate, CTLFLAG_RW, +SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_rate, CTLFLAG_RW, &uaudio_default_rate, 0, "uaudio default sample rate"); -SYSCTL_INT(_hw_usb2_uaudio, OID_AUTO, default_bits, CTLFLAG_RW, +SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_bits, CTLFLAG_RW, &uaudio_default_bits, 0, "uaudio default sample bits"); -SYSCTL_INT(_hw_usb2_uaudio, OID_AUTO, default_channels, CTLFLAG_RW, +SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_channels, CTLFLAG_RW, &uaudio_default_channels, 0, "uaudio default sample channels"); #endif @@ -539,7 +539,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) + if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); if (uaa->use_generic == 0) ==== //depot/projects/usb/src/sys/dev/usb/bluetooth/ng_ubt.c#6 (text+ko) ==== @@ -399,7 +399,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) + if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); if (uaa->info.bIfaceIndex != 0) ==== //depot/projects/usb/src/sys/dev/usb/bluetooth/ubtbcmfw.c#6 (text+ko) ==== @@ -174,7 +174,7 @@ struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) + if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); if (uaa->info.bIfaceIndex != 0) ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#16 (text+ko) ==== @@ -73,8 +73,8 @@ #if USB_DEBUG static int at91dcidebug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, at91dci, CTLFLAG_RW, 0, "USB at91dci"); -SYSCTL_INT(_hw_usb2_at91dci, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, at91dci, CTLFLAG_RW, 0, "USB at91dci"); +SYSCTL_INT(_hw_usb_at91dci, OID_AUTO, debug, CTLFLAG_RW, &at91dcidebug, 0, "at91dci debug level"); #endif @@ -1193,7 +1193,7 @@ DPRINTFN(2, "xfer=%p, pipe=%p, error=%d\n", xfer, xfer->pipe, error); - if (xfer->flags_int.usb2_mode == USB_MODE_DEVICE) { + if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { ep_no = (xfer->endpoint & UE_ADDR); /* disable endpoint interrupt */ @@ -1337,7 +1337,7 @@ USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED); /* check mode */ - if (udev->flags.usb2_mode != USB_MODE_DEVICE) { + if (udev->flags.usb_mode != USB_MODE_DEVICE) { /* not supported */ return; } @@ -2264,12 +2264,12 @@ DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", pipe, udev->address, - edesc->bEndpointAddress, udev->flags.usb2_mode, + edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_rt_addr); if (udev->device_index != sc->sc_rt_addr) { - if (udev->flags.usb2_mode != USB_MODE_DEVICE) { + if (udev->flags.usb_mode != USB_MODE_DEVICE) { /* not supported */ return; } ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#26 (text+ko) ==== @@ -65,8 +65,8 @@ #if USB_DEBUG static int atmegadci_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI"); -SYSCTL_INT(_hw_usb2_atmegadci, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI"); +SYSCTL_INT(_hw_usb_atmegadci, OID_AUTO, debug, CTLFLAG_RW, &atmegadci_debug, 0, "ATMEGA DCI debug level"); #endif @@ -1076,7 +1076,7 @@ DPRINTFN(9, "xfer=%p, pipe=%p, error=%d\n", xfer, xfer->pipe, error); - if (xfer->flags_int.usb2_mode == USB_MODE_DEVICE) { + if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { ep_no = (xfer->endpoint & UE_ADDR); /* select endpoint number */ @@ -1187,7 +1187,7 @@ USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED); /* check mode */ - if (udev->flags.usb2_mode != USB_MODE_DEVICE) { + if (udev->flags.usb_mode != USB_MODE_DEVICE) { /* not supported */ return; } @@ -2094,12 +2094,12 @@ DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d,%d)\n", pipe, udev->address, - edesc->bEndpointAddress, udev->flags.usb2_mode, + edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_rt_addr, udev->device_index); if (udev->device_index != sc->sc_rt_addr) { - if (udev->flags.usb2_mode != USB_MODE_DEVICE) { + if (udev->flags.usb_mode != USB_MODE_DEVICE) { /* not supported */ return; } ==== //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#3 (text+ko) ==== @@ -65,8 +65,8 @@ #if USB_DEBUG static int avr32dci_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, avr32dci, CTLFLAG_RW, 0, "USB AVR32 DCI"); -SYSCTL_INT(_hw_usb2_avr32dci, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, avr32dci, CTLFLAG_RW, 0, "USB AVR32 DCI"); +SYSCTL_INT(_hw_usb_avr32dci, OID_AUTO, debug, CTLFLAG_RW, &avr32dci_debug, 0, "AVR32 DCI debug level"); #endif @@ -1047,7 +1047,7 @@ DPRINTFN(9, "xfer=%p, pipe=%p, error=%d\n", xfer, xfer->pipe, error); - if (xfer->flags_int.usb2_mode == USB_MODE_DEVICE) { + if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { ep_no = (xfer->endpoint & UE_ADDR); /* disable endpoint interrupt */ @@ -1157,7 +1157,7 @@ USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED); /* check mode */ - if (udev->flags.usb2_mode != USB_MODE_DEVICE) { + if (udev->flags.usb_mode != USB_MODE_DEVICE) { /* not supported */ return; } @@ -2031,12 +2031,12 @@ DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d,%d)\n", pipe, udev->address, - edesc->bEndpointAddress, udev->flags.usb2_mode, + edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_rt_addr, udev->device_index); if (udev->device_index != sc->sc_rt_addr) { - if (udev->flags.usb2_mode != USB_MODE_DEVICE) { + if (udev->flags.usb_mode != USB_MODE_DEVICE) { /* not supported */ return; } ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#21 (text+ko) ==== @@ -73,10 +73,10 @@ static int ehcidebug = 0; static int ehcinohighspeed = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci"); -SYSCTL_INT(_hw_usb2_ehci, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci"); +SYSCTL_INT(_hw_usb_ehci, OID_AUTO, debug, CTLFLAG_RW, &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"); static void ehci_dump_regs(ehci_softc_t *sc); @@ -3649,10 +3649,10 @@ DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", pipe, udev->address, - edesc->bEndpointAddress, udev->flags.usb2_mode, + edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_addr); - if (udev->flags.usb2_mode != USB_MODE_HOST) { + if (udev->flags.usb_mode != USB_MODE_HOST) { /* not supported */ return; } ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#14 (text+ko) ==== @@ -67,8 +67,8 @@ #if USB_DEBUG static int musbotgdebug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, musbotg, CTLFLAG_RW, 0, "USB musbotg"); -SYSCTL_INT(_hw_usb2_musbotg, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, musbotg, CTLFLAG_RW, 0, "USB musbotg"); +SYSCTL_INT(_hw_usb_musbotg, OID_AUTO, debug, CTLFLAG_RW, &musbotgdebug, 0, "Debug level"); #endif @@ -1441,7 +1441,7 @@ DPRINTFN(2, "xfer=%p, pipe=%p, error=%d\n", xfer, xfer->pipe, error); - if (xfer->flags_int.usb2_mode == USB_MODE_DEVICE) { + if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { musbotg_ep_int_set(xfer, 0); @@ -1645,7 +1645,7 @@ USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED); /* check mode */ - if (udev->flags.usb2_mode != USB_MODE_DEVICE) { + if (udev->flags.usb_mode != USB_MODE_DEVICE) { /* not supported */ return; } @@ -2673,12 +2673,12 @@ DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", pipe, udev->address, - edesc->bEndpointAddress, udev->flags.usb2_mode, + edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_rt_addr); if (udev->device_index != sc->sc_rt_addr) { - if (udev->flags.usb2_mode != USB_MODE_DEVICE) { + if (udev->flags.usb_mode != USB_MODE_DEVICE) { /* not supported */ return; } ==== //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#18 (text+ko) ==== @@ -61,8 +61,8 @@ #if USB_DEBUG static int ohcidebug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci"); -SYSCTL_INT(_hw_usb2_ohci, OID_AUTO, debug, 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"); static void ohci_dumpregs(ohci_softc_t *); static void ohci_dump_tds(ohci_td_t *); @@ -2570,10 +2570,10 @@ DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", pipe, udev->address, - edesc->bEndpointAddress, udev->flags.usb2_mode, + edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_addr); - if (udev->flags.usb2_mode != USB_MODE_HOST) { + if (udev->flags.usb_mode != USB_MODE_HOST) { /* not supported */ return; } ==== //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#16 (text+ko) ==== @@ -66,10 +66,10 @@ static int uhcidebug = 0; static int uhcinoloop = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, uhci, CTLFLAG_RW, 0, "USB uhci"); -SYSCTL_INT(_hw_usb2_uhci, OID_AUTO, debug, 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_usb2_uhci, OID_AUTO, loop, CTLFLAG_RW, +SYSCTL_INT(_hw_usb_uhci, OID_AUTO, loop, CTLFLAG_RW, &uhcinoloop, 0, "uhci noloop"); static void uhci_dumpregs(uhci_softc_t *sc); static void uhci_dump_tds(uhci_td_t *td); @@ -3050,10 +3050,10 @@ DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", pipe, udev->address, - edesc->bEndpointAddress, udev->flags.usb2_mode, + edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_addr); - if (udev->flags.usb2_mode != USB_MODE_HOST) { + if (udev->flags.usb_mode != USB_MODE_HOST) { /* not supported */ return; } ==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#15 (text+ko) ==== @@ -55,8 +55,8 @@ #if USB_DEBUG static int usb2_ctrl_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, ctrl, CTLFLAG_RW, 0, "USB controller"); -SYSCTL_INT(_hw_usb2_ctrl, OID_AUTO, debug, CTLFLAG_RW, &usb2_ctrl_debug, 0, +SYSCTL_NODE(_hw_usb, OID_AUTO, ctrl, CTLFLAG_RW, 0, "USB controller"); +SYSCTL_INT(_hw_usb_ctrl, OID_AUTO, debug, CTLFLAG_RW, &usb2_ctrl_debug, 0, "Debug level"); #endif ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#16 (text+ko) ==== @@ -62,8 +62,8 @@ #if USB_DEBUG static int uss820dcidebug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, uss820dci, CTLFLAG_RW, 0, "USB uss820dci"); -SYSCTL_INT(_hw_usb2_uss820dci, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, uss820dci, CTLFLAG_RW, 0, "USB uss820dci"); +SYSCTL_INT(_hw_usb_uss820dci, OID_AUTO, debug, CTLFLAG_RW, &uss820dcidebug, 0, "uss820dci debug level"); #endif @@ -1173,7 +1173,7 @@ DPRINTFN(2, "xfer=%p, pipe=%p, error=%d\n", xfer, xfer->pipe, error); - if (xfer->flags_int.usb2_mode == USB_MODE_DEVICE) { + if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { uss820dci_intr_set(xfer, 0); } /* dequeue transfer and start next transfer */ @@ -1279,7 +1279,7 @@ DPRINTFN(5, "pipe=%p\n", pipe); /* check mode */ - if (udev->flags.usb2_mode != USB_MODE_DEVICE) { + if (udev->flags.usb_mode != USB_MODE_DEVICE) { /* not supported */ return; } @@ -2298,12 +2298,12 @@ DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", pipe, udev->address, - edesc->bEndpointAddress, udev->flags.usb2_mode, + edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_rt_addr); if (udev->device_index != sc->sc_rt_addr) { - if (udev->flags.usb2_mode != USB_MODE_DEVICE) { + if (udev->flags.usb_mode != USB_MODE_DEVICE) { /* not supported */ return; } ==== //depot/projects/usb/src/sys/dev/usb/input/uhid.c#8 (text+ko) ==== @@ -76,8 +76,8 @@ #if USB_DEBUG static int uhid_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid"); -SYSCTL_INT(_hw_usb2_uhid, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, uhid, CTLFLAG_RW, 0, "USB uhid"); +SYSCTL_INT(_hw_usb_uhid, OID_AUTO, debug, CTLFLAG_RW, &uhid_debug, 0, "Debug level"); #endif @@ -599,7 +599,7 @@ DPRINTFN(11, "\n"); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if (uaa->use_generic == 0) { ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#10 (text+ko) ==== @@ -86,8 +86,8 @@ #if USB_DEBUG static int ukbd_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, ukbd, CTLFLAG_RW, 0, "USB ukbd"); -SYSCTL_INT(_hw_usb2_ukbd, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, ukbd, CTLFLAG_RW, 0, "USB ukbd"); +SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, debug, CTLFLAG_RW, &ukbd_debug, 0, "Debug level"); #endif @@ -665,7 +665,7 @@ if (sw == NULL) { return (ENXIO); } - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } /* check that the keyboard speaks the boot protocol: */ ==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#11 (text+ko) ==== @@ -72,8 +72,8 @@ #if USB_DEBUG static int ums_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums"); -SYSCTL_INT(_hw_usb2_ums, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, ums, CTLFLAG_RW, 0, "USB ums"); +SYSCTL_INT(_hw_usb_ums, OID_AUTO, debug, CTLFLAG_RW, &ums_debug, 0, "Debug level"); #endif @@ -339,7 +339,7 @@ DPRINTFN(11, "\n"); - if (uaa->usb2_mode != USB_MODE_HOST) + if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); id = usb2_get_interface_descriptor(uaa->iface); ==== //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#7 (text+ko) ==== @@ -83,8 +83,8 @@ #if USB_DEBUG static int udbp_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, udbp, CTLFLAG_RW, 0, "USB udbp"); -SYSCTL_INT(_hw_usb2_udbp, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, udbp, CTLFLAG_RW, 0, "USB udbp"); +SYSCTL_INT(_hw_usb_udbp, OID_AUTO, debug, CTLFLAG_RW, &udbp_debug, 0, "udbp debug level"); #endif @@ -279,7 +279,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } /* ==== //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#4 (text+ko) ==== @@ -112,7 +112,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if ((uaa->info.idVendor == USB_VENDOR_CYPRESS) && ==== //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#7 (text+ko) ==== @@ -89,8 +89,8 @@ #if USB_DEBUG static int aue_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue"); -SYSCTL_INT(_hw_usb2_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0, +SYSCTL_NODE(_hw_usb, OID_AUTO, aue, CTLFLAG_RW, 0, "USB aue"); +SYSCTL_INT(_hw_usb_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0, "Debug level"); #endif @@ -628,7 +628,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) + if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); if (uaa->info.bConfigIndex != AUE_CONFIG_INDEX) return (ENXIO); ==== //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#8 (text+ko) ==== @@ -112,8 +112,8 @@ #if USB_DEBUG static int axe_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, axe, CTLFLAG_RW, 0, "USB axe"); -SYSCTL_INT(_hw_usb2_axe, OID_AUTO, debug, CTLFLAG_RW, &axe_debug, 0, +SYSCTL_NODE(_hw_usb, OID_AUTO, axe, CTLFLAG_RW, 0, "USB axe"); +SYSCTL_INT(_hw_usb_axe, OID_AUTO, debug, CTLFLAG_RW, &axe_debug, 0, "Debug level"); #endif @@ -662,7 +662,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) + if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); if (uaa->info.bConfigIndex != AXE_CONFIG_IDX) return (ENXIO); ==== //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#10 (text+ko) ==== @@ -88,8 +88,8 @@ #if USB_DEBUG static int cdce_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, cdce, CTLFLAG_RW, 0, "USB CDC-Ethernet"); -SYSCTL_INT(_hw_usb2_cdce, OID_AUTO, debug, CTLFLAG_RW, &cdce_debug, 0, +SYSCTL_NODE(_hw_usb, OID_AUTO, cdce, CTLFLAG_RW, 0, "USB CDC-Ethernet"); +SYSCTL_INT(_hw_usb_cdce, OID_AUTO, debug, CTLFLAG_RW, &cdce_debug, 0, "Debug level"); #endif @@ -361,7 +361,7 @@ sc->sc_ue.ue_eaddr[i / 2] |= c; } - if (uaa->usb2_mode == USB_MODE_DEVICE) { + if (uaa->usb_mode == USB_MODE_DEVICE) { /* * Do not use the same MAC address like the peer ! */ ==== //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#7 (text+ko) ==== @@ -109,8 +109,8 @@ #if USB_DEBUG static int cue_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, cue, CTLFLAG_RW, 0, "USB cue"); -SYSCTL_INT(_hw_usb2_cue, OID_AUTO, debug, CTLFLAG_RW, &cue_debug, 0, +SYSCTL_NODE(_hw_usb, OID_AUTO, cue, CTLFLAG_RW, 0, "USB cue"); +SYSCTL_INT(_hw_usb_cue, OID_AUTO, debug, CTLFLAG_RW, &cue_debug, 0, "Debug level"); #endif @@ -360,7 +360,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) + if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); if (uaa->info.bConfigIndex != CUE_CONFIG_IDX) return (ENXIO); ==== //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#7 (text+ko) ==== @@ -151,8 +151,8 @@ #if USB_DEBUG static int kue_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, kue, CTLFLAG_RW, 0, "USB kue"); -SYSCTL_INT(_hw_usb2_kue, OID_AUTO, debug, CTLFLAG_RW, &kue_debug, 0, +SYSCTL_NODE(_hw_usb, OID_AUTO, kue, CTLFLAG_RW, 0, "USB kue"); +SYSCTL_INT(_hw_usb_kue, OID_AUTO, debug, CTLFLAG_RW, &kue_debug, 0, "Debug level"); #endif @@ -436,7 +436,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) + if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); if (uaa->info.bConfigIndex != KUE_CONFIG_IDX) return (ENXIO); ==== //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#7 (text+ko) ==== @@ -86,8 +86,8 @@ #if USB_DEBUG static int rue_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, rue, CTLFLAG_RW, 0, "USB rue"); -SYSCTL_INT(_hw_usb2_rue, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, rue, CTLFLAG_RW, 0, "USB rue"); +SYSCTL_INT(_hw_usb_rue, OID_AUTO, debug, CTLFLAG_RW, &rue_debug, 0, "Debug level"); #endif @@ -546,7 +546,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) + if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); if (uaa->info.bConfigIndex != RUE_CONFIG_IDX) return (ENXIO); ==== //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#7 (text+ko) ==== @@ -174,8 +174,8 @@ #if USB_DEBUG static int udav_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, udav, CTLFLAG_RW, 0, "USB udav"); -SYSCTL_INT(_hw_usb2_udav, OID_AUTO, debug, CTLFLAG_RW, &udav_debug, 0, +SYSCTL_NODE(_hw_usb, OID_AUTO, udav, CTLFLAG_RW, 0, "USB udav"); +SYSCTL_INT(_hw_usb_udav, OID_AUTO, debug, CTLFLAG_RW, &udav_debug, 0, "Debug level"); #endif @@ -211,7 +211,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) + if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); if (uaa->info.bConfigIndex != UDAV_CONFIG_INDEX) return (ENXIO); ==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#11 (text+ko) ==== @@ -53,8 +53,8 @@ #if USB_DEBUG static int u3g_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, u3g, CTLFLAG_RW, 0, "USB 3g"); -SYSCTL_INT(_hw_usb2_u3g, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, u3g, CTLFLAG_RW, 0, "USB 3g"); +SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug, CTLFLAG_RW, &u3g_debug, 0, "Debug level"); #endif @@ -421,7 +421,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(self); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if (uaa->info.bConfigIndex != U3G_CONFIG_INDEX) { ==== //depot/projects/usb/src/sys/dev/usb/serial/uark.c#5 (text+ko) ==== @@ -161,7 +161,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if (uaa->info.bConfigIndex != 0) { ==== //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#5 (text+ko) ==== @@ -83,8 +83,8 @@ #if USB_DEBUG static int ubsa_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, ubsa, CTLFLAG_RW, 0, "USB ubsa"); -SYSCTL_INT(_hw_usb2_ubsa, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, ubsa, CTLFLAG_RW, 0, "USB ubsa"); +SYSCTL_INT(_hw_usb_ubsa, OID_AUTO, debug, CTLFLAG_RW, &ubsa_debug, 0, "ubsa debug level"); #endif @@ -268,7 +268,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if (uaa->info.bConfigIndex != UBSA_CONFIG_INDEX) { ==== //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#8 (text+ko) ==== @@ -104,8 +104,8 @@ #if USB_DEBUG static int ubser_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, ubser, CTLFLAG_RW, 0, "USB ubser"); -SYSCTL_INT(_hw_usb2_ubser, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, ubser, CTLFLAG_RW, 0, "USB ubser"); +SYSCTL_INT(_hw_usb_ubser, OID_AUTO, debug, CTLFLAG_RW, &ubser_debug, 0, "ubser debug level"); #endif @@ -205,7 +205,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } /* check if this is a BWCT vendor specific ubser interface */ ==== //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#5 (text+ko) ==== @@ -91,8 +91,8 @@ #if USB_DEBUG static int uchcom_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, uchcom, CTLFLAG_RW, 0, "USB uchcom"); -SYSCTL_INT(_hw_usb2_uchcom, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, uchcom, CTLFLAG_RW, 0, "USB uchcom"); +SYSCTL_INT(_hw_usb_uchcom, OID_AUTO, debug, CTLFLAG_RW, &uchcom_debug, 0, "uchcom debug level"); #endif @@ -281,7 +281,7 @@ DPRINTFN(11, "\n"); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if (uaa->info.bConfigIndex != UCHCOM_CONFIG_INDEX) { ==== //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#8 (text+ko) ==== @@ -179,7 +179,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if (uaa->info.bConfigIndex != 0) { ==== //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#7 (text+ko) ==== @@ -322,7 +322,7 @@ struct usb2_config_descriptor *cd; usb2_mcpc_acm_descriptor *mad; - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } id = usb2_get_interface_descriptor(uaa->iface); ==== //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#6 (text+ko) ==== @@ -70,8 +70,8 @@ #if USB_DEBUG static int uftdi_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, uftdi, CTLFLAG_RW, 0, "USB uftdi"); -SYSCTL_INT(_hw_usb2_uftdi, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, uftdi, CTLFLAG_RW, 0, "USB uftdi"); +SYSCTL_INT(_hw_usb_uftdi, OID_AUTO, debug, CTLFLAG_RW, &uftdi_debug, 0, "Debug level"); #endif @@ -240,7 +240,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if (uaa->info.bConfigIndex != UFTDI_CONFIG_INDEX) { ==== //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#7 (text+ko) ==== @@ -161,7 +161,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if (uaa->info.bConfigIndex != UGENSA_CONFIG_INDEX) { ==== //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#6 (text+ko) ==== @@ -1080,7 +1080,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if (uaa->info.bConfigIndex != UIPAQ_CONFIG_INDEX) { ==== //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#9 (text+ko) ==== @@ -68,8 +68,8 @@ #if USB_DEBUG static int ulpt_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, ulpt, CTLFLAG_RW, 0, "USB ulpt"); -SYSCTL_INT(_hw_usb2_ulpt, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, ulpt, CTLFLAG_RW, 0, "USB ulpt"); +SYSCTL_INT(_hw_usb_ulpt, OID_AUTO, debug, CTLFLAG_RW, &ulpt_debug, 0, "Debug level"); #endif @@ -471,7 +471,7 @@ DPRINTFN(11, "\n"); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if ((uaa->info.bInterfaceClass == UICLASS_PRINTER) && ==== //depot/projects/usb/src/sys/dev/usb/serial/umct.c#7 (text+ko) ==== @@ -208,7 +208,7 @@ { struct usb2_attach_arg *uaa = device_get_ivars(dev); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } if (uaa->info.bConfigIndex != UMCT_CONFIG_INDEX) { ==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#10 (text+ko) ==== @@ -103,8 +103,8 @@ #if USB_DEBUG static int umodem_debug = 0; -SYSCTL_NODE(_hw_usb2, OID_AUTO, umodem, CTLFLAG_RW, 0, "USB umodem"); -SYSCTL_INT(_hw_usb2_umodem, OID_AUTO, debug, CTLFLAG_RW, +SYSCTL_NODE(_hw_usb, OID_AUTO, umodem, CTLFLAG_RW, 0, "USB umodem"); +SYSCTL_INT(_hw_usb_umodem, OID_AUTO, debug, CTLFLAG_RW, &umodem_debug, 0, "Debug level"); #endif @@ -257,7 +257,7 @@ DPRINTFN(11, "\n"); - if (uaa->usb2_mode != USB_MODE_HOST) { + if (uaa->usb_mode != USB_MODE_HOST) { return (ENXIO); } error = usb2_lookup_id_by_uaa(umodem_devs, sizeof(umodem_devs), uaa); ==== //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#5 (text+ko) ==== @@ -38,8 +38,8 @@ #if USB_DEBUG >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905181902.n4IJ2BV3078984>