diff options
| -rw-r--r-- | sys/dev/usb/README.TXT (renamed from sys/dev/usb2/core/README.TXT) | 6 | ||||
| -rw-r--r-- | sys/dev/usb/bluetooth/TODO.TXT (renamed from sys/dev/usb2/bluetooth/TODO.TXT) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/bluetooth/ng_ubt.c (renamed from sys/dev/usb2/bluetooth/ng_ubt2.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/bluetooth/ng_ubt_var.h (renamed from sys/dev/usb2/bluetooth/ng_ubt2_var.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/bluetooth/ubtbcmfw.c (renamed from sys/dev/usb2/bluetooth/ubtbcmfw2.c) | 27 | ||||
| -rw-r--r-- | sys/dev/usb/controller/at91dci.c (renamed from sys/dev/usb2/controller/at91dci.c) | 34 | ||||
| -rw-r--r-- | sys/dev/usb/controller/at91dci.h (renamed from sys/dev/usb2/controller/at91dci.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/controller/at91dci_atmelarm.c (renamed from sys/dev/usb2/controller/at91dci_atmelarm.c) | 26 | ||||
| -rw-r--r-- | sys/dev/usb/controller/atmegadci.c (renamed from sys/dev/usb2/controller/atmegadci.c) | 34 | ||||
| -rw-r--r-- | sys/dev/usb/controller/atmegadci.h (renamed from sys/dev/usb2/controller/atmegadci.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/controller/atmegadci_atmelarm.c (renamed from sys/dev/usb2/controller/atmegadci_atmelarm.c) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci.c (renamed from sys/dev/usb2/controller/ehci2.c) | 34 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci.h (renamed from sys/dev/usb2/controller/ehci2.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_ixp4xx.c (renamed from sys/dev/usb2/controller/ehci2_ixp4xx.c) | 25 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_mbus.c (renamed from sys/dev/usb2/controller/ehci2_mbus.c) | 25 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_pci.c (renamed from sys/dev/usb2/controller/ehci2_pci.c) | 27 | ||||
| -rw-r--r-- | sys/dev/usb/controller/musb_otg.c (renamed from sys/dev/usb2/controller/musb2_otg.c) | 34 | ||||
| -rw-r--r-- | sys/dev/usb/controller/musb_otg.h (renamed from sys/dev/usb2/controller/musb2_otg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/controller/musb_otg_atmelarm.c (renamed from sys/dev/usb2/controller/musb2_otg_atmelarm.c) | 25 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ohci.c (renamed from sys/dev/usb2/controller/ohci2.c) | 34 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ohci.h (renamed from sys/dev/usb2/controller/ohci2.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ohci_atmelarm.c (renamed from sys/dev/usb2/controller/ohci2_atmelarm.c) | 25 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ohci_pci.c (renamed from sys/dev/usb2/controller/ohci2_pci.c) | 33 | ||||
| -rw-r--r-- | sys/dev/usb/controller/uhci.c (renamed from sys/dev/usb2/controller/uhci2.c) | 34 | ||||
| -rw-r--r-- | sys/dev/usb/controller/uhci.h (renamed from sys/dev/usb2/controller/uhci2.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/controller/uhci_pci.c (renamed from sys/dev/usb2/controller/uhci2_pci.c) | 33 | ||||
| -rw-r--r-- | sys/dev/usb/controller/usb_controller.c (renamed from sys/dev/usb2/controller/usb2_controller.c) | 29 | ||||
| -rw-r--r-- | sys/dev/usb/controller/uss820dci.c (renamed from sys/dev/usb2/controller/uss820dci.c) | 36 | ||||
| -rw-r--r-- | sys/dev/usb/controller/uss820dci.h (renamed from sys/dev/usb2/controller/uss820dci.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/controller/uss820dci_atmelarm.c (renamed from sys/dev/usb2/controller/uss820dci_atmelarm.c) | 25 | ||||
| -rw-r--r-- | sys/dev/usb/image/uscanner.c (renamed from sys/dev/usb2/image/uscanner2.c) | 27 | ||||
| -rw-r--r-- | sys/dev/usb/input/uhid.c (renamed from sys/dev/usb2/input/uhid2.c) | 40 | ||||
| -rw-r--r-- | sys/dev/usb/input/ukbd.c (renamed from sys/dev/usb2/input/ukbd2.c) | 33 | ||||
| -rw-r--r-- | sys/dev/usb/input/ums.c (renamed from sys/dev/usb2/input/ums2.c) | 37 | ||||
| -rw-r--r-- | sys/dev/usb/input/usb_rdesc.h (renamed from sys/dev/usb2/input/usb2_rdesc.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/misc/udbp.c (renamed from sys/dev/usb2/misc/udbp2.c) | 23 | ||||
| -rw-r--r-- | sys/dev/usb/misc/udbp.h (renamed from sys/dev/usb2/misc/udbp2.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/misc/ufm.c (renamed from sys/dev/usb2/misc/ufm2.c) | 29 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_aue.c (renamed from sys/dev/usb2/ethernet/if_aue2.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_auereg.h (renamed from sys/dev/usb2/ethernet/if_auereg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_axe.c (renamed from sys/dev/usb2/ethernet/if_axe2.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_axereg.h (renamed from sys/dev/usb2/ethernet/if_axereg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_cdce.c (renamed from sys/dev/usb2/ethernet/if_cdce2.c) | 40 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_cdcereg.h (renamed from sys/dev/usb2/ethernet/if_cdcereg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_cue.c (renamed from sys/dev/usb2/ethernet/if_cue2.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_cuereg.h (renamed from sys/dev/usb2/ethernet/if_cuereg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_kue.c (renamed from sys/dev/usb2/ethernet/if_kue2.c) | 30 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_kuefw.h (renamed from sys/dev/usb2/ethernet/if_kuefw.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_kuereg.h (renamed from sys/dev/usb2/ethernet/if_kuereg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_rue.c (renamed from sys/dev/usb2/ethernet/if_rue2.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_ruereg.h (renamed from sys/dev/usb2/ethernet/if_ruereg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_udav.c (renamed from sys/dev/usb2/ethernet/if_udav2.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/net/if_udavreg.h (renamed from sys/dev/usb2/ethernet/if_udavreg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/net/usb_ethernet.c (renamed from sys/dev/usb2/ethernet/usb2_ethernet.c) | 30 | ||||
| -rw-r--r-- | sys/dev/usb/net/usb_ethernet.h (renamed from sys/dev/usb2/ethernet/usb2_ethernet.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/quirk/usb_quirk.c (renamed from sys/dev/usb2/quirk/usb2_quirk.c) | 20 | ||||
| -rw-r--r-- | sys/dev/usb/quirk/usb_quirk.h (renamed from sys/dev/usb2/quirk/usb2_quirk.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/serial/u3g.c (renamed from sys/dev/usb2/serial/u3g2.c) | 34 | ||||
| -rw-r--r-- | sys/dev/usb/serial/uark.c (renamed from sys/dev/usb2/serial/uark2.c) | 26 | ||||
| -rw-r--r-- | sys/dev/usb/serial/ubsa.c (renamed from sys/dev/usb2/serial/ubsa2.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/serial/ubser.c (renamed from sys/dev/usb2/serial/ubser2.c) | 32 | ||||
| -rw-r--r-- | sys/dev/usb/serial/uchcom.c (renamed from sys/dev/usb2/serial/uchcom2.c) | 30 | ||||
| -rw-r--r-- | sys/dev/usb/serial/ucycom.c (renamed from sys/dev/usb2/serial/ucycom2.c) | 34 | ||||
| -rw-r--r-- | sys/dev/usb/serial/ufoma.c (renamed from sys/dev/usb2/serial/ufoma2.c) | 30 | ||||
| -rw-r--r-- | sys/dev/usb/serial/uftdi.c (renamed from sys/dev/usb2/serial/uftdi2.c) | 30 | ||||
| -rw-r--r-- | sys/dev/usb/serial/uftdi_reg.h (renamed from sys/dev/usb2/serial/uftdi2_reg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/serial/ugensa.c (renamed from sys/dev/usb2/serial/ugensa2.c) | 30 | ||||
| -rw-r--r-- | sys/dev/usb/serial/uipaq.c (renamed from sys/dev/usb2/serial/uipaq2.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/serial/ulpt.c (renamed from sys/dev/usb2/serial/ulpt2.c) | 30 | ||||
| -rw-r--r-- | sys/dev/usb/serial/umct.c (renamed from sys/dev/usb2/serial/umct2.c) | 32 | ||||
| -rw-r--r-- | sys/dev/usb/serial/umodem.c (renamed from sys/dev/usb2/serial/umodem2.c) | 34 | ||||
| -rw-r--r-- | sys/dev/usb/serial/umoscom.c (renamed from sys/dev/usb2/serial/umoscom2.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/serial/uplcom.c (renamed from sys/dev/usb2/serial/uplcom2.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/serial/usb_serial.c (renamed from sys/dev/usb2/serial/usb2_serial.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/serial/usb_serial.h (renamed from sys/dev/usb2/serial/usb2_serial.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/serial/uslcom.c (renamed from sys/dev/usb2/serial/uslcom2.c) | 26 | ||||
| -rw-r--r-- | sys/dev/usb/serial/uvisor.c (renamed from sys/dev/usb2/serial/uvisor2.c) | 30 | ||||
| -rw-r--r-- | sys/dev/usb/serial/uvscom.c (renamed from sys/dev/usb2/serial/uvscom2.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/sound/uaudio.c (renamed from sys/dev/usb2/sound/uaudio2.c) | 37 | ||||
| -rw-r--r-- | sys/dev/usb/sound/uaudio.h (renamed from sys/dev/usb2/sound/uaudio2.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/sound/uaudio_pcm.c (renamed from sys/dev/usb2/sound/uaudio2_pcm.c) | 2 | ||||
| -rw-r--r-- | sys/dev/usb/sound/uaudio_reg.h (renamed from sys/dev/usb2/sound/uaudio2_reg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/storage/ata-usb.c (renamed from sys/dev/usb2/storage/ata-usb2.c) | 25 | ||||
| -rw-r--r-- | sys/dev/usb/storage/rio500_usb.h (renamed from sys/dev/usb2/include/urio2_ioctl.h) | 33 | ||||
| -rw-r--r-- | sys/dev/usb/storage/umass.c (renamed from sys/dev/usb2/storage/umass2.c) | 25 | ||||
| -rw-r--r-- | sys/dev/usb/storage/urio.c (renamed from sys/dev/usb2/storage/urio2.c) | 33 | ||||
| -rw-r--r-- | sys/dev/usb/storage/ustorage_fs.c (renamed from sys/dev/usb2/storage/ustorage2_fs.c) | 27 | ||||
| -rw-r--r-- | sys/dev/usb/template/usb_template.c (renamed from sys/dev/usb2/template/usb2_template.c) | 34 | ||||
| -rw-r--r-- | sys/dev/usb/template/usb_template.h (renamed from sys/dev/usb2/template/usb2_template.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/template/usb_template_cdce.c (renamed from sys/dev/usb2/template/usb2_template_cdce.c) | 10 | ||||
| -rw-r--r-- | sys/dev/usb/template/usb_template_msc.c (renamed from sys/dev/usb2/template/usb2_template_msc.c) | 8 | ||||
| -rw-r--r-- | sys/dev/usb/template/usb_template_mtp.c (renamed from sys/dev/usb2/template/usb2_template_mtp.c) | 8 | ||||
| -rw-r--r-- | sys/dev/usb/ufm_ioctl.h (renamed from sys/dev/usb2/include/ufm2_ioctl.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb.h (renamed from sys/dev/usb2/include/usb2_standard.h) | 2 | ||||
| -rw-r--r-- | sys/dev/usb/usb_bus.h (renamed from sys/dev/usb2/controller/usb2_bus.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_busdma.c (renamed from sys/dev/usb2/core/usb2_busdma.c) | 26 | ||||
| -rw-r--r-- | sys/dev/usb/usb_busdma.h (renamed from sys/dev/usb2/core/usb2_busdma.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_cdc.h (renamed from sys/dev/usb2/include/usb2_cdc.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_compat_linux.c (renamed from sys/dev/usb2/core/usb2_compat_linux.c) | 32 | ||||
| -rw-r--r-- | sys/dev/usb/usb_compat_linux.h (renamed from sys/dev/usb2/core/usb2_compat_linux.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_controller.h (renamed from sys/dev/usb2/controller/usb2_controller.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_core.c (renamed from sys/dev/usb2/core/usb2_core.c) | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usb_core.h (renamed from sys/dev/usb2/core/usb2_core.h) | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usb_debug.c (renamed from sys/dev/usb2/core/usb2_debug.c) | 16 | ||||
| -rw-r--r-- | sys/dev/usb/usb_debug.h (renamed from sys/dev/usb2/core/usb2_debug.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_defs.h (renamed from sys/dev/usb2/include/usb2_defs.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_dev.c (renamed from sys/dev/usb2/core/usb2_dev.c) | 36 | ||||
| -rw-r--r-- | sys/dev/usb/usb_dev.h (renamed from sys/dev/usb2/core/usb2_dev.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_device.c (renamed from sys/dev/usb2/core/usb2_device.c) | 50 | ||||
| -rw-r--r-- | sys/dev/usb/usb_device.h (renamed from sys/dev/usb2/core/usb2_device.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_dynamic.c (renamed from sys/dev/usb2/core/usb2_dynamic.c) | 18 | ||||
| -rw-r--r-- | sys/dev/usb/usb_dynamic.h (renamed from sys/dev/usb2/core/usb2_dynamic.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_endian.h (renamed from sys/dev/usb2/include/usb2_endian.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_error.c (renamed from sys/dev/usb2/core/usb2_error.c) | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usb_error.h (renamed from sys/dev/usb2/include/usb2_error.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_generic.c (renamed from sys/dev/usb2/core/usb2_generic.c) | 40 | ||||
| -rw-r--r-- | sys/dev/usb/usb_generic.h (renamed from sys/dev/usb2/core/usb2_generic.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_handle_request.c (renamed from sys/dev/usb2/core/usb2_handle_request.c) | 32 | ||||
| -rw-r--r-- | sys/dev/usb/usb_handle_request.h (renamed from sys/dev/usb2/core/usb2_handle_request.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_hid.c (renamed from sys/dev/usb2/core/usb2_hid.c) | 24 | ||||
| -rw-r--r-- | sys/dev/usb/usb_hid.h (renamed from sys/dev/usb2/core/usb2_hid.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_hub.c (renamed from sys/dev/usb2/core/usb2_hub.c) | 36 | ||||
| -rw-r--r-- | sys/dev/usb/usb_hub.h (renamed from sys/dev/usb2/core/usb2_hub.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_if.m (renamed from sys/dev/usb2/core/usb2_if.m) | 2 | ||||
| -rw-r--r-- | sys/dev/usb/usb_ioctl.h (renamed from sys/dev/usb2/include/usb2_ioctl.h) | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usb_lookup.c (renamed from sys/dev/usb2/core/usb2_lookup.c) | 4 | ||||
| -rw-r--r-- | sys/dev/usb/usb_lookup.h (renamed from sys/dev/usb2/core/usb2_lookup.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_mbuf.c (renamed from sys/dev/usb2/core/usb2_mbuf.c) | 4 | ||||
| -rw-r--r-- | sys/dev/usb/usb_mbuf.h (renamed from sys/dev/usb2/core/usb2_mbuf.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_mfunc.h (renamed from sys/dev/usb2/include/usb2_mfunc.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_msctest.c (renamed from sys/dev/usb2/core/usb2_msctest.c) | 38 | ||||
| -rw-r--r-- | sys/dev/usb/usb_msctest.h (renamed from sys/dev/usb2/core/usb2_msctest.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_parse.c (renamed from sys/dev/usb2/core/usb2_parse.c) | 8 | ||||
| -rw-r--r-- | sys/dev/usb/usb_parse.h (renamed from sys/dev/usb2/core/usb2_parse.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_pci.h (renamed from sys/dev/usb2/controller/usb2_pci.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_process.c (renamed from sys/dev/usb2/core/usb2_process.c) | 8 | ||||
| -rw-r--r-- | sys/dev/usb/usb_process.h (renamed from sys/dev/usb2/core/usb2_process.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_request.c (renamed from sys/dev/usb2/core/usb2_request.c) | 36 | ||||
| -rw-r--r-- | sys/dev/usb/usb_request.h (renamed from sys/dev/usb2/core/usb2_request.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_revision.h (renamed from sys/dev/usb2/include/usb2_revision.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_sw_transfer.c (renamed from sys/dev/usb2/core/usb2_sw_transfer.c) | 26 | ||||
| -rw-r--r-- | sys/dev/usb/usb_sw_transfer.h (renamed from sys/dev/usb2/core/usb2_sw_transfer.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_transfer.c (renamed from sys/dev/usb2/core/usb2_transfer.c) | 26 | ||||
| -rw-r--r-- | sys/dev/usb/usb_transfer.h (renamed from sys/dev/usb2/core/usb2_transfer.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usb_util.c (renamed from sys/dev/usb2/core/usb2_util.c) | 28 | ||||
| -rw-r--r-- | sys/dev/usb/usb_util.h (renamed from sys/dev/usb2/core/usb2_util.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs (renamed from sys/dev/usb2/core/usbdevs) | 81 | ||||
| -rw-r--r-- | sys/dev/usb/usbhid.h (renamed from sys/dev/usb2/include/usb2_hid.h) | 2 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_rum.c (renamed from sys/dev/usb2/wlan/if_rum2.c) | 31 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_rumfw.h (renamed from sys/dev/usb2/wlan/if_rumfw.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_rumreg.h (renamed from sys/dev/usb2/wlan/if_rumreg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_rumvar.h (renamed from sys/dev/usb2/wlan/if_rumvar.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_ural.c (renamed from sys/dev/usb2/wlan/if_ural2.c) | 29 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_uralreg.h (renamed from sys/dev/usb2/wlan/if_uralreg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_uralvar.h (renamed from sys/dev/usb2/wlan/if_uralvar.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_zyd.c (renamed from sys/dev/usb2/wlan/if_zyd2.c) | 33 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_zydfw.h (renamed from sys/dev/usb2/wlan/if_zydfw.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/if_zydreg.h (renamed from sys/dev/usb2/wlan/if_zydreg.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb/wlan/usb_wlan.h (renamed from sys/dev/usb2/wlan/usb2_wlan.h) | 0 | ||||
| -rw-r--r-- | sys/dev/usb2/bluetooth/usb2_bluetooth.c | 31 | ||||
| -rw-r--r-- | sys/dev/usb2/bluetooth/usb2_bluetooth.h | 30 | ||||
| -rw-r--r-- | sys/dev/usb2/controller/uss820dci_pccard.c | 266 | ||||
| -rw-r--r-- | sys/dev/usb2/image/usb2_image.c | 31 | ||||
| -rw-r--r-- | sys/dev/usb2/image/usb2_image.h | 30 | ||||
| -rw-r--r-- | sys/dev/usb2/input/usb2_input.c | 31 | ||||
| -rw-r--r-- | sys/dev/usb2/input/usb2_input.h | 30 | ||||
| -rw-r--r-- | sys/dev/usb2/misc/usb2_misc.c | 31 | ||||
| -rw-r--r-- | sys/dev/usb2/misc/usb2_misc.h | 30 | ||||
| -rw-r--r-- | sys/dev/usb2/ndis/if_ndis_usb2.c | 144 | ||||
| -rw-r--r-- | sys/dev/usb2/ndis/usb2_ndis.c | 31 | ||||
| -rw-r--r-- | sys/dev/usb2/ndis/usb2_ndis.h | 30 | ||||
| -rw-r--r-- | sys/dev/usb2/sound/usb2_sound.c | 31 | ||||
| -rw-r--r-- | sys/dev/usb2/sound/usb2_sound.h | 30 | ||||
| -rw-r--r-- | sys/dev/usb2/storage/usb2_storage.c | 31 | ||||
| -rw-r--r-- | sys/dev/usb2/storage/usb2_storage.h | 30 | ||||
| -rw-r--r-- | sys/dev/usb2/wlan/usb2_wlan.c | 31 |
176 files changed, 1271 insertions, 2120 deletions
diff --git a/sys/dev/usb2/core/README.TXT b/sys/dev/usb/README.TXT index 7367230..d24770c 100644 --- a/sys/dev/usb2/core/README.TXT +++ b/sys/dev/usb/README.TXT @@ -47,7 +47,7 @@ functions to setup INTERRUPT- and ISOCHRONOUS- transfers. | to the USB transfer structure pointer. | +--------------------------------------------------------------+ -Reference: /sys/dev/usb2/core/usb2_transfer.c +Reference: /sys/dev/usb/usb_transfer.c /* * A simple USB callback state-machine: @@ -177,8 +177,8 @@ detached when the thread returns from sleep. USB device driver examples: -/sys/dev/usb2/ethernet/if_axe.c -/sys/dev/usb2/ethernet/if_aue.c +/sys/dev/usb/net/if_axe.c +/sys/dev/usb/net/if_aue.c QUICK REFERENCE =============== diff --git a/sys/dev/usb2/bluetooth/TODO.TXT b/sys/dev/usb/bluetooth/TODO.TXT index b0d6695..b0d6695 100644 --- a/sys/dev/usb2/bluetooth/TODO.TXT +++ b/sys/dev/usb/bluetooth/TODO.TXT diff --git a/sys/dev/usb2/bluetooth/ng_ubt2.c b/sys/dev/usb/bluetooth/ng_ubt.c index 3b1ba31..07ac2194 100644 --- a/sys/dev/usb2/bluetooth/ng_ubt2.c +++ b/sys/dev/usb/bluetooth/ng_ubt.c @@ -93,20 +93,20 @@ */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_parse.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_transfer.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_parse.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> #include <sys/mbuf.h> #include <sys/taskqueue.h> @@ -118,8 +118,7 @@ #include <netgraph/bluetooth/include/ng_hci.h> #include <netgraph/bluetooth/include/ng_ubt.h> -#include <dev/usb2/bluetooth/usb2_bluetooth.h> -#include <dev/usb2/bluetooth/ng_ubt2_var.h> +#include <dev/usb/bluetooth/ng_ubt_var.h> static int ubt_modevent(module_t, int, void *); static device_probe_t ubt_probe; @@ -1715,6 +1714,5 @@ DRIVER_MODULE(ng_ubt, ushub, ubt_driver, ubt_devclass, ubt_modevent, 0); MODULE_VERSION(ng_ubt, NG_BLUETOOTH_VERSION); MODULE_DEPEND(ng_ubt, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); MODULE_DEPEND(ng_ubt, ng_hci, NG_BLUETOOTH_VERSION, NG_BLUETOOTH_VERSION, NG_BLUETOOTH_VERSION); -MODULE_DEPEND(ng_ubt, usb2_bluetooth, 1, 1, 1); -MODULE_DEPEND(ng_ubt, usb2_core, 1, 1, 1); +MODULE_DEPEND(ng_ubt, usb, 1, 1, 1); diff --git a/sys/dev/usb2/bluetooth/ng_ubt2_var.h b/sys/dev/usb/bluetooth/ng_ubt_var.h index 721e2f1..721e2f1 100644 --- a/sys/dev/usb2/bluetooth/ng_ubt2_var.h +++ b/sys/dev/usb/bluetooth/ng_ubt_var.h diff --git a/sys/dev/usb2/bluetooth/ubtbcmfw2.c b/sys/dev/usb/bluetooth/ubtbcmfw.c index 91735ed..3685f56 100644 --- a/sys/dev/usb2/bluetooth/ubtbcmfw2.c +++ b/sys/dev/usb/bluetooth/ubtbcmfw.c @@ -32,21 +32,21 @@ */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_ioctl.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_ioctl.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_parse.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_mbuf.h> -#include <dev/usb2/core/usb2_dev.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_parse.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_dev.h> /* * Download firmware to BCM2033. @@ -158,8 +158,7 @@ static driver_t ubtbcmfw_driver = }; DRIVER_MODULE(ubtbcmfw, ushub, ubtbcmfw_driver, ubtbcmfw_devclass, NULL, 0); -MODULE_DEPEND(ubtbcmfw, usb2_bluetooth, 1, 1, 1); -MODULE_DEPEND(ubtbcmfw, usb2_core, 1, 1, 1); +MODULE_DEPEND(ubtbcmfw, usb, 1, 1, 1); /* * Probe for a USB Bluetooth device diff --git a/sys/dev/usb2/controller/at91dci.c b/sys/dev/usb/controller/at91dci.c index 501d0c0..a7283b4 100644 --- a/sys/dev/usb2/controller/at91dci.c +++ b/sys/dev/usb/controller/at91dci.c @@ -44,26 +44,26 @@ __FBSDID("$FreeBSD$"); * endpoints, Function-address and more. */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR at91dcidebug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_hub.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/at91dci.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/at91dci.h> #define AT9100_DCI_BUS2SC(bus) \ ((struct at91dci_softc *)(((uint8_t *)(bus)) - \ diff --git a/sys/dev/usb2/controller/at91dci.h b/sys/dev/usb/controller/at91dci.h index d386307..d386307 100644 --- a/sys/dev/usb2/controller/at91dci.h +++ b/sys/dev/usb/controller/at91dci.h diff --git a/sys/dev/usb2/controller/at91dci_atmelarm.c b/sys/dev/usb/controller/at91dci_atmelarm.c index 39d3782..71d2937 100644 --- a/sys/dev/usb2/controller/at91dci_atmelarm.c +++ b/sys/dev/usb/controller/at91dci_atmelarm.c @@ -27,19 +27,19 @@ __FBSDID("$FreeBSD$"); */ -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_standard.h> - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/at91dci.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/at91dci.h> #include <sys/rman.h> diff --git a/sys/dev/usb2/controller/atmegadci.c b/sys/dev/usb/controller/atmegadci.c index bea8835d..8a68822 100644 --- a/sys/dev/usb2/controller/atmegadci.c +++ b/sys/dev/usb/controller/atmegadci.c @@ -36,26 +36,26 @@ __FBSDID("$FreeBSD$"); * endpoints, Function-address and more. */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR atmegadci_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_hub.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/atmegadci.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/atmegadci.h> #define ATMEGA_BUS2SC(bus) \ ((struct atmegadci_softc *)(((uint8_t *)(bus)) - \ diff --git a/sys/dev/usb2/controller/atmegadci.h b/sys/dev/usb/controller/atmegadci.h index 90b3334..90b3334 100644 --- a/sys/dev/usb2/controller/atmegadci.h +++ b/sys/dev/usb/controller/atmegadci.h diff --git a/sys/dev/usb2/controller/atmegadci_atmelarm.c b/sys/dev/usb/controller/atmegadci_atmelarm.c index e63f5cc..e63f5cc 100644 --- a/sys/dev/usb2/controller/atmegadci_atmelarm.c +++ b/sys/dev/usb/controller/atmegadci_atmelarm.c diff --git a/sys/dev/usb2/controller/ehci2.c b/sys/dev/usb/controller/ehci.c index 87a6d03..5802268 100644 --- a/sys/dev/usb2/controller/ehci2.c +++ b/sys/dev/usb/controller/ehci.c @@ -46,26 +46,26 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR ehcidebug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_hub.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/ehci2.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/ehci.h> #define EHCI_BUS2SC(bus) ((ehci_softc_t *)(((uint8_t *)(bus)) - \ USB_P2U(&(((ehci_softc_t *)0)->sc_bus)))) diff --git a/sys/dev/usb2/controller/ehci2.h b/sys/dev/usb/controller/ehci.h index 9d7baa1..9d7baa1 100644 --- a/sys/dev/usb2/controller/ehci2.h +++ b/sys/dev/usb/controller/ehci.h diff --git a/sys/dev/usb2/controller/ehci2_ixp4xx.c b/sys/dev/usb/controller/ehci_ixp4xx.c index 91ce863..b369d47 100644 --- a/sys/dev/usb2/controller/ehci2_ixp4xx.c +++ b/sys/dev/usb/controller/ehci_ixp4xx.c @@ -31,19 +31,19 @@ __FBSDID("$FreeBSD$"); #include "opt_bus.h" -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb.h> -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/ehci2.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/ehci.h> #include <arm/xscale/ixp425/ixp425reg.h> #include <arm/xscale/ixp425/ixp425var.h> @@ -345,5 +345,4 @@ static driver_t ehci_driver = { static devclass_t ehci_devclass; DRIVER_MODULE(ehci, ixp, ehci_driver, ehci_devclass, 0, 0); -MODULE_DEPEND(ehci, usb2_controller, 1, 1, 1); -MODULE_DEPEND(ehci, usb2_core, 1, 1, 1); +MODULE_DEPEND(ehci, usb, 1, 1, 1); diff --git a/sys/dev/usb2/controller/ehci2_mbus.c b/sys/dev/usb/controller/ehci_mbus.c index 404617b..66cf8cc 100644 --- a/sys/dev/usb2/controller/ehci2_mbus.c +++ b/sys/dev/usb/controller/ehci_mbus.c @@ -38,19 +38,19 @@ __FBSDID("$FreeBSD$"); #include "opt_bus.h" -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb.h> -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/ehci2.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/ehci.h> #include <arm/mv/mvreg.h> #include <arm/mv/mvvar.h> @@ -361,5 +361,4 @@ static driver_t ehci_driver = { static devclass_t ehci_devclass; DRIVER_MODULE(ehci, mbus, ehci_driver, ehci_devclass, 0, 0); -MODULE_DEPEND(ehci, usb2_controller, 1, 1, 1); -MODULE_DEPEND(ehci, usb2_core, 1, 1, 1); +MODULE_DEPEND(ehci, usb, 1, 1, 1); diff --git a/sys/dev/usb2/controller/ehci2_pci.c b/sys/dev/usb/controller/ehci_pci.c index 5e39c8f..856ea68 100644 --- a/sys/dev/usb2/controller/ehci2_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -52,20 +52,20 @@ __FBSDID("$FreeBSD$"); * sharing of code between *BSD's */ -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb.h> -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/usb2_pci.h> -#include <dev/usb2/controller/ehci2.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/usb_pci.h> +#include <dev/usb/controller/ehci.h> #define PCI_EHCI_VENDORID_ACERLABS 0x10b9 #define PCI_EHCI_VENDORID_AMD 0x1022 @@ -483,5 +483,4 @@ static devclass_t ehci_devclass; DRIVER_MODULE(ehci, pci, ehci_driver, ehci_devclass, 0, 0); DRIVER_MODULE(ehci, cardbus, ehci_driver, ehci_devclass, 0, 0); -MODULE_DEPEND(ehci, usb2_controller, 1, 1, 1); -MODULE_DEPEND(ehci, usb2_core, 1, 1, 1); +MODULE_DEPEND(ehci, usb, 1, 1, 1); diff --git a/sys/dev/usb2/controller/musb2_otg.c b/sys/dev/usb/controller/musb_otg.c index fd6b6d3..2194756 100644 --- a/sys/dev/usb2/controller/musb2_otg.c +++ b/sys/dev/usb/controller/musb_otg.c @@ -36,26 +36,26 @@ * NOTE: The current implementation only supports Device Side Mode! */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR musbotgdebug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_hub.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/musb2_otg.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/musb_otg.h> #define MUSBOTG_INTR_ENDPT 1 diff --git a/sys/dev/usb2/controller/musb2_otg.h b/sys/dev/usb/controller/musb_otg.h index 0d880e1..0d880e1 100644 --- a/sys/dev/usb2/controller/musb2_otg.h +++ b/sys/dev/usb/controller/musb_otg.h diff --git a/sys/dev/usb2/controller/musb2_otg_atmelarm.c b/sys/dev/usb/controller/musb_otg_atmelarm.c index 6477c97..7652424 100644 --- a/sys/dev/usb2/controller/musb2_otg_atmelarm.c +++ b/sys/dev/usb/controller/musb_otg_atmelarm.c @@ -24,19 +24,19 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb.h> -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/musb2_otg.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/mus2_otg.h> #include <sys/rman.h> @@ -236,5 +236,4 @@ static driver_t musbotg_driver = { static devclass_t musbotg_devclass; DRIVER_MODULE(musbotg, atmelarm, musbotg_driver, musbotg_devclass, 0, 0); -MODULE_DEPEND(musbotg, usb2_controller, 1, 1, 1); -MODULE_DEPEND(musbotg, usb2_core, 1, 1, 1); +MODULE_DEPEND(musbotg, usb, 1, 1, 1); diff --git a/sys/dev/usb2/controller/ohci2.c b/sys/dev/usb/controller/ohci.c index 4c65ea7..7751bd5 100644 --- a/sys/dev/usb2/controller/ohci2.c +++ b/sys/dev/usb/controller/ohci.c @@ -35,26 +35,26 @@ __FBSDID("$FreeBSD$"); * USB spec: http://www.usb.org/developers/docs/usbspec.zip */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR ohcidebug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_hub.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/ohci2.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/ohci.h> #define OHCI_BUS2SC(bus) ((ohci_softc_t *)(((uint8_t *)(bus)) - \ USB_P2U(&(((ohci_softc_t *)0)->sc_bus)))) diff --git a/sys/dev/usb2/controller/ohci2.h b/sys/dev/usb/controller/ohci.h index 84a6afd..84a6afd 100644 --- a/sys/dev/usb2/controller/ohci2.h +++ b/sys/dev/usb/controller/ohci.h diff --git a/sys/dev/usb2/controller/ohci2_atmelarm.c b/sys/dev/usb/controller/ohci_atmelarm.c index a7f086c..562cf3d 100644 --- a/sys/dev/usb2/controller/ohci2_atmelarm.c +++ b/sys/dev/usb/controller/ohci_atmelarm.c @@ -25,19 +25,19 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb.h> -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/ohci2.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/ohci.h> #include <sys/rman.h> @@ -220,5 +220,4 @@ static driver_t ohci_driver = { static devclass_t ohci_devclass; DRIVER_MODULE(ohci, atmelarm, ohci_driver, ohci_devclass, 0, 0); -MODULE_DEPEND(ohci, usb2_controller, 1, 1, 1); -MODULE_DEPEND(ohci, usb2_core, 1, 1, 1); +MODULE_DEPEND(ohci, usb, 1, 1, 1); diff --git a/sys/dev/usb2/controller/ohci2_pci.c b/sys/dev/usb/controller/ohci_pci.c index 7d3506e..49591af 100644 --- a/sys/dev/usb2/controller/ohci2_pci.c +++ b/sys/dev/usb/controller/ohci_pci.c @@ -49,21 +49,21 @@ __FBSDID("$FreeBSD$"); * sharing of code between *BSD's */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/usb2_pci.h> -#include <dev/usb2/controller/ohci2.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/usb_pci.h> +#include <dev/usb/controller/ohci.h> #define PCI_OHCI_VENDORID_ACERLABS 0x10b9 #define PCI_OHCI_VENDORID_AMD 0x1022 @@ -384,5 +384,4 @@ static devclass_t ohci_devclass; DRIVER_MODULE(ohci, pci, ohci_driver, ohci_devclass, 0, 0); DRIVER_MODULE(ohci, cardbus, ohci_driver, ohci_devclass, 0, 0); -MODULE_DEPEND(ohci, usb2_controller, 1, 1, 1); -MODULE_DEPEND(ohci, usb2_core, 1, 1, 1); +MODULE_DEPEND(ohci, usb, 1, 1, 1); diff --git a/sys/dev/usb2/controller/uhci2.c b/sys/dev/usb/controller/uhci.c index a5af720..40ae82a 100644 --- a/sys/dev/usb2/controller/uhci2.c +++ b/sys/dev/usb/controller/uhci.c @@ -38,26 +38,26 @@ __FBSDID("$FreeBSD$"); * ftp://download.intel.com/design/intarch/datashts/29056201.pdf */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR uhcidebug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_hub.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/uhci2.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/uhci.h> #define alt_next next #define UHCI_BUS2SC(bus) ((uhci_softc_t *)(((uint8_t *)(bus)) - \ diff --git a/sys/dev/usb2/controller/uhci2.h b/sys/dev/usb/controller/uhci.h index 9365a4c..9365a4c 100644 --- a/sys/dev/usb2/controller/uhci2.h +++ b/sys/dev/usb/controller/uhci.h diff --git a/sys/dev/usb2/controller/uhci2_pci.c b/sys/dev/usb/controller/uhci_pci.c index 725cd84..f7f6f9c 100644 --- a/sys/dev/usb2/controller/uhci2_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -48,21 +48,21 @@ __FBSDID("$FreeBSD$"); * sharing of code between *BSD's */ -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_standard.h> - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_debug.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/usb2_pci.h> -#include <dev/usb2/controller/uhci2.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_debug.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/usb_pci.h> +#include <dev/usb/controller/uhci.h> #define PCI_UHCI_VENDORID_INTEL 0x8086 #define PCI_UHCI_VENDORID_VIA 0x1106 @@ -440,5 +440,4 @@ static devclass_t uhci_devclass; DRIVER_MODULE(uhci, pci, uhci_driver, uhci_devclass, 0, 0); DRIVER_MODULE(uhci, cardbus, uhci_driver, uhci_devclass, 0, 0); -MODULE_DEPEND(uhci, usb2_controller, 1, 1, 1); -MODULE_DEPEND(uhci, usb2_core, 1, 1, 1); +MODULE_DEPEND(uhci, usb, 1, 1, 1); diff --git a/sys/dev/usb2/controller/usb2_controller.c b/sys/dev/usb/controller/usb_controller.c index cd334ab..b91be6c 100644 --- a/sys/dev/usb2/controller/usb2_controller.c +++ b/sys/dev/usb/controller/usb_controller.c @@ -24,23 +24,23 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb.h> #define USB_DEBUG_VAR usb2_ctrl_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_dynamic.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_hub.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_hub.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> /* function prototypes */ @@ -97,9 +97,6 @@ DRIVER_MODULE(usbus, ehci, usb2_driver, usb2_devclass, 0, 0); DRIVER_MODULE(usbus, at91_udp, usb2_driver, usb2_devclass, 0, 0); DRIVER_MODULE(usbus, uss820, usb2_driver, usb2_devclass, 0, 0); -MODULE_DEPEND(usb2_controller, usb2_core, 1, 1, 1); -MODULE_VERSION(usb2_controller, 1); - /*------------------------------------------------------------------------* * usb2_probe * diff --git a/sys/dev/usb2/controller/uss820dci.c b/sys/dev/usb/controller/uss820dci.c index 1e034bf..2adc4e3 100644 --- a/sys/dev/usb2/controller/uss820dci.c +++ b/sys/dev/usb/controller/uss820dci.c @@ -32,27 +32,27 @@ * NOTE: The datasheet does not document everything! */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_revision.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_revision.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR uss820dcidebug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_hub.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/uss820dci.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/uss820dci.h> #define USS820_DCI_BUS2SC(bus) \ ((struct uss820dci_softc *)(((uint8_t *)(bus)) - \ diff --git a/sys/dev/usb2/controller/uss820dci.h b/sys/dev/usb/controller/uss820dci.h index f99e2d5..f99e2d5 100644 --- a/sys/dev/usb2/controller/uss820dci.h +++ b/sys/dev/usb/controller/uss820dci.h diff --git a/sys/dev/usb2/controller/uss820dci_atmelarm.c b/sys/dev/usb/controller/uss820dci_atmelarm.c index 387c167..ddbffd7 100644 --- a/sys/dev/usb2/controller/uss820dci_atmelarm.c +++ b/sys/dev/usb/controller/uss820dci_atmelarm.c @@ -27,19 +27,19 @@ __FBSDID("$FreeBSD$"); * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb.h> -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/uss820dci.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> +#include <dev/usb/controller/uss820dci.h> #include <sys/rman.h> @@ -74,8 +74,7 @@ static driver_t uss820dci_driver = { static devclass_t uss820dci_devclass; DRIVER_MODULE(uss820, atmelarm, uss820dci_driver, uss820dci_devclass, 0, 0); -MODULE_DEPEND(uss820, usb2_controller, 1, 1, 1); -MODULE_DEPEND(uss820, usb2_core, 1, 1, 1); +MODULE_DEPEND(uss820, usb, 1, 1, 1); static const char *const uss820_desc = "USS820 USB Device Controller"; diff --git a/sys/dev/usb2/image/uscanner2.c b/sys/dev/usb/image/uscanner.c index 54dfd55..ca631b5 100644 --- a/sys/dev/usb2/image/uscanner2.c +++ b/sys/dev/usb/image/uscanner.c @@ -46,21 +46,21 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR uscanner_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_mbuf.h> -#include <dev/usb2/core/usb2_dev.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_dev.h> #if USB_DEBUG static int uscanner_debug = 0; @@ -201,8 +201,7 @@ static driver_t uscanner_driver = { }; DRIVER_MODULE(uscanner, ushub, uscanner_driver, uscanner_devclass, NULL, 0); -MODULE_DEPEND(uscanner, usb2_image, 1, 1, 1); -MODULE_DEPEND(uscanner, usb2_core, 1, 1, 1); +MODULE_DEPEND(uscanner, usb, 1, 1, 1); /* * USB scanners device IDs diff --git a/sys/dev/usb2/input/uhid2.c b/sys/dev/usb/input/uhid.c index 84eb49c..563bd99 100644 --- a/sys/dev/usb2/input/uhid2.c +++ b/sys/dev/usb/input/uhid.c @@ -49,30 +49,29 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_hid.h> -#include <dev/usb2/include/usb2_ioctl.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usbhid.h> +#include <dev/usb/usb_ioctl.h> #define USB_DEBUG_VAR uhid_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_dynamic.h> -#include <dev/usb2/core/usb2_mbuf.h> -#include <dev/usb2/core/usb2_dev.h> -#include <dev/usb2/core/usb2_hid.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_hid.h> -#include <dev/usb2/input/usb2_input.h> -#include <dev/usb2/input/usb2_rdesc.h> +#include <dev/usb/input/usb_rdesc.h> -#include <dev/usb2/quirk/usb2_quirk.h> +#include <dev/usb/quirk/usb_quirk.h> #if USB_DEBUG static int uhid_debug = 0; @@ -787,5 +786,4 @@ static driver_t uhid_driver = { }; DRIVER_MODULE(uhid, ushub, uhid_driver, uhid_devclass, NULL, 0); -MODULE_DEPEND(uhid, usb2_input, 1, 1, 1); -MODULE_DEPEND(uhid, usb2_core, 1, 1, 1); +MODULE_DEPEND(uhid, usb, 1, 1, 1); diff --git a/sys/dev/usb2/input/ukbd2.c b/sys/dev/usb/input/ukbd.c index 487e560..c8350264 100644 --- a/sys/dev/usb2/input/ukbd2.c +++ b/sys/dev/usb/input/ukbd.c @@ -48,26 +48,24 @@ __FBSDID("$FreeBSD$"); #include "opt_kbd.h" #include "opt_ukbd.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_hid.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usbhid.h> #define USB_DEBUG_VAR ukbd_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_dynamic.h> -#include <dev/usb2/core/usb2_hid.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_hid.h> -#include <dev/usb2/input/usb2_input.h> - -#include <dev/usb2/quirk/usb2_quirk.h> +#include <dev/usb/quirk/usb_quirk.h> #include <sys/ioccom.h> #include <sys/filio.h> @@ -1488,5 +1486,4 @@ static driver_t ukbd_driver = { }; DRIVER_MODULE(ukbd, ushub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0); -MODULE_DEPEND(ukbd, usb2_input, 1, 1, 1); -MODULE_DEPEND(ukbd, usb2_core, 1, 1, 1); +MODULE_DEPEND(ukbd, usb, 1, 1, 1); diff --git a/sys/dev/usb2/input/ums2.c b/sys/dev/usb/input/ums.c index 9de44f6..b064aa9 100644 --- a/sys/dev/usb2/input/ums2.c +++ b/sys/dev/usb/input/ums.c @@ -43,28 +43,26 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_hid.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usbhid.h> #define USB_DEBUG_VAR ums_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_dynamic.h> -#include <dev/usb2/core/usb2_mbuf.h> -#include <dev/usb2/core/usb2_dev.h> -#include <dev/usb2/core/usb2_hid.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_hid.h> -#include <dev/usb2/input/usb2_input.h> - -#include <dev/usb2/quirk/usb2_quirk.h> +#include <dev/usb/quirk/usb_quirk.h> #include <sys/ioccom.h> #include <sys/filio.h> @@ -900,5 +898,4 @@ static driver_t ums_driver = { }; DRIVER_MODULE(ums, ushub, ums_driver, ums_devclass, NULL, 0); -MODULE_DEPEND(ums, usb2_input, 1, 1, 1); -MODULE_DEPEND(ums, usb2_core, 1, 1, 1); +MODULE_DEPEND(ums, usb, 1, 1, 1); diff --git a/sys/dev/usb2/input/usb2_rdesc.h b/sys/dev/usb/input/usb_rdesc.h index 9f4363d..9f4363d 100644 --- a/sys/dev/usb2/input/usb2_rdesc.h +++ b/sys/dev/usb/input/usb_rdesc.h diff --git a/sys/dev/usb2/misc/udbp2.c b/sys/dev/usb/misc/udbp.c index b60bbf7..b519058 100644 --- a/sys/dev/usb2/misc/udbp2.c +++ b/sys/dev/usb/misc/udbp.c @@ -58,18 +58,18 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR udbp_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_parse.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_parse.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> #include <sys/mbuf.h> @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); #include <netgraph/ng_parse.h> #include <netgraph/bluetooth/include/ng_bluetooth.h> -#include <dev/usb2/misc/udbp2.h> +#include <dev/usb/misc/udbp.h> #if USB_DEBUG static int udbp_debug = 0; @@ -248,8 +248,7 @@ static driver_t udbp_driver = { DRIVER_MODULE(udbp, ushub, udbp_driver, udbp_devclass, udbp_modload, 0); MODULE_DEPEND(udbp, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION); -MODULE_DEPEND(udbp, usb2_misc, 1, 1, 1); -MODULE_DEPEND(udbp, usb2_core, 1, 1, 1); +MODULE_DEPEND(udbp, usb, 1, 1, 1); static int udbp_modload(module_t mod, int event, void *data) diff --git a/sys/dev/usb2/misc/udbp2.h b/sys/dev/usb/misc/udbp.h index e6fd853..e6fd853 100644 --- a/sys/dev/usb2/misc/udbp2.h +++ b/sys/dev/usb/misc/udbp.h diff --git a/sys/dev/usb2/misc/ufm2.c b/sys/dev/usb/misc/ufm.c index df62436..81ce1b3 100644 --- a/sys/dev/usb2/misc/ufm2.c +++ b/sys/dev/usb/misc/ufm.c @@ -33,22 +33,22 @@ __FBSDID("$FreeBSD$"); #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/ufm2_ioctl.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/ufm_ioctl.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_mbuf.h> -#include <dev/usb2/core/usb2_dev.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_dev.h> #define UFM_CMD0 0x00 #define UFM_CMD_SET_FREQ 0x01 @@ -104,9 +104,8 @@ static driver_t ufm_driver = { .size = sizeof(struct ufm_softc), }; -MODULE_DEPEND(ufm, usb2_misc, 1, 1, 1); DRIVER_MODULE(ufm, ushub, ufm_driver, ufm_devclass, NULL, 0); -MODULE_DEPEND(ufm, usb2_core, 1, 1, 1); +MODULE_DEPEND(ufm, usb, 1, 1, 1); static int ufm_probe(device_t dev) diff --git a/sys/dev/usb2/ethernet/if_aue2.c b/sys/dev/usb/net/if_aue.c index c280e5e..026fa7c 100644 --- a/sys/dev/usb2/ethernet/if_aue2.c +++ b/sys/dev/usb/net/if_aue.c @@ -69,22 +69,22 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR aue_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/ethernet/usb2_ethernet.h> -#include <dev/usb2/ethernet/if_auereg.h> +#include <dev/usb/net/usb_ethernet.h> +#include <dev/usb/net/if_auereg.h> #if USB_DEBUG static int aue_debug = 0; @@ -263,8 +263,8 @@ static devclass_t aue_devclass; DRIVER_MODULE(aue, ushub, aue_driver, aue_devclass, NULL, 0); DRIVER_MODULE(miibus, aue, miibus_driver, miibus_devclass, 0, 0); -MODULE_DEPEND(aue, usb2_ethernet, 1, 1, 1); -MODULE_DEPEND(aue, usb2_core, 1, 1, 1); +MODULE_DEPEND(aue, uether, 1, 1, 1); +MODULE_DEPEND(aue, usb, 1, 1, 1); MODULE_DEPEND(aue, ether, 1, 1, 1); MODULE_DEPEND(aue, miibus, 1, 1, 1); diff --git a/sys/dev/usb2/ethernet/if_auereg.h b/sys/dev/usb/net/if_auereg.h index 249c913..249c913 100644 --- a/sys/dev/usb2/ethernet/if_auereg.h +++ b/sys/dev/usb/net/if_auereg.h diff --git a/sys/dev/usb2/ethernet/if_axe2.c b/sys/dev/usb/net/if_axe.c index b578be9..0555e69 100644 --- a/sys/dev/usb2/ethernet/if_axe2.c +++ b/sys/dev/usb/net/if_axe.c @@ -77,22 +77,22 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR axe_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/ethernet/usb2_ethernet.h> -#include <dev/usb2/ethernet/if_axereg.h> +#include <dev/usb/net/usb_ethernet.h> +#include <dev/usb/net/if_axereg.h> /* * AXE_178_MAX_FRAME_BURST @@ -240,8 +240,8 @@ static devclass_t axe_devclass; DRIVER_MODULE(axe, ushub, axe_driver, axe_devclass, NULL, 0); DRIVER_MODULE(miibus, axe, miibus_driver, miibus_devclass, 0, 0); -MODULE_DEPEND(axe, usb2_ethernet, 1, 1, 1); -MODULE_DEPEND(axe, usb2_core, 1, 1, 1); +MODULE_DEPEND(axe, uether, 1, 1, 1); +MODULE_DEPEND(axe, usb, 1, 1, 1); MODULE_DEPEND(axe, ether, 1, 1, 1); MODULE_DEPEND(axe, miibus, 1, 1, 1); diff --git a/sys/dev/usb2/ethernet/if_axereg.h b/sys/dev/usb/net/if_axereg.h index dc063e3..dc063e3 100644 --- a/sys/dev/usb2/ethernet/if_axereg.h +++ b/sys/dev/usb/net/if_axereg.h diff --git a/sys/dev/usb2/ethernet/if_cdce2.c b/sys/dev/usb/net/if_cdce.c index 78b54cf..4097bde 100644 --- a/sys/dev/usb2/ethernet/if_cdce2.c +++ b/sys/dev/usb/net/if_cdce.c @@ -44,26 +44,26 @@ __FBSDID("$FreeBSD$"); #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR cdce_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_parse.h> -#include <dev/usb2/core/usb2_device.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_parse.h> +#include <dev/usb/usb_device.h> -#include <dev/usb2/ethernet/usb2_ethernet.h> -#include <dev/usb2/ethernet/if_cdcereg.h> +#include <dev/usb/net/usb_ethernet.h> +#include <dev/usb/net/if_cdcereg.h> static device_probe_t cdce_probe; static device_attach_t cdce_attach; @@ -71,7 +71,7 @@ static device_detach_t cdce_detach; static device_shutdown_t cdce_shutdown; static device_suspend_t cdce_suspend; static device_resume_t cdce_resume; -static usb2_handle_request_t cdce_handle_request; +static usb_handle_request_t cdce_handle_request; static usb2_callback_t cdce_bulk_write_callback; static usb2_callback_t cdce_bulk_read_callback; @@ -155,7 +155,7 @@ static const struct usb2_config cdce_config[CDCE_N_TRANSFER] = { static device_method_t cdce_methods[] = { /* USB interface */ - DEVMETHOD(usb2_handle_request, cdce_handle_request), + DEVMETHOD(usb_handle_request, cdce_handle_request), /* Device interface */ DEVMETHOD(device_probe, cdce_probe), @@ -178,8 +178,8 @@ static devclass_t cdce_devclass; DRIVER_MODULE(cdce, ushub, cdce_driver, cdce_devclass, NULL, 0); MODULE_VERSION(cdce, 1); -MODULE_DEPEND(cdce, usb2_ethernet, 1, 1, 1); -MODULE_DEPEND(cdce, usb2_core, 1, 1, 1); +MODULE_DEPEND(cdce, uether, 1, 1, 1); +MODULE_DEPEND(cdce, usb, 1, 1, 1); MODULE_DEPEND(cdce, ether, 1, 1, 1); static const struct usb2_ether_methods cdce_ue_methods = { diff --git a/sys/dev/usb2/ethernet/if_cdcereg.h b/sys/dev/usb/net/if_cdcereg.h index dac5121..dac5121 100644 --- a/sys/dev/usb2/ethernet/if_cdcereg.h +++ b/sys/dev/usb/net/if_cdcereg.h diff --git a/sys/dev/usb2/ethernet/if_cue2.c b/sys/dev/usb/net/if_cue.c index 630a210..72ec92d 100644 --- a/sys/dev/usb2/ethernet/if_cue2.c +++ b/sys/dev/usb/net/if_cue.c @@ -52,22 +52,22 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR cue_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/ethernet/usb2_ethernet.h> -#include <dev/usb2/ethernet/if_cuereg.h> +#include <dev/usb/net/usb_ethernet.h> +#include <dev/usb/net/if_cuereg.h> /* * Various supported device vendors/products. @@ -156,8 +156,8 @@ static driver_t cue_driver = { static devclass_t cue_devclass; DRIVER_MODULE(cue, ushub, cue_driver, cue_devclass, NULL, 0); -MODULE_DEPEND(cue, usb2_ethernet, 1, 1, 1); -MODULE_DEPEND(cue, usb2_core, 1, 1, 1); +MODULE_DEPEND(cue, uether, 1, 1, 1); +MODULE_DEPEND(cue, usb, 1, 1, 1); MODULE_DEPEND(cue, ether, 1, 1, 1); static const struct usb2_ether_methods cue_ue_methods = { diff --git a/sys/dev/usb2/ethernet/if_cuereg.h b/sys/dev/usb/net/if_cuereg.h index ca3a816..ca3a816 100644 --- a/sys/dev/usb2/ethernet/if_cuereg.h +++ b/sys/dev/usb/net/if_cuereg.h diff --git a/sys/dev/usb2/ethernet/if_kue2.c b/sys/dev/usb/net/if_kue.c index b99f363..b97922f 100644 --- a/sys/dev/usb2/ethernet/if_kue2.c +++ b/sys/dev/usb/net/if_kue.c @@ -66,23 +66,23 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR kue_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/ethernet/usb2_ethernet.h> -#include <dev/usb2/ethernet/if_kuereg.h> -#include <dev/usb2/ethernet/if_kuefw.h> +#include <dev/usb/net/usb_ethernet.h> +#include <dev/usb/net/if_kuereg.h> +#include <dev/usb/net/if_kuefw.h> /* * Various supported device vendors/products. @@ -199,8 +199,8 @@ static driver_t kue_driver = { static devclass_t kue_devclass; DRIVER_MODULE(kue, ushub, kue_driver, kue_devclass, NULL, 0); -MODULE_DEPEND(kue, usb2_ethernet, 1, 1, 1); -MODULE_DEPEND(kue, usb2_core, 1, 1, 1); +MODULE_DEPEND(kue, uether, 1, 1, 1); +MODULE_DEPEND(kue, usb, 1, 1, 1); MODULE_DEPEND(kue, ether, 1, 1, 1); static const struct usb2_ether_methods kue_ue_methods = { diff --git a/sys/dev/usb2/ethernet/if_kuefw.h b/sys/dev/usb/net/if_kuefw.h index 2b055a9..2b055a9 100644 --- a/sys/dev/usb2/ethernet/if_kuefw.h +++ b/sys/dev/usb/net/if_kuefw.h diff --git a/sys/dev/usb2/ethernet/if_kuereg.h b/sys/dev/usb/net/if_kuereg.h index 8650687..8650687 100644 --- a/sys/dev/usb2/ethernet/if_kuereg.h +++ b/sys/dev/usb/net/if_kuereg.h diff --git a/sys/dev/usb2/ethernet/if_rue2.c b/sys/dev/usb/net/if_rue.c index 690092f..1d0f6ee 100644 --- a/sys/dev/usb2/ethernet/if_rue2.c +++ b/sys/dev/usb/net/if_rue.c @@ -66,22 +66,22 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR rue_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/ethernet/usb2_ethernet.h> -#include <dev/usb2/ethernet/if_ruereg.h> +#include <dev/usb/net/usb_ethernet.h> +#include <dev/usb/net/if_ruereg.h> #if USB_DEBUG static int rue_debug = 0; @@ -196,8 +196,8 @@ static devclass_t rue_devclass; DRIVER_MODULE(rue, ushub, rue_driver, rue_devclass, NULL, 0); DRIVER_MODULE(miibus, rue, miibus_driver, miibus_devclass, 0, 0); -MODULE_DEPEND(rue, usb2_ethernet, 1, 1, 1); -MODULE_DEPEND(rue, usb2_core, 1, 1, 1); +MODULE_DEPEND(rue, uether, 1, 1, 1); +MODULE_DEPEND(rue, usb, 1, 1, 1); MODULE_DEPEND(rue, ether, 1, 1, 1); MODULE_DEPEND(rue, miibus, 1, 1, 1); diff --git a/sys/dev/usb2/ethernet/if_ruereg.h b/sys/dev/usb/net/if_ruereg.h index a94d45a..a94d45a 100644 --- a/sys/dev/usb2/ethernet/if_ruereg.h +++ b/sys/dev/usb/net/if_ruereg.h diff --git a/sys/dev/usb2/ethernet/if_udav2.c b/sys/dev/usb/net/if_udav.c index 3bec08a..82cec80 100644 --- a/sys/dev/usb2/ethernet/if_udav2.c +++ b/sys/dev/usb/net/if_udav.c @@ -47,22 +47,22 @@ __FBSDID("$FreeBSD$"); #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR udav_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/ethernet/usb2_ethernet.h> -#include <dev/usb2/ethernet/if_udavreg.h> +#include <dev/usb/net/usb_ethernet.h> +#include <dev/usb/net/if_udavreg.h> /* prototypes */ @@ -156,8 +156,8 @@ static devclass_t udav_devclass; DRIVER_MODULE(udav, ushub, udav_driver, udav_devclass, NULL, 0); DRIVER_MODULE(miibus, udav, miibus_driver, miibus_devclass, 0, 0); -MODULE_DEPEND(udav, usb2_ethernet, 1, 1, 1); -MODULE_DEPEND(udav, usb2_core, 1, 1, 1); +MODULE_DEPEND(udav, uether, 1, 1, 1); +MODULE_DEPEND(udav, usb, 1, 1, 1); MODULE_DEPEND(udav, ether, 1, 1, 1); MODULE_DEPEND(udav, miibus, 1, 1, 1); diff --git a/sys/dev/usb2/ethernet/if_udavreg.h b/sys/dev/usb/net/if_udavreg.h index d652f5b..d652f5b 100644 --- a/sys/dev/usb2/ethernet/if_udavreg.h +++ b/sys/dev/usb/net/if_udavreg.h diff --git a/sys/dev/usb2/ethernet/usb2_ethernet.c b/sys/dev/usb/net/usb_ethernet.c index a01f942..ac4b701 100644 --- a/sys/dev/usb2/ethernet/usb2_ethernet.c +++ b/sys/dev/usb/net/usb_ethernet.c @@ -24,18 +24,18 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_endian.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_endian.h> +#include <dev/usb/usb.h> -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/ethernet/usb2_ethernet.h> +#include <dev/usb/net/usb_ethernet.h> SYSCTL_NODE(_net, OID_AUTO, ue, CTLFLAG_RD, 0, "USB Ethernet parameters"); @@ -43,8 +43,8 @@ SYSCTL_NODE(_net, OID_AUTO, ue, CTLFLAG_RD, 0, "USB Ethernet parameters"); #define UE_UNLOCK(_ue) mtx_unlock((_ue)->ue_mtx) #define UE_LOCK_ASSERT(_ue, t) mtx_assert((_ue)->ue_mtx, t) -MODULE_DEPEND(usb2_ethernet, usb2_core, 1, 1, 1); -MODULE_DEPEND(usb2_ethernet, miibus, 1, 1, 1); +MODULE_DEPEND(uether, usb, 1, 1, 1); +MODULE_DEPEND(uether, miibus, 1, 1, 1); static struct unrhdr *ueunit; @@ -507,7 +507,7 @@ usb2_ether_modevent(module_t mod, int type, void *data) return (0); } static moduledata_t usb2_ether_mod = { - "usb2_ethernet", + "uether", usb2_ether_modevent, 0 }; @@ -583,5 +583,5 @@ usb2_ether_rxflush(struct usb2_ether *ue) } } -DECLARE_MODULE(usb2_ethernet, usb2_ether_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); -MODULE_VERSION(usb2_ethernet, 1); +DECLARE_MODULE(uether, usb2_ether_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); +MODULE_VERSION(uether, 1); diff --git a/sys/dev/usb2/ethernet/usb2_ethernet.h b/sys/dev/usb/net/usb_ethernet.h index 0ee36f2..0ee36f2 100644 --- a/sys/dev/usb2/ethernet/usb2_ethernet.h +++ b/sys/dev/usb/net/usb_ethernet.h diff --git a/sys/dev/usb2/quirk/usb2_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index f86be0a..fe49ec7 100644 --- a/sys/dev/usb2/quirk/usb2_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -26,22 +26,22 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_ioctl.h> -#include <dev/usb2/include/usb2_mfunc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/usb_mfunc.h> #include "usbdevs.h" #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_dynamic.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_dynamic.h> -#include <dev/usb2/quirk/usb2_quirk.h> +#include <dev/usb/quirk/usb_quirk.h> -MODULE_DEPEND(usb2_quirk, usb2_core, 1, 1, 1); -MODULE_VERSION(usb2_quirk, 1); +MODULE_DEPEND(usb_quirk, usb, 1, 1, 1); +MODULE_VERSION(usb_quirk, 1); /* * The following macro adds one or more quirks for a USB device: diff --git a/sys/dev/usb2/quirk/usb2_quirk.h b/sys/dev/usb/quirk/usb_quirk.h index c9223e8..c9223e8 100644 --- a/sys/dev/usb2/quirk/usb2_quirk.h +++ b/sys/dev/usb/quirk/usb_quirk.h diff --git a/sys/dev/usb2/serial/u3g2.c b/sys/dev/usb/serial/u3g.c index e97c671..ce963d5 100644 --- a/sys/dev/usb2/serial/u3g2.c +++ b/sys/dev/usb/serial/u3g.c @@ -34,25 +34,25 @@ */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR u3g_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_msctest.h> -#include <dev/usb2/core/usb2_dynamic.h> -#include <dev/usb2/core/usb2_device.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_msctest.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_device.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #if USB_DEBUG static int u3g_debug = 0; @@ -173,8 +173,8 @@ static driver_t u3g_driver = { }; DRIVER_MODULE(u3g, ushub, u3g_driver, u3g_devclass, u3g_driver_loaded, 0); -MODULE_DEPEND(u3g, usb2_serial, 1, 1, 1); -MODULE_DEPEND(u3g, usb2_core, 1, 1, 1); +MODULE_DEPEND(u3g, ucom, 1, 1, 1); +MODULE_DEPEND(u3g, usb, 1, 1, 1); /* Huawei specific defines */ diff --git a/sys/dev/usb2/serial/uark2.c b/sys/dev/usb/serial/uark.c index 83bce0f..ce76854 100644 --- a/sys/dev/usb2/serial/uark2.c +++ b/sys/dev/usb/serial/uark.c @@ -24,21 +24,21 @@ */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #define UARK_BUF_SIZE 1024 /* bytes */ @@ -148,8 +148,8 @@ static driver_t uark_driver = { }; DRIVER_MODULE(uark, ushub, uark_driver, uark_devclass, NULL, 0); -MODULE_DEPEND(uark, usb2_serial, 1, 1, 1); -MODULE_DEPEND(uark, usb2_core, 1, 1, 1); +MODULE_DEPEND(uark, ucom, 1, 1, 1); +MODULE_DEPEND(uark, usb, 1, 1, 1); static const struct usb2_device_id uark_devs[] = { {USB_VPI(USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116, 0)}, diff --git a/sys/dev/usb2/serial/ubsa2.c b/sys/dev/usb/serial/ubsa.c index 7aeb988..718df6d 100644 --- a/sys/dev/usb2/serial/ubsa2.c +++ b/sys/dev/usb/serial/ubsa.c @@ -63,22 +63,22 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> #define USB_DEBUG_VAR ubsa_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #if USB_DEBUG static int ubsa_debug = 0; @@ -259,8 +259,8 @@ static driver_t ubsa_driver = { }; DRIVER_MODULE(ubsa, ushub, ubsa_driver, ubsa_devclass, NULL, 0); -MODULE_DEPEND(ubsa, usb2_serial, 1, 1, 1); -MODULE_DEPEND(ubsa, usb2_core, 1, 1, 1); +MODULE_DEPEND(ubsa, ucom, 1, 1, 1); +MODULE_DEPEND(ubsa, usb, 1, 1, 1); static int ubsa_probe(device_t dev) diff --git a/sys/dev/usb2/serial/ubser2.c b/sys/dev/usb/serial/ubser.c index 4ec1542..1de4f82 100644 --- a/sys/dev/usb2/serial/ubser2.c +++ b/sys/dev/usb/serial/ubser.c @@ -76,24 +76,24 @@ __FBSDID("$FreeBSD$"); * BWCT serial adapter driver */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR ubser_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_device.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_device.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #define UBSER_UNIT_MAX 32 @@ -197,8 +197,8 @@ static driver_t ubser_driver = { }; DRIVER_MODULE(ubser, ushub, ubser_driver, ubser_devclass, NULL, 0); -MODULE_DEPEND(ubser, usb2_serial, 1, 1, 1); -MODULE_DEPEND(ubser, usb2_core, 1, 1, 1); +MODULE_DEPEND(ubser, ucom, 1, 1, 1); +MODULE_DEPEND(ubser, usb, 1, 1, 1); static int ubser_probe(device_t dev) diff --git a/sys/dev/usb2/serial/uchcom2.c b/sys/dev/usb/serial/uchcom.c index 2c3e8f2..c8238c4 100644 --- a/sys/dev/usb2/serial/uchcom2.c +++ b/sys/dev/usb/serial/uchcom.c @@ -70,23 +70,23 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> -#include <dev/usb2/include/usb2_ioctl.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> +#include <dev/usb/usb_ioctl.h> #define USB_DEBUG_VAR uchcom_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #if USB_DEBUG static int uchcom_debug = 0; @@ -879,5 +879,5 @@ static driver_t uchcom_driver = { static devclass_t uchcom_devclass; DRIVER_MODULE(uchcom, ushub, uchcom_driver, uchcom_devclass, NULL, 0); -MODULE_DEPEND(uchcom, usb2_serial, 1, 1, 1); -MODULE_DEPEND(uchcom, usb2_core, 1, 1, 1); +MODULE_DEPEND(uchcom, ucom, 1, 1, 1); +MODULE_DEPEND(uchcom, usb, 1, 1, 1); diff --git a/sys/dev/usb2/serial/ucycom2.c b/sys/dev/usb/serial/ucycom.c index 5bf59a2..cabb7fb 100644 --- a/sys/dev/usb2/serial/ucycom2.c +++ b/sys/dev/usb/serial/ucycom.c @@ -35,25 +35,25 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> -#include <dev/usb2/include/usb2_ioctl.h> -#include <dev/usb2/include/usb2_hid.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/usbhid.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_hid.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_hid.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #define UCYCOM_MAX_IOLEN (1024 + 2) /* bytes */ @@ -161,8 +161,8 @@ static driver_t ucycom_driver = { }; DRIVER_MODULE(ucycom, ushub, ucycom_driver, ucycom_devclass, NULL, 0); -MODULE_DEPEND(ucycom, usb2_serial, 1, 1, 1); -MODULE_DEPEND(ucycom, usb2_core, 1, 1, 1); +MODULE_DEPEND(ucycom, ucom, 1, 1, 1); +MODULE_DEPEND(ucycom, usb, 1, 1, 1); /* * Supported devices diff --git a/sys/dev/usb2/serial/ufoma2.c b/sys/dev/usb/serial/ufoma.c index 12f49d7..1077676 100644 --- a/sys/dev/usb2/serial/ufoma2.c +++ b/sys/dev/usb/serial/ufoma.c @@ -83,23 +83,23 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_parse.h> -#include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_parse.h> +#include <dev/usb/usb_busdma.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #include <sys/sysctl.h> #include <sys/sbuf.h> @@ -311,8 +311,8 @@ static driver_t ufoma_driver = { }; DRIVER_MODULE(ufoma, ushub, ufoma_driver, ufoma_devclass, NULL, 0); -MODULE_DEPEND(ufoma, usb2_serial, 1, 1, 1); -MODULE_DEPEND(ufoma, usb2_core, 1, 1, 1); +MODULE_DEPEND(ufoma, ucom, 1, 1, 1); +MODULE_DEPEND(ufoma, usb, 1, 1, 1); static int ufoma_probe(device_t dev) diff --git a/sys/dev/usb2/serial/uftdi2.c b/sys/dev/usb/serial/uftdi.c index af211ed..8ff7250 100644 --- a/sys/dev/usb2/serial/uftdi2.c +++ b/sys/dev/usb/serial/uftdi.c @@ -49,23 +49,23 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> #define USB_DEBUG_VAR uftdi_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> -#include <dev/usb2/serial/usb2_serial.h> -#include <dev/usb2/serial/uftdi2_reg.h> +#include <dev/usb/serial/usb_serial.h> +#include <dev/usb/serial/uftdi_reg.h> #if USB_DEBUG static int uftdi_debug = 0; @@ -196,8 +196,8 @@ static driver_t uftdi_driver = { }; DRIVER_MODULE(uftdi, ushub, uftdi_driver, uftdi_devclass, NULL, 0); -MODULE_DEPEND(uftdi, usb2_serial, 1, 1, 1); -MODULE_DEPEND(uftdi, usb2_core, 1, 1, 1); +MODULE_DEPEND(uftdi, ucom, 1, 1, 1); +MODULE_DEPEND(uftdi, usb, 1, 1, 1); static struct usb2_device_id uftdi_devs[] = { {USB_VPI(USB_VENDOR_DRESDENELEKTRONIK, USB_PRODUCT_DRESDENELEKTRONIK_SENSORTERMINALBOARD, UFTDI_TYPE_8U232AM)}, diff --git a/sys/dev/usb2/serial/uftdi2_reg.h b/sys/dev/usb/serial/uftdi_reg.h index 0074bc5..0074bc5 100644 --- a/sys/dev/usb2/serial/uftdi2_reg.h +++ b/sys/dev/usb/serial/uftdi_reg.h diff --git a/sys/dev/usb2/serial/ugensa2.c b/sys/dev/usb/serial/ugensa.c index 248fc7e..79676d6 100644 --- a/sys/dev/usb2/serial/ugensa2.c +++ b/sys/dev/usb/serial/ugensa.c @@ -43,23 +43,23 @@ */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_device.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_device.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #define UGENSA_BUF_SIZE 2048 /* bytes */ #define UGENSA_CONFIG_INDEX 0 @@ -146,8 +146,8 @@ static driver_t ugensa_driver = { }; DRIVER_MODULE(ugensa, ushub, ugensa_driver, ugensa_devclass, NULL, 0); -MODULE_DEPEND(ugensa, usb2_serial, 1, 1, 1); -MODULE_DEPEND(ugensa, usb2_core, 1, 1, 1); +MODULE_DEPEND(ugensa, ucom, 1, 1, 1); +MODULE_DEPEND(ugensa, usb, 1, 1, 1); static const struct usb2_device_id ugensa_devs[] = { {USB_VPI(USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220, 0)}, diff --git a/sys/dev/usb2/serial/uipaq2.c b/sys/dev/usb/serial/uipaq.c index 68ba3fc..e2a88be 100644 --- a/sys/dev/usb2/serial/uipaq2.c +++ b/sys/dev/usb/serial/uipaq.c @@ -52,22 +52,22 @@ __FBSDID("$FreeBSD$"); #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #define UIPAQ_CONFIG_INDEX 0 /* config number 1 */ #define UIPAQ_IFACE_INDEX 0 @@ -1069,8 +1069,8 @@ static driver_t uipaq_driver = { }; DRIVER_MODULE(uipaq, ushub, uipaq_driver, uipaq_devclass, NULL, 0); -MODULE_DEPEND(uipaq, usb2_serial, 1, 1, 1); -MODULE_DEPEND(uipaq, usb2_core, 1, 1, 1); +MODULE_DEPEND(uipaq, ucom, 1, 1, 1); +MODULE_DEPEND(uipaq, usb, 1, 1, 1); static int uipaq_probe(device_t dev) diff --git a/sys/dev/usb2/serial/ulpt2.c b/sys/dev/usb/serial/ulpt.c index 1a4d9a7..36e082b 100644 --- a/sys/dev/usb2/serial/ulpt2.c +++ b/sys/dev/usb/serial/ulpt.c @@ -46,22 +46,22 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR ulpt_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_mbuf.h> -#include <dev/usb2/core/usb2_dev.h> -#include <dev/usb2/core/usb2_parse.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_parse.h> #include <sys/syslog.h> @@ -722,5 +722,5 @@ static driver_t ulpt_driver = { }; DRIVER_MODULE(ulpt, ushub, ulpt_driver, ulpt_devclass, NULL, 0); -MODULE_DEPEND(ulpt, usb2_core, 1, 1, 1); -MODULE_DEPEND(ulpt, usb2_serial, 1, 1, 1); +MODULE_DEPEND(ulpt, usb, 1, 1, 1); +MODULE_DEPEND(ulpt, ucom, 1, 1, 1); diff --git a/sys/dev/usb2/serial/umct2.c b/sys/dev/usb/serial/umct.c index f5d13d9..a511e2e 100644 --- a/sys/dev/usb2/serial/umct2.c +++ b/sys/dev/usb/serial/umct.c @@ -45,24 +45,24 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_device.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_device.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> /* The UMCT advertises the standard 8250 UART registers */ #define UMCT_GET_MSR 2 /* Get Modem Status Register */ @@ -200,8 +200,8 @@ static driver_t umct_driver = { }; DRIVER_MODULE(umct, ushub, umct_driver, umct_devclass, NULL, 0); -MODULE_DEPEND(umct, usb2_serial, 1, 1, 1); -MODULE_DEPEND(umct, usb2_core, 1, 1, 1); +MODULE_DEPEND(umct, ucom, 1, 1, 1); +MODULE_DEPEND(umct, usb, 1, 1, 1); static int umct_probe(device_t dev) diff --git a/sys/dev/usb2/serial/umodem2.c b/sys/dev/usb/serial/umodem.c index cfb9715..44813dd 100644 --- a/sys/dev/usb2/serial/umodem2.c +++ b/sys/dev/usb/serial/umodem.c @@ -80,25 +80,25 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> -#include <dev/usb2/include/usb2_ioctl.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR umodem_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_device.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_device.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #if USB_DEBUG static int umodem_debug = 0; @@ -244,8 +244,8 @@ static driver_t umodem_driver = { }; DRIVER_MODULE(umodem, ushub, umodem_driver, umodem_devclass, NULL, 0); -MODULE_DEPEND(umodem, usb2_serial, 1, 1, 1); -MODULE_DEPEND(umodem, usb2_core, 1, 1, 1); +MODULE_DEPEND(umodem, ucom, 1, 1, 1); +MODULE_DEPEND(umodem, usb, 1, 1, 1); MODULE_VERSION(umodem, UMODEM_MODVER); static int diff --git a/sys/dev/usb2/serial/umoscom2.c b/sys/dev/usb/serial/umoscom.c index 9d09527..344f4a1 100644 --- a/sys/dev/usb2/serial/umoscom2.c +++ b/sys/dev/usb/serial/umoscom.c @@ -18,22 +18,22 @@ */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> #define USB_DEBUG_VAR umoscom_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #if USB_DEBUG static int umoscom_debug = 0; @@ -261,8 +261,8 @@ static driver_t umoscom_driver = { }; DRIVER_MODULE(umoscom, ushub, umoscom_driver, umoscom_devclass, NULL, 0); -MODULE_DEPEND(umoscom, usb2_serial, 1, 1, 1); -MODULE_DEPEND(umoscom, usb2_core, 1, 1, 1); +MODULE_DEPEND(umoscom, ucom, 1, 1, 1); +MODULE_DEPEND(umoscom, usb, 1, 1, 1); static const struct usb2_device_id umoscom_devs[] = { {USB_VPI(USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7703, 0)} diff --git a/sys/dev/usb2/serial/uplcom2.c b/sys/dev/usb/serial/uplcom.c index b55edfd..5f37417 100644 --- a/sys/dev/usb2/serial/uplcom2.c +++ b/sys/dev/usb/serial/uplcom.c @@ -85,22 +85,22 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> #define USB_DEBUG_VAR uplcom_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #if USB_DEBUG static int uplcom_debug = 0; @@ -291,8 +291,8 @@ static driver_t uplcom_driver = { }; DRIVER_MODULE(uplcom, ushub, uplcom_driver, uplcom_devclass, NULL, 0); -MODULE_DEPEND(uplcom, usb2_serial, 1, 1, 1); -MODULE_DEPEND(uplcom, usb2_core, 1, 1, 1); +MODULE_DEPEND(uplcom, ucom, 1, 1, 1); +MODULE_DEPEND(uplcom, usb, 1, 1, 1); MODULE_VERSION(uplcom, UPLCOM_MODVER); static int diff --git a/sys/dev/usb2/serial/usb2_serial.c b/sys/dev/usb/serial/usb_serial.c index 1036550..38fd818 100644 --- a/sys/dev/usb2/serial/usb2_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -67,22 +67,22 @@ __FBSDID("$FreeBSD$"); * POSSIBILITY OF SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> -#include <dev/usb2/include/usb2_ioctl.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> +#include <dev/usb/usb_ioctl.h> #define USB_DEBUG_VAR usb2_com_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #if USB_DEBUG static int usb2_com_debug = 0; @@ -130,8 +130,8 @@ static struct ttydevsw usb2_com_class = { .tsw_free = usb2_com_free, }; -MODULE_DEPEND(usb2_serial, usb2_core, 1, 1, 1); -MODULE_VERSION(usb2_serial, 1); +MODULE_DEPEND(ucom, usb, 1, 1, 1); +MODULE_VERSION(ucom, 1); #define UCOM_UNIT_MAX 0x1000 /* exclusive */ #define UCOM_SUB_UNIT_MAX 0x100 /* exclusive */ diff --git a/sys/dev/usb2/serial/usb2_serial.h b/sys/dev/usb/serial/usb_serial.h index c7d57a0..c7d57a0 100644 --- a/sys/dev/usb2/serial/usb2_serial.h +++ b/sys/dev/usb/serial/usb_serial.h diff --git a/sys/dev/usb2/serial/uslcom2.c b/sys/dev/usb/serial/uslcom.c index 56b4a9a..3145151 100644 --- a/sys/dev/usb2/serial/uslcom2.c +++ b/sys/dev/usb/serial/uslcom.c @@ -20,21 +20,21 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR uslcom_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #if USB_DEBUG static int uslcom_debug = 0; @@ -194,8 +194,8 @@ static driver_t uslcom_driver = { }; DRIVER_MODULE(uslcom, ushub, uslcom_driver, uslcom_devclass, NULL, 0); -MODULE_DEPEND(uslcom, usb2_serial, 1, 1, 1); -MODULE_DEPEND(uslcom, usb2_core, 1, 1, 1); +MODULE_DEPEND(uslcom, ucom, 1, 1, 1); +MODULE_DEPEND(uslcom, usb, 1, 1, 1); MODULE_VERSION(uslcom, 1); static int diff --git a/sys/dev/usb2/serial/uvisor2.c b/sys/dev/usb/serial/uvisor.c index a33623b..854f972 100644 --- a/sys/dev/usb2/serial/uvisor2.c +++ b/sys/dev/usb/serial/uvisor.c @@ -55,23 +55,23 @@ */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> -#include <dev/usb2/include/usb2_ioctl.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> +#include <dev/usb/usb_ioctl.h> #define USB_DEBUG_VAR uvisor_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #if USB_DEBUG static int uvisor_debug = 0; @@ -235,8 +235,8 @@ static driver_t uvisor_driver = { }; DRIVER_MODULE(uvisor, ushub, uvisor_driver, uvisor_devclass, NULL, 0); -MODULE_DEPEND(uvisor, usb2_serial, 1, 1, 1); -MODULE_DEPEND(uvisor, usb2_core, 1, 1, 1); +MODULE_DEPEND(uvisor, ucom, 1, 1, 1); +MODULE_DEPEND(uvisor, usb, 1, 1, 1); static const struct usb2_device_id uvisor_devs[] = { {USB_VPI(USB_VENDOR_ACEECA, USB_PRODUCT_ACEECA_MEZ1000, UVISOR_FLAG_PALM4)}, diff --git a/sys/dev/usb2/serial/uvscom2.c b/sys/dev/usb/serial/uvscom.c index 1783904..15a9eba 100644 --- a/sys/dev/usb2/serial/uvscom2.c +++ b/sys/dev/usb/serial/uvscom.c @@ -38,22 +38,22 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_cdc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_cdc.h> #define USB_DEBUG_VAR uvscom_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> -#include <dev/usb2/serial/usb2_serial.h> +#include <dev/usb/serial/usb_serial.h> #if USB_DEBUG static int uvscom_debug = 0; @@ -247,8 +247,8 @@ static driver_t uvscom_driver = { }; DRIVER_MODULE(uvscom, ushub, uvscom_driver, uvscom_devclass, NULL, 0); -MODULE_DEPEND(uvscom, usb2_serial, 1, 1, 1); -MODULE_DEPEND(uvscom, usb2_core, 1, 1, 1); +MODULE_DEPEND(uvscom, ucom, 1, 1, 1); +MODULE_DEPEND(uvscom, usb, 1, 1, 1); MODULE_VERSION(uvscom, UVSCOM_MODVER); static int diff --git a/sys/dev/usb2/sound/uaudio2.c b/sys/dev/usb/sound/uaudio.c index 731e271..b79e398 100644 --- a/sys/dev/usb2/sound/uaudio2.c +++ b/sys/dev/usb/sound/uaudio.c @@ -53,26 +53,26 @@ */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR uaudio_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_parse.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_mbuf.h> -#include <dev/usb2/core/usb2_dev.h> -#include <dev/usb2/core/usb2_dynamic.h> - -#include <dev/usb2/quirk/usb2_quirk.h> -#include <dev/usb2/sound/uaudio2_reg.h> -#include <dev/usb2/sound/uaudio2.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_parse.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_dynamic.h> + +#include <dev/usb/quirk/usb_quirk.h> +#include <dev/usb/sound/uaudio_reg.h> +#include <dev/usb/sound/uaudio.h> #include <sys/reboot.h> /* for bootverbose */ @@ -3745,7 +3745,6 @@ umidi_detach(device_t dev) } DRIVER_MODULE(uaudio, ushub, uaudio_driver, uaudio_devclass, NULL, 0); -MODULE_DEPEND(uaudio, usb2_sound, 1, 1, 1); -MODULE_DEPEND(uaudio, usb2_core, 1, 1, 1); +MODULE_DEPEND(uaudio, usb, 1, 1, 1); MODULE_DEPEND(uaudio, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(uaudio, 1); diff --git a/sys/dev/usb2/sound/uaudio2.h b/sys/dev/usb/sound/uaudio.h index e763c6d..e763c6d 100644 --- a/sys/dev/usb2/sound/uaudio2.h +++ b/sys/dev/usb/sound/uaudio.h diff --git a/sys/dev/usb2/sound/uaudio2_pcm.c b/sys/dev/usb/sound/uaudio_pcm.c index c073c19..a9d3a48 100644 --- a/sys/dev/usb2/sound/uaudio2_pcm.c +++ b/sys/dev/usb/sound/uaudio_pcm.c @@ -31,7 +31,7 @@ #include <dev/sound/pcm/sound.h> #include <dev/sound/chip.h> -#include <dev/usb2/sound/uaudio2.h> +#include <dev/usb/sound/uaudio.h> #include "mixer_if.h" diff --git a/sys/dev/usb2/sound/uaudio2_reg.h b/sys/dev/usb/sound/uaudio_reg.h index 2bf68a1..2bf68a1 100644 --- a/sys/dev/usb2/sound/uaudio2_reg.h +++ b/sys/dev/usb/sound/uaudio_reg.h diff --git a/sys/dev/usb2/storage/ata-usb2.c b/sys/dev/usb/storage/ata-usb.c index a4d2da4..01ce320 100644 --- a/sys/dev/usb2/storage/ata-usb2.c +++ b/sys/dev/usb/storage/ata-usb.c @@ -31,17 +31,17 @@ __FBSDID("$FreeBSD$"); #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_transfer.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> #include <sys/ata.h> #include <sys/bio.h> @@ -272,8 +272,7 @@ static driver_t atausb2_driver = { }; DRIVER_MODULE(atausb, ushub, atausb2_driver, atausb2_devclass, 0, 0); -MODULE_DEPEND(atausb, usb2_storage, 1, 1, 1); -MODULE_DEPEND(atausb, usb2_core, 1, 1, 1); +MODULE_DEPEND(atausb, usb, 1, 1, 1); MODULE_VERSION(atausb, 1); static int diff --git a/sys/dev/usb2/include/urio2_ioctl.h b/sys/dev/usb/storage/rio500_usb.h index 713647c..5b53e2c 100644 --- a/sys/dev/usb2/include/urio2_ioctl.h +++ b/sys/dev/usb/storage/rio500_usb.h @@ -23,19 +23,26 @@ /* $FreeBSD$ */ #include <sys/ioccom.h> - -struct RioCommand { - uint16_t length; - int request; - int requesttype; - int value; - int index; - void *buffer; - int timeout; +#ifndef USB_VENDOR_DIAMOND +#define USB_VENDOR_DIAMOND 0x841 +#endif +#ifndef USB_PRODUCT_DIAMOND_RIO500USB +#define USB_PRODUCT_DIAMOND_RIO500USB 0x1 +#endif + +struct RioCommand +{ + uint16_t length; + int request; + int requesttype; + int value; + int index; + void *buffer; + int timeout; }; -#define RIO_SEND_COMMAND _IOWR('U', 200, struct RioCommand) -#define RIO_RECV_COMMAND _IOWR('U', 201, struct RioCommand) +#define RIO_SEND_COMMAND _IOWR('U', 200, struct RioCommand) +#define RIO_RECV_COMMAND _IOWR('U', 201, struct RioCommand) -#define RIO_DIR_OUT 0x0 -#define RIO_DIR_IN 0x1 +#define RIO_DIR_OUT 0x0 +#define RIO_DIR_IN 0x1 diff --git a/sys/dev/usb2/storage/umass2.c b/sys/dev/usb/storage/umass.c index ff83290..156e677 100644 --- a/sys/dev/usb2/storage/umass2.c +++ b/sys/dev/usb/storage/umass.c @@ -103,17 +103,17 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_transfer.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> #include <cam/cam.h> #include <cam/cam_ccb.h> @@ -1282,8 +1282,7 @@ static driver_t umass_driver = { }; DRIVER_MODULE(umass, ushub, umass_driver, umass_devclass, NULL, 0); -MODULE_DEPEND(umass, usb2_storage, 1, 1, 1); -MODULE_DEPEND(umass, usb2_core, 1, 1, 1); +MODULE_DEPEND(umass, usb, 1, 1, 1); MODULE_DEPEND(umass, cam, 1, 1, 1); /* diff --git a/sys/dev/usb2/storage/urio2.c b/sys/dev/usb/storage/urio.c index e592f77..82e16d9 100644 --- a/sys/dev/usb2/storage/urio2.c +++ b/sys/dev/usb/storage/urio.c @@ -45,24 +45,24 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_ioctl.h> -#include <dev/usb/rio500_usb.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/storage/rio500_usb.h> #define USB_DEBUG_VAR urio_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_mbuf.h> -#include <dev/usb2/core/usb2_dev.h> -#include <dev/usb2/core/usb2_generic.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_generic.h> #if USB_DEBUG static int urio_debug = 0; @@ -184,8 +184,7 @@ static driver_t urio_driver = { }; DRIVER_MODULE(urio, ushub, urio_driver, urio_devclass, NULL, 0); -MODULE_DEPEND(urio, usb2_storage, 1, 1, 1); -MODULE_DEPEND(urio, usb2_core, 1, 1, 1); +MODULE_DEPEND(urio, usb, 1, 1, 1); static int urio_probe(device_t dev) diff --git a/sys/dev/usb2/storage/ustorage2_fs.c b/sys/dev/usb/storage/ustorage_fs.c index 2fb42a5..2eec249 100644 --- a/sys/dev/usb2/storage/ustorage2_fs.c +++ b/sys/dev/usb/storage/ustorage_fs.c @@ -36,19 +36,19 @@ * Linux USB gadget stack. */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR ustorage_fs_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_device.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> #if USB_DEBUG static int ustorage_fs_debug = 0; @@ -180,7 +180,7 @@ static device_detach_t ustorage_fs_detach; static device_suspend_t ustorage_fs_suspend; static device_resume_t ustorage_fs_resume; static device_shutdown_t ustorage_fs_shutdown; -static usb2_handle_request_t ustorage_fs_handle_request; +static usb_handle_request_t ustorage_fs_handle_request; static usb2_callback_t ustorage_fs_t_bbb_command_callback; static usb2_callback_t ustorage_fs_t_bbb_data_dump_callback; @@ -208,7 +208,7 @@ static uint8_t ustorage_fs_do_cmd(struct ustorage_fs_softc *sc); static device_method_t ustorage_fs_methods[] = { /* USB interface */ - DEVMETHOD(usb2_handle_request, ustorage_fs_handle_request), + DEVMETHOD(usb_handle_request, ustorage_fs_handle_request), /* Device interface */ DEVMETHOD(device_probe, ustorage_fs_probe), @@ -231,8 +231,7 @@ static devclass_t ustorage_fs_devclass; DRIVER_MODULE(ustorage_fs, ushub, ustorage_fs_driver, ustorage_fs_devclass, NULL, 0); MODULE_VERSION(ustorage_fs, 0); -MODULE_DEPEND(ustorage_fs, usb2_storage, 1, 1, 1); -MODULE_DEPEND(ustorage_fs, usb2_core, 1, 1, 1); +MODULE_DEPEND(ustorage_fs, usb, 1, 1, 1); struct usb2_config ustorage_fs_bbb_config[USTORAGE_FS_T_BBB_MAX] = { diff --git a/sys/dev/usb2/template/usb2_template.c b/sys/dev/usb/template/usb_template.c index 3bd0d64..31c853a 100644 --- a/sys/dev/usb2/template/usb2_template.c +++ b/sys/dev/usb/template/usb_template.c @@ -29,29 +29,29 @@ * USB templates. */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_cdc.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_cdc.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_parse.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_dynamic.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_parse.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_dynamic.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> -#include <dev/usb2/template/usb2_template.h> +#include <dev/usb/template/usb_template.h> -MODULE_DEPEND(usb2_template, usb2_core, 1, 1, 1); -MODULE_VERSION(usb2_template, 1); +MODULE_DEPEND(usb_template, usb, 1, 1, 1); +MODULE_VERSION(usb_template, 1); /* function prototypes */ diff --git a/sys/dev/usb2/template/usb2_template.h b/sys/dev/usb/template/usb_template.h index 361de3a..361de3a 100644 --- a/sys/dev/usb2/template/usb2_template.h +++ b/sys/dev/usb/template/usb_template.h diff --git a/sys/dev/usb2/template/usb2_template_cdce.c b/sys/dev/usb/template/usb_template_cdce.c index bc123df..c215c1d 100644 --- a/sys/dev/usb2/template/usb2_template_cdce.c +++ b/sys/dev/usb/template/usb_template_cdce.c @@ -31,13 +31,13 @@ __FBSDID("$FreeBSD$"); * This file contains the USB templates for a CDC USB ethernet device. */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_cdc.h> -#include <dev/usb2/include/usb2_mfunc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_cdc.h> +#include <dev/usb/usb_mfunc.h> -#include <dev/usb2/core/usb2_core.h> +#include <dev/usb/usb_core.h> -#include <dev/usb2/template/usb2_template.h> +#include <dev/usb/template/usb_template.h> enum { STRING_LANG_INDEX, diff --git a/sys/dev/usb2/template/usb2_template_msc.c b/sys/dev/usb/template/usb_template_msc.c index b8bc7ad..a3d88b0 100644 --- a/sys/dev/usb2/template/usb2_template_msc.c +++ b/sys/dev/usb/template/usb_template_msc.c @@ -31,12 +31,12 @@ __FBSDID("$FreeBSD$"); * This file contains the USB templates for an USB Mass Storage Device. */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> -#include <dev/usb2/core/usb2_core.h> +#include <dev/usb/usb_core.h> -#include <dev/usb2/template/usb2_template.h> +#include <dev/usb/template/usb_template.h> enum { STRING_LANG_INDEX, diff --git a/sys/dev/usb2/template/usb2_template_mtp.c b/sys/dev/usb/template/usb_template_mtp.c index f1599fc..271c202 100644 --- a/sys/dev/usb2/template/usb2_template_mtp.c +++ b/sys/dev/usb/template/usb_template_mtp.c @@ -38,12 +38,12 @@ __FBSDID("$FreeBSD$"); * operating system the VID and PID of your device. */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> -#include <dev/usb2/core/usb2_core.h> +#include <dev/usb/usb_core.h> -#include <dev/usb2/template/usb2_template.h> +#include <dev/usb/template/usb_template.h> #define MTP_BREQUEST 0x08 diff --git a/sys/dev/usb2/include/ufm2_ioctl.h b/sys/dev/usb/ufm_ioctl.h index 921b3d4..921b3d4 100644 --- a/sys/dev/usb2/include/ufm2_ioctl.h +++ b/sys/dev/usb/ufm_ioctl.h diff --git a/sys/dev/usb2/include/usb2_standard.h b/sys/dev/usb/usb.h index f81f346..104ee36 100644 --- a/sys/dev/usb2/include/usb2_standard.h +++ b/sys/dev/usb/usb.h @@ -39,7 +39,7 @@ #ifndef _USB2_STANDARD_H_ #define _USB2_STANDARD_H_ -#include <dev/usb2/include/usb2_endian.h> +#include <dev/usb/usb_endian.h> /* * Minimum time a device needs to be powered down to go through a diff --git a/sys/dev/usb2/controller/usb2_bus.h b/sys/dev/usb/usb_bus.h index 59287c4..59287c4 100644 --- a/sys/dev/usb2/controller/usb2_bus.h +++ b/sys/dev/usb/usb_bus.h diff --git a/sys/dev/usb2/core/usb2_busdma.c b/sys/dev/usb/usb_busdma.c index 8254e6e..809c3bf 100644 --- a/sys/dev/usb2/core/usb2_busdma.c +++ b/sys/dev/usb/usb_busdma.c @@ -24,23 +24,23 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_debug.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_debug.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> static void usb2_dma_tag_create(struct usb2_dma_tag *, uint32_t, uint32_t); static void usb2_dma_tag_destroy(struct usb2_dma_tag *); diff --git a/sys/dev/usb2/core/usb2_busdma.h b/sys/dev/usb/usb_busdma.h index 3c1600b..3c1600b 100644 --- a/sys/dev/usb2/core/usb2_busdma.h +++ b/sys/dev/usb/usb_busdma.h diff --git a/sys/dev/usb2/include/usb2_cdc.h b/sys/dev/usb/usb_cdc.h index d1e3dcb..d1e3dcb 100644 --- a/sys/dev/usb2/include/usb2_cdc.h +++ b/sys/dev/usb/usb_cdc.h diff --git a/sys/dev/usb2/core/usb2_compat_linux.c b/sys/dev/usb/usb_compat_linux.c index 4f52ea3..a544a98 100644 --- a/sys/dev/usb2/core/usb2_compat_linux.c +++ b/sys/dev/usb/usb_compat_linux.c @@ -25,25 +25,25 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_ioctl.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_ioctl.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_compat_linux.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_parse.h> -#include <dev/usb2/core/usb2_hub.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_debug.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_compat_linux.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_parse.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_debug.h> struct usb_linux_softc { LIST_ENTRY(usb_linux_softc) sc_attached_list; diff --git a/sys/dev/usb2/core/usb2_compat_linux.h b/sys/dev/usb/usb_compat_linux.h index 8ebb7e3..8ebb7e3 100644 --- a/sys/dev/usb2/core/usb2_compat_linux.h +++ b/sys/dev/usb/usb_compat_linux.h diff --git a/sys/dev/usb2/controller/usb2_controller.h b/sys/dev/usb/usb_controller.h index 80633d9..80633d9 100644 --- a/sys/dev/usb2/controller/usb2_controller.h +++ b/sys/dev/usb/usb_controller.h diff --git a/sys/dev/usb2/core/usb2_core.c b/sys/dev/usb/usb_core.c index b96f53c..a4191ad 100644 --- a/sys/dev/usb2/core/usb2_core.c +++ b/sys/dev/usb/usb_core.c @@ -30,11 +30,11 @@ * http://www.usb.org/developers/devclass_docs/ */ -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_mbuf.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_mbuf.h> MALLOC_DEFINE(M_USB, "USB", "USB"); MALLOC_DEFINE(M_USBDEV, "USBdev", "USB device"); MALLOC_DEFINE(M_USBHC, "USBHC", "USB host controller"); -MODULE_VERSION(usb2_core, 1); +MODULE_VERSION(usb, 1); diff --git a/sys/dev/usb2/core/usb2_core.h b/sys/dev/usb/usb_core.h index 06f77cb..cc55316 100644 --- a/sys/dev/usb2/core/usb2_core.h +++ b/sys/dev/usb/usb_core.h @@ -90,10 +90,10 @@ #include <sys/malloc.h> #include <sys/priv.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_revision.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_revision.h> -#include "usb2_if.h" +#include "usb_if.h" #include "opt_usb.h" #include "opt_bus.h" diff --git a/sys/dev/usb2/core/usb2_debug.c b/sys/dev/usb/usb_debug.c index 46d27b4..b7eeea7 100644 --- a/sys/dev/usb2/core/usb2_debug.c +++ b/sys/dev/usb/usb_debug.c @@ -24,15 +24,15 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_defs.h> -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_transfer.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_transfer.h> /* * Define this unconditionally in case a kernel module is loaded that diff --git a/sys/dev/usb2/core/usb2_debug.h b/sys/dev/usb/usb_debug.h index 92dcbd5..92dcbd5 100644 --- a/sys/dev/usb2/core/usb2_debug.h +++ b/sys/dev/usb/usb_debug.h diff --git a/sys/dev/usb2/include/usb2_defs.h b/sys/dev/usb/usb_defs.h index 64caf39..64caf39 100644 --- a/sys/dev/usb2/include/usb2_defs.h +++ b/sys/dev/usb/usb_defs.h diff --git a/sys/dev/usb2/core/usb2_dev.c b/sys/dev/usb/usb_dev.c index 18b1f9f..f8e2c96 100644 --- a/sys/dev/usb2/core/usb2_dev.c +++ b/sys/dev/usb/usb_dev.c @@ -27,27 +27,27 @@ * usb2_dev.c - An abstraction layer for creating devices under /dev/... */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_ioctl.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR usb2_fifo_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_mbuf.h> -#include <dev/usb2/core/usb2_dev.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_generic.h> -#include <dev/usb2/core/usb2_dynamic.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_generic.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> #include <sys/filio.h> #include <sys/ttycom.h> diff --git a/sys/dev/usb2/core/usb2_dev.h b/sys/dev/usb/usb_dev.h index 6203572..6203572 100644 --- a/sys/dev/usb2/core/usb2_dev.h +++ b/sys/dev/usb/usb_dev.h diff --git a/sys/dev/usb2/core/usb2_device.c b/sys/dev/usb/usb_device.c index 31e8a84..439ad2b 100644 --- a/sys/dev/usb2/core/usb2_device.c +++ b/sys/dev/usb/usb_device.c @@ -24,35 +24,35 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_ioctl.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_ioctl.h> #include "usbdevs.h" #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_parse.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_dynamic.h> -#include <dev/usb2/core/usb2_hub.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_mbuf.h> -#include <dev/usb2/core/usb2_dev.h> -#include <dev/usb2/core/usb2_msctest.h> -#include <dev/usb2/core/usb2_generic.h> - -#include <dev/usb2/quirk/usb2_quirk.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_parse.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_msctest.h> +#include <dev/usb/usb_generic.h> + +#include <dev/usb/quirk/usb_quirk.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> /* function prototypes */ diff --git a/sys/dev/usb2/core/usb2_device.h b/sys/dev/usb/usb_device.h index 11686e2..11686e2 100644 --- a/sys/dev/usb2/core/usb2_device.h +++ b/sys/dev/usb/usb_device.h diff --git a/sys/dev/usb2/core/usb2_dynamic.c b/sys/dev/usb/usb_dynamic.c index 3e0bdf1..6983f64 100644 --- a/sys/dev/usb2/core/usb2_dynamic.c +++ b/sys/dev/usb/usb_dynamic.c @@ -24,15 +24,15 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_dynamic.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_dynamic.h> /* function prototypes */ static usb2_temp_get_desc_t usb2_temp_get_desc_w; diff --git a/sys/dev/usb2/core/usb2_dynamic.h b/sys/dev/usb/usb_dynamic.h index 2c45d09..2c45d09 100644 --- a/sys/dev/usb2/core/usb2_dynamic.h +++ b/sys/dev/usb/usb_dynamic.h diff --git a/sys/dev/usb2/include/usb2_endian.h b/sys/dev/usb/usb_endian.h index 2f49008..2f49008 100644 --- a/sys/dev/usb2/include/usb2_endian.h +++ b/sys/dev/usb/usb_endian.h diff --git a/sys/dev/usb2/core/usb2_error.c b/sys/dev/usb/usb_error.c index 8ee57b4..daece10 100644 --- a/sys/dev/usb2/core/usb2_error.c +++ b/sys/dev/usb/usb_error.c @@ -24,10 +24,10 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> -#include <dev/usb2/core/usb2_core.h> +#include <dev/usb/usb_core.h> static const char* usb_errstr_table[USB_ERR_MAX] = { [USB_ERR_NORMAL_COMPLETION] = "USB_ERR_NORMAL_COMPLETION", diff --git a/sys/dev/usb2/include/usb2_error.h b/sys/dev/usb/usb_error.h index 91f0245..91f0245 100644 --- a/sys/dev/usb2/include/usb2_error.h +++ b/sys/dev/usb/usb_error.h diff --git a/sys/dev/usb2/core/usb2_generic.c b/sys/dev/usb/usb_generic.c index 49f683d..15ca909 100644 --- a/sys/dev/usb2/core/usb2_generic.c +++ b/sys/dev/usb/usb_generic.c @@ -24,29 +24,29 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_ioctl.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR ugen_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_mbuf.h> -#include <dev/usb2/core/usb2_dev.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_hub.h> -#include <dev/usb2/core/usb2_generic.h> -#include <dev/usb2/core/usb2_transfer.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_mbuf.h> +#include <dev/usb/usb_dev.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_generic.h> +#include <dev/usb/usb_transfer.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> /* defines */ diff --git a/sys/dev/usb2/core/usb2_generic.h b/sys/dev/usb/usb_generic.h index 3a4e7c9..3a4e7c9 100644 --- a/sys/dev/usb2/core/usb2_generic.h +++ b/sys/dev/usb/usb_generic.h diff --git a/sys/dev/usb2/core/usb2_handle_request.c b/sys/dev/usb/usb_handle_request.c index 65f0f01..05a739a 100644 --- a/sys/dev/usb2/core/usb2_handle_request.c +++ b/sys/dev/usb/usb_handle_request.c @@ -24,24 +24,24 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_dynamic.h> -#include <dev/usb2/core/usb2_hub.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_dynamic.h> +#include <dev/usb/usb_hub.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> /* enum */ @@ -214,7 +214,7 @@ tr_repeat: #if 0 DEVMETHOD(usb2_handle_request, NULL); /* dummy */ #endif - error = USB2_HANDLE_REQUEST(iface->subdev, + error = USB_HANDLE_REQUEST(iface->subdev, &req, ppdata, plen, off, (state == ST_POST_STATUS)); } @@ -234,7 +234,7 @@ tr_repeat: ((req.bmRequestType & 0x1F) == UT_INTERFACE) && (iface_parent->subdev != iface->subdev) && device_is_attached(iface_parent->subdev)) { - error = USB2_HANDLE_REQUEST(iface_parent->subdev, + error = USB_HANDLE_REQUEST(iface_parent->subdev, &req, ppdata, plen, off, (state == ST_POST_STATUS)); } diff --git a/sys/dev/usb2/core/usb2_handle_request.h b/sys/dev/usb/usb_handle_request.h index 6cc0503..6cc0503 100644 --- a/sys/dev/usb2/core/usb2_handle_request.h +++ b/sys/dev/usb/usb_handle_request.h diff --git a/sys/dev/usb2/core/usb2_hid.c b/sys/dev/usb/usb_hid.c index 04d7d4d..2adf208 100644 --- a/sys/dev/usb2/core/usb2_hid.c +++ b/sys/dev/usb/usb_hid.c @@ -40,21 +40,21 @@ __FBSDID("$FreeBSD$"); * POSSIBILITY OF SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_hid.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usbhid.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_parse.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_hid.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_parse.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_hid.h> static void hid_clear_local(struct hid_item *); diff --git a/sys/dev/usb2/core/usb2_hid.h b/sys/dev/usb/usb_hid.h index 3fb7368..3fb7368 100644 --- a/sys/dev/usb2/core/usb2_hid.h +++ b/sys/dev/usb/usb_hid.h diff --git a/sys/dev/usb2/core/usb2_hub.c b/sys/dev/usb/usb_hub.c index 8c2d639..a0b4e851 100644 --- a/sys/dev/usb2/core/usb2_hub.c +++ b/sys/dev/usb/usb_hub.c @@ -30,27 +30,27 @@ * USB spec: http://www.usb.org/developers/docs/usbspec.zip */ -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_ioctl.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_ioctl.h> #define USB_DEBUG_VAR uhub_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_hub.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_dynamic.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_hub.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_dynamic.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> #define UHUB_INTR_INTERVAL 250 /* ms */ #define UHUB_N_TRANSFER 1 diff --git a/sys/dev/usb2/core/usb2_hub.h b/sys/dev/usb/usb_hub.h index 87d85b3..87d85b3 100644 --- a/sys/dev/usb2/core/usb2_hub.h +++ b/sys/dev/usb/usb_hub.h diff --git a/sys/dev/usb2/core/usb2_if.m b/sys/dev/usb/usb_if.m index d0db8d4..f6d67d4 100644 --- a/sys/dev/usb2/core/usb2_if.m +++ b/sys/dev/usb/usb_if.m @@ -32,7 +32,7 @@ #include <sys/bus.h> -INTERFACE usb2; +INTERFACE usb; # The device received a control request # diff --git a/sys/dev/usb2/include/usb2_ioctl.h b/sys/dev/usb/usb_ioctl.h index 58c392a..4b91643 100644 --- a/sys/dev/usb2/include/usb2_ioctl.h +++ b/sys/dev/usb/usb_ioctl.h @@ -33,8 +33,8 @@ /* Building "kdump" depends on these includes */ -#include <dev/usb2/include/usb2_endian.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_endian.h> +#include <dev/usb/usb.h> #define USB_DEVICE_NAME "usb" #define USB_GENERIC_NAME "ugen" @@ -202,7 +202,7 @@ struct usb2_gen_quirk { uint16_t reserved[2]; /* * String version of quirk including terminating zero. See UQ_XXX in - * "usb2_quirk.h". + * "usb_quirk.h". */ char quirkname[64 - 14]; }; diff --git a/sys/dev/usb2/core/usb2_lookup.c b/sys/dev/usb/usb_lookup.c index eaab8a3..a8fa271 100644 --- a/sys/dev/usb2/core/usb2_lookup.c +++ b/sys/dev/usb/usb_lookup.c @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> /*------------------------------------------------------------------------* * usb2_lookup_id_by_info diff --git a/sys/dev/usb2/core/usb2_lookup.h b/sys/dev/usb/usb_lookup.h index e447292..e447292 100644 --- a/sys/dev/usb2/core/usb2_lookup.h +++ b/sys/dev/usb/usb_lookup.h diff --git a/sys/dev/usb2/core/usb2_mbuf.c b/sys/dev/usb/usb_mbuf.c index 1f06f0f..3ae6ee6 100644 --- a/sys/dev/usb2/core/usb2_mbuf.c +++ b/sys/dev/usb/usb_mbuf.c @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_mbuf.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_mbuf.h> /*------------------------------------------------------------------------* * usb2_alloc_mbufs - allocate mbufs to an usbd interface queue diff --git a/sys/dev/usb2/core/usb2_mbuf.h b/sys/dev/usb/usb_mbuf.h index 109340c..109340c 100644 --- a/sys/dev/usb2/core/usb2_mbuf.h +++ b/sys/dev/usb/usb_mbuf.h diff --git a/sys/dev/usb2/include/usb2_mfunc.h b/sys/dev/usb/usb_mfunc.h index 0fad203..0fad203 100644 --- a/sys/dev/usb2/include/usb2_mfunc.h +++ b/sys/dev/usb/usb_mfunc.h diff --git a/sys/dev/usb2/core/usb2_msctest.c b/sys/dev/usb/usb_msctest.c index fbd7dbc..35b71ec 100644 --- a/sys/dev/usb2/core/usb2_msctest.c +++ b/sys/dev/usb/usb_msctest.c @@ -32,28 +32,28 @@ * mass storage quirks for not supported SCSI commands! */ -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_msctest.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_lookup.h> - -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_msctest.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_lookup.h> + +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb.h> enum { ST_COMMAND, diff --git a/sys/dev/usb2/core/usb2_msctest.h b/sys/dev/usb/usb_msctest.h index 5bf64d0..5bf64d0 100644 --- a/sys/dev/usb2/core/usb2_msctest.h +++ b/sys/dev/usb/usb_msctest.h diff --git a/sys/dev/usb2/core/usb2_parse.c b/sys/dev/usb/usb_parse.c index 1f722b5..381f546 100644 --- a/sys/dev/usb2/core/usb2_parse.c +++ b/sys/dev/usb/usb_parse.c @@ -24,11 +24,11 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_parse.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_parse.h> /*------------------------------------------------------------------------* * usb2_desc_foreach diff --git a/sys/dev/usb2/core/usb2_parse.h b/sys/dev/usb/usb_parse.h index a9e6509..a9e6509 100644 --- a/sys/dev/usb2/core/usb2_parse.h +++ b/sys/dev/usb/usb_parse.h diff --git a/sys/dev/usb2/controller/usb2_pci.h b/sys/dev/usb/usb_pci.h index 9297c29..9297c29 100644 --- a/sys/dev/usb2/controller/usb2_pci.h +++ b/sys/dev/usb/usb_pci.h diff --git a/sys/dev/usb2/core/usb2_process.c b/sys/dev/usb/usb_process.c index 4c50695..0354284 100644 --- a/sys/dev/usb2/core/usb2_process.c +++ b/sys/dev/usb/usb_process.c @@ -26,10 +26,10 @@ #define USB_DEBUG_VAR usb2_proc_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_util.h> #include <sys/proc.h> #include <sys/kthread.h> diff --git a/sys/dev/usb2/core/usb2_process.h b/sys/dev/usb/usb_process.h index 756b929..756b929 100644 --- a/sys/dev/usb2/core/usb2_process.h +++ b/sys/dev/usb/usb_process.h diff --git a/sys/dev/usb2/core/usb2_request.c b/sys/dev/usb/usb_request.c index 75a14ff..3d19442 100644 --- a/sys/dev/usb2/core/usb2_request.c +++ b/sys/dev/usb/usb_request.c @@ -26,27 +26,27 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_ioctl.h> -#include <dev/usb2/include/usb2_hid.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_ioctl.h> +#include <dev/usb/usbhid.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_dynamic.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_dynamic.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> #include <sys/ctype.h> #if USB_DEBUG diff --git a/sys/dev/usb2/core/usb2_request.h b/sys/dev/usb/usb_request.h index 8a360b7..8a360b7 100644 --- a/sys/dev/usb2/core/usb2_request.h +++ b/sys/dev/usb/usb_request.h diff --git a/sys/dev/usb2/include/usb2_revision.h b/sys/dev/usb/usb_revision.h index 06d1b21..06d1b21 100644 --- a/sys/dev/usb2/include/usb2_revision.h +++ b/sys/dev/usb/usb_revision.h diff --git a/sys/dev/usb2/core/usb2_sw_transfer.c b/sys/dev/usb/usb_sw_transfer.c index 23f89ba..984c233 100644 --- a/sys/dev/usb2/core/usb2_sw_transfer.c +++ b/sys/dev/usb/usb_sw_transfer.c @@ -24,23 +24,23 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_debug.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_sw_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_debug.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> /*------------------------------------------------------------------------* * usb2_sw_transfer - factored out code diff --git a/sys/dev/usb2/core/usb2_sw_transfer.h b/sys/dev/usb/usb_sw_transfer.h index d2da0eb..d2da0eb 100644 --- a/sys/dev/usb2/core/usb2_sw_transfer.h +++ b/sys/dev/usb/usb_sw_transfer.h diff --git a/sys/dev/usb2/core/usb2_transfer.c b/sys/dev/usb/usb_transfer.c index 2572b25..df544a7 100644 --- a/sys/dev/usb2/core/usb2_transfer.c +++ b/sys/dev/usb/usb_transfer.c @@ -24,23 +24,23 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_defs.h> #define USB_DEBUG_VAR usb2_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_transfer.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_transfer.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> struct usb2_std_packet_size { struct { diff --git a/sys/dev/usb2/core/usb2_transfer.h b/sys/dev/usb/usb_transfer.h index 34124c5..34124c5 100644 --- a/sys/dev/usb2/core/usb2_transfer.h +++ b/sys/dev/usb/usb_transfer.h diff --git a/sys/dev/usb2/core/usb2_util.c b/sys/dev/usb/usb_util.c index 5dca332..541cd55 100644 --- a/sys/dev/usb2/core/usb2_util.c +++ b/sys/dev/usb/usb_util.c @@ -24,20 +24,20 @@ * SUCH DAMAGE. */ -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_device.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> +#include <dev/usb/usb_defs.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> +#include <dev/usb/usb.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_util.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_device.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> + +#include <dev/usb/usb_controller.h> +#include <dev/usb/usb_bus.h> /* function prototypes */ #if (USB_USE_CONDVAR == 0) diff --git a/sys/dev/usb2/core/usb2_util.h b/sys/dev/usb/usb_util.h index e081c31..e081c31 100644 --- a/sys/dev/usb2/core/usb2_util.h +++ b/sys/dev/usb/usb_util.h diff --git a/sys/dev/usb2/core/usbdevs b/sys/dev/usb/usbdevs index 8fa1cf1..0a3d85e 100644 --- a/sys/dev/usb2/core/usbdevs +++ b/sys/dev/usb/usbdevs @@ -151,6 +151,7 @@ vendor PLANTRONICS 0x047f Plantronics vendor KYOCERA 0x0482 Kyocera Wireless Corp. vendor STMICRO 0x0483 STMicroelectronics vendor FOXCONN 0x0489 Foxconn +vendor MEIZU 0x0492 Meizu Electronics vendor YAMAHA 0x0499 YAMAHA vendor COMPAQ 0x049f Compaq vendor HITACHI 0x04a4 Hitachi @@ -205,7 +206,7 @@ vendor ELAN 0x04f3 Elan vendor NEWNEX 0x04f7 Newnex vendor BROTHER 0x04f9 Brother Industries vendor DALLAS 0x04fa Dallas Semiconductor -vendor SUNPLUS 0x04fc Sunplus +vendor AIPTEK2 0x04fc AIPTEK International vendor PFU 0x04fe PFU vendor FUJIKURA 0x0501 Fujikura/DDK vendor ACER 0x0502 Acer @@ -503,7 +504,7 @@ vendor ADDONICS2 0x0bf6 Addonics Technology vendor FSC 0x0bf8 Fujitsu Siemens Computers vendor AGATE 0x0c08 Agate Technologies vendor DMI 0x0c0b DMI -vendor MICRODIA 0x0c45 Chicony +vendor CHICONY2 0x0c45 Chicony vendor SEALEVEL 0x0c52 Sealevel System vendor LUWEN 0x0c76 Luwen vendor KYOCERA2 0x0c88 Kyocera Wireless Corp. @@ -526,6 +527,7 @@ vendor HAWKING 0x0e66 Hawking vendor FOSSIL 0x0e67 Fossil, Inc vendor GMATE 0x0e7e G.Mate, Inc vendor OTI 0x0ea0 Ours Technology +vendor YISO 0x0eab Yiso Wireless Co. vendor PILOTECH 0x0eaf Pilotech vendor NOVATECH 0x0eb0 NovaTech vendor ITEGNO 0x0eba iTegno @@ -611,7 +613,7 @@ vendor GIGASET 0x1690 Gigaset vendor GLOBALSUN 0x16ab Global Sun Technology vendor ANYDATA 0x16d5 AnyDATA Corporation vendor JABLOTRON 0x16d6 Jablotron -vendor CMOTECH 0x16d8 CMOTECH Co., Ltd. +vendor CMOTECH 0x16d8 C-motech vendor AXESSTEL 0x1726 Axesstel Co., Ltd. vendor LINKSYS4 0x1737 Linksys vendor SENAO 0x1740 Senao @@ -620,6 +622,8 @@ vendor AMIT 0x18c5 AMIT vendor QCOM 0x18e8 Qcom vendor LINKSYS3 0x1915 Linksys vendor QUALCOMMINC 0x19d2 Qualcomm, Incorporated +vendor STELERA 0x1a8d Stelera Wireless +vendor DRESDENELEKTRONIK 0x1cf1 dresden elektronik vendor DLINK 0x2001 D-Link vendor PLANEX2 0x2019 Planex Communications vendor ERICSSON 0x2282 Ericsson @@ -795,7 +799,7 @@ product AINCOMM AWU2000B 0x1001 AWU2000B Wireless Adapter /* AIPTEK products */ product AIPTEK POCKETCAM3M 0x2011 PocketCAM 3Mega -product SUNPLUS PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 +product AIPTEK2 PENCAM_MEGA_1_3 0x504a PenCam Mega 1.3 /* AirPrime products */ product AIRPRIME PC5220 0x0112 CDMA Wireless PC Card @@ -806,6 +810,7 @@ product AKS USBHASP 0x0001 USB-HASP 0.06 /* Alcor Micro, Inc. products */ product ALCOR2 KBD_HUB 0x2802 Kbd Hub +product ALCOR TRANSCEND 0x6387 Transcend JetFlash Drive product ALCOR MA_KBD_HUB 0x9213 MacAlly Kbd Hub product ALCOR AU9814 0x9215 AU9814 Hub product ALCOR UMCR_9361 0x9361 USB Multimedia Card Reader @@ -932,6 +937,7 @@ product BELKIN FBT003V 0x0084 FBT003v2 Bluetooth product BELKIN F5U103 0x0103 F5U103 Serial product BELKIN F5U109 0x0109 F5U109 Serial product BELKIN USB2SCSI 0x0115 USB to SCSI +product BELKIN F8T012 0x0121 F8T012xx1 Bluetooth USB Adapter product BELKIN USB2LAN 0x0121 USB to LAN product BELKIN F5U208 0x0208 F5U208 VideoBus II product BELKIN F5U237 0x0237 F5U237 USB 2.0 7-Port Hub @@ -944,6 +950,7 @@ product BELKIN F5D5055 0x5055 F5D5055 product BELKIN F5D7050 0x7050 F5D7050 Wireless Adapter product BELKIN F5D7051 0x7051 F5D7051 54g USB Network Adapter product BELKIN F5D7050A 0x705a F5D7050A Wireless Adapter +/* Also sold as 'Ativa 802.11g wireless card' */ product BELKIN F5D7050_V4000 0x705c F5D7050 v4000 Wireless Adapter product BELKIN F5D9050V3 0x905b F5D9050 ver 3 Wireless Adapter product BELKIN2 F5U002 0x0002 F5U002 Parallel printer @@ -1005,7 +1012,7 @@ product CHIC CYPRESS 0x0003 Cypress USB Mouse /* Chicony products */ product CHICONY KB8933 0x0001 KB-8933 keyboard -product MICRODIA TWINKLECAM 0x600d TwinkleCam USB camera +product CHICONY2 TWINKLECAM 0x600d TwinkleCam USB camera /* CH Products */ product CHPRODUCTS PROTHROTTLE 0x00f1 Pro Throttle @@ -1023,9 +1030,11 @@ product CISCOLINKSYS WUSB54GR 0x0023 WUSB54GR product CISCOLINKSYS WUSBF54G 0x0024 WUSBF54G /* CMOTECH products */ -product CMOTECH CNU510 0x5141 CMOTECH CDMA Technologies USB modem +product CMOTECH CNU510 0x5141 CDMA Technologies USB modem product CMOTECH CNU550 0x5543 CDMA 2000 1xRTT/1xEVDO USB modem -product CMOTECH CDMA_MODEM1 0x6280 CMOTECH CDMA Technologies USB modem +product CMOTECH CGU628 0x6006 CGU-628 +product CMOTECH CDMA_MODEM1 0x6280 CDMA Technologies USB modem +product CMOTECH DISK 0xf000 disk mode /* Compaq products */ product COMPAQ IPAQPOCKETPC 0x0003 iPAQ PocketPC @@ -1163,6 +1172,9 @@ product DMI CFSM_RW 0xa109 CF/SM Reader/Writer /* DrayTek products */ product DRAYTEK VIGOR550 0x0550 Vigor550 +/* dresden elektronik products */ +product DRESDENELEKTRONIK SENSORTERMINALBOARD 0x0001 SensorTerminalBoard + /* Dynastream Innovations */ product DYNASTREAM ANTDEVBOARD 0x1003 ANT dev board @@ -1235,12 +1247,18 @@ product EPSON STYLUS_895 0x0602 Stylus Photo 895 Card Reader product EPSON CX5400 0x0808 CX5400 scanner product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner -product EPSON 4800 0x0819 CX4800 MP scanner -product EPSON 4200 0x0820 CX4200 MP scanner -product EPSON 5000 0x082b DX-50x0 MFP scanner -product EPSON 6000 0x082e DX-60x0 MFP scanner -product EPSON DX7400 0x0838 DX7400/CX7300 scanner -product EPSON DX8400 0x0839 DX8400 scanner +product EPSON DX3800 0x0818 CX3700/CX3800/DX38x0 MFP scanner +product EPSON 4800 0x0819 CX4700/CX4800/DX48x0 MFP scanner +product EPSON 4200 0x0820 CX4100/CX4200/DX4200 MFP scanner +product EPSON 5000 0x082b CX4900/CX5000/DX50x0 MFP scanner +product EPSON 6000 0x082e CX5900/CX6000/DX60x0 MFP scanner +product EPSON DX4000 0x082f DX4000 MFP scanner +product EPSON DX7400 0x0838 CX7300/CX7400/DX7400 MFP scanner +product EPSON DX8400 0x0839 CX8300/CX8400/DX8400 MFP scanner +product EPSON SX100 0x0841 SX100/NX100 MFP scanner +product EPSON NX300 0x0848 NX300 MFP scanner +product EPSON SX200 0x0849 SX200/SX205 MFP scanner +product EPSON SX400 0x084a SX400/NX400/TX400 MFP scanner /* e-TEK Labs products */ product ETEK 1COM 0x8007 Serial @@ -1276,6 +1294,7 @@ product FTDI UOPTBR 0xe889 USB-RS232 OptoBridge product FTDI EMCU2D 0xe88a Expert mouseCLOCK USB II product FTDI PCMSFU 0xe88b Precision Clock MSF USB product FTDI EMCU2H 0xe88c Expert mouseCLOCK USB II HBG +product FTDI MAXSTREAM 0xee18 Maxstream PKG-U product FTDI USBSERIAL 0xfa00 Matrix Orbital USB Serial product FTDI MX2_3 0xfa01 Matrix Orbital MX2 or MX3 product FTDI MX4_5 0xfa02 Matrix Orbital MX4 or MX5 @@ -1413,6 +1432,7 @@ product HP 840C 0x0604 DeskJet 840c product HP 2200C 0x0605 ScanJet 2200C product HP 5300C 0x0701 Scanjet 5300C product HP 4400C 0x0705 Scanjet 4400C +product HP 4470C 0x0805 Scanjet 4470C product HP 82x0C 0x0b01 Scanjet 82x0C product HP 2300D 0x0b17 Laserjet 2300d product HP 970CSE 0x1004 Deskjet 970Cse @@ -1424,8 +1444,10 @@ product HP P2000U 0x1801 Inkjet P-2000U product HP 640C 0x2004 DeskJet 640c product HP 4670V 0x3005 ScanJet 4670v product HP P1100 0x3102 Photosmart P1100 +product HP OJ4215 0x3d11 OfficeJet 4215 product HP HN210E 0x811c Ethernet HN210E product HP2 C500 0x6002 PhotoSmart C500 +product HP HS2300 0x1e1d hs2300 HSDPA (aka MC8775) /* HTC products */ product HTC WINMOBILE 0x00ce HTC USB Sync @@ -1434,7 +1456,7 @@ product HTC SMARTPHONE 0x0a51 SmartPhone USB Sync /* HUAWEI products */ product HUAWEI MOBILE 0x1001 Huawei Mobile -product HUAWEI E270 0x1003 Huawei HSPA modem +product HUAWEI E220 0x1003 Huawei HSDPA modem /* HUAWEI 3com products */ product HUAWEI3COM WUB320G 0x0009 Aolynk WUB320g @@ -1488,6 +1510,7 @@ product IOMEGA ZIP250 0x0030 Zip 250 /* Ituner networks products */ product ITUNERNET USBLCD2X20 0x0002 USB-LCD 2x20 +product ITUNERNET USBLCD4X20 0xc001 USB-LCD 4x20 /* Jablotron products */ product JABLOTRON PC60B 0x0001 PC-60B @@ -1642,6 +1665,9 @@ product MCT DU_H3SP_USB232 0x0200 D-Link DU-H3SP USB BAY Hub product MCT USB232 0x0210 USB-232 Interface product MCT SITECOM_USB232 0x0230 Sitecom USB-232 Products +/* Meizu Electronics */ +product MEIZU M6_SL 0x0140 MiniPlayer M6 (SL) + /* Melco, Inc products */ product MELCO LUATX1 0x0001 LUA-TX Ethernet product MELCO LUATX5 0x0005 LUA-TX Ethernet @@ -1657,6 +1683,7 @@ product MELCO PCOPRS1 0x00b3 PC-OP-RS1 RemoteStation product MELCO SG54HP 0x00d8 WLI-U2-SG54HP product MELCO G54HP 0x00d9 WLI-U2-G54HP product MELCO KG54L 0x00da WLI-U2-KG54L +product MELCO SG54HG 0x00f4 WLI-U2-SG54HG /* Merlin products */ product MERLIN V620 0x1110 Merlin V620 @@ -1683,9 +1710,6 @@ product MSI RT2573_2 0x6877 RT2573 product MSI RT2573_3 0xa861 RT2573 product MSI RT2573_4 0xa874 RT2573 -/* Microdia products */ -product MICRODIA TWINKLECAM 0x600d TwinkleCam USB camera - /* Microsoft products */ product MICROSOFT SIDEPREC 0x0008 SideWinder Precision Pro product MICROSOFT INTELLIMOUSE 0x0009 IntelliMouse @@ -1700,6 +1724,7 @@ product MICROSOFT MN510 0x006e MN510 Wireless product MICROSOFT MN110 0x007a 10/100 USB NIC product MICROSOFT WLINTELLIMOUSE 0x008c Wireless Optical IntelliMouse product MICROSOFT WLNOTEBOOK 0x00b9 Wireless Optical Mouse (Model 1023) +product MICROSOFT COMFORT3000 0x00d1 Comfort Optical Mouse 3000 (Model 1043) product MICROSOFT WLNOTEBOOK2 0x00e1 Wireless Optical Mouse 3000 (Model 1056) product MICROSOFT WLNOTEBOOK3 0x00d2 Wireless Optical Mouse 3000 (Model 1049) product MICROSOFT WLUSBMOUSE 0x00b9 Wireless USB Mouse @@ -1779,6 +1804,7 @@ product MSYSTEMS DISKONKEY2 0x0011 DiskOnKey /* Myson products */ product MYSON HEDEN 0x8818 USB-IDE +product MYSON STARREADER 0x9920 USB flash card adapter /* National Semiconductor */ product NATIONAL BEARPAW1200 0x1000 BearPaw 1200 @@ -1809,6 +1835,7 @@ product NETGEAR FA120 0x1040 USB 2.0 Ethernet product NETGEAR WG111V2_2 0x4240 PrismGT USB 2.0 WLAN product NETGEAR WG111U 0x4300 WG111U product NETGEAR WG111U_NF 0x4301 WG111U (no firmware) +product NETGEAR WG111V2 0x6a00 WG111V2 product NETGEAR2 MA101 0x4100 MA101 product NETGEAR2 MA101B 0x4102 MA101 Rev B product NETGEAR3 WG111T 0x4250 WG111T @@ -1839,8 +1866,10 @@ product NOVATEL X950D 0x1450 Merlin X950D product NOVATEL ES620 0x2100 ES620 CDMA product NOVATEL U720 0x2110 Merlin U720 product NOVATEL U727 0x4100 Merlin U727 CDMA -product NOVATEL U950D 0x4400 Novatel MC950D HSUPA +product NOVATEL MC950D 0x4400 Novatel MC950D HSUPA product NOVATEL ZEROCD 0x5010 Novatel ZeroCD +product NOVATEL ZEROCD2 0x5030 Novatel ZeroCD +product NOVATEL U760 0x6000 Novatel U760 product NOVATEL2 FLEXPACKGPS 0x0100 NovAtel FlexPack GPS receiver /* Merlin products */ @@ -1855,6 +1884,7 @@ product OMNIVISION OV511 0x0511 OV511 Camera product OMNIVISION OV511PLUS 0xa511 OV511+ Camera /* OnSpec Electronic, Inc. */ +product ONSPEC SDS_HOTFIND_D 0x0400 SDS-infrared.com Hotfind-D Infrared Camera product ONSPEC MDCFE_B_CF_READER 0xa000 MDCFE-B USB CF Reader product ONSPEC CFMS_RW 0xa001 SIIG/Datafab Memory Stick+CF Reader/Writer product ONSPEC READER 0xa003 Datafab-based Reader @@ -1870,7 +1900,9 @@ product OPTION VODAFONEMC3G 0x5000 Vodafone Mobile Connect 3G datacard product OPTION GT3G 0x6000 GlobeTrotter 3G datacard product OPTION GT3GQUAD 0x6300 GlobeTrotter 3G QUAD datacard product OPTION GT3GPLUS 0x6600 GlobeTrotter 3G+ datacard +product OPTION GTICON322 0xd033 GlobeTrotter Icon322 storage product OPTION GTMAX36 0x6701 GlobeTrotter Max 3.6 Modem +product OPTION GTMAXHSUPA 0x7001 GlobeTrotter HSUPA /* OQO */ product OQO WIFI01 0x0002 model 01 WiFi interface @@ -1994,6 +2026,8 @@ product QUALCOMM CDMA_MSM 0x6000 CDMA Technologies MSM phone product QUALCOMM2 RWT_FCT 0x3100 RWT FCT-CDMA 2000 1xRTT modem product QUALCOMM2 CDMA_MSM 0x3196 CDMA Technologies MSM modem product QUALCOMMINC CDMA_MSM 0x0001 CDMA Technologies MSM modem +product QUALCOMMINC ZTE_STOR 0x2000 USB ZTE Storage +product QUALCOMMINC AC8700 0xfffe CDMA 1xEVDO USB modem /* Qtronix products */ product QTRONIX 980N 0x2011 Scorpion-980N keyboard @@ -2018,6 +2052,7 @@ product RALINK RT2573_2 0x9021 RT2501USB Wireless Adapter /* ReakTek products */ /* Green House and CompUSA OEM this part */ product REALTEK USBKR100 0x8150 USBKR100 USB Ethernet +product REALTEK RTL8187 0x8187 RTL8187 Wireless Adapter /* Ricoh products */ product RICOH VGPVCC2 0x1830 VGP-VCC2 Camera @@ -2117,12 +2152,14 @@ product SIERRA AIRCARD595 0x0019 Sierra Wireless AirCard 595 product SIERRA AC595U 0x0120 Sierra Wireless AirCard 595U product SIERRA AC597E 0x0021 Sierra Wireless AirCard 597E product SIERRA C597 0x0023 Sierra Wireless Compass 597 +product SIERRA AC875 0x6820 Sierra Wireless AirCard 875 product SIERRA AC880 0x6850 Sierra Wireless AirCard 880 product SIERRA AC881 0x6851 Sierra Wireless AirCard 881 product SIERRA AC880E 0x6852 Sierra Wireless AirCard 880E product SIERRA AC881E 0x6853 Sierra Wireless AirCard 881E product SIERRA AC880U 0x6855 Sierra Wireless AirCard 880U product SIERRA AC881U 0x6856 Sierra Wireless AirCard 881U +product SIERRA AC885U 0x6880 Sierra Wireless AirCard 885U product SIERRA EM5625 0x0017 EM5625 product SIERRA MC5720 0x0218 MC5720 Wireless Modem product SIERRA MC5720_2 0x0018 MC5720 @@ -2230,6 +2267,7 @@ product SONY CLIE_41 0x009a Sony Clie v4.1 product SONY CLIE_NX60 0x00da Sony Clie nx60 product SONY CLIE_TH55 0x0144 Sony Clie th55 product SONY CLIE_TJ37 0x0169 Sony Clie tj37 +product SONY RF_RECEIVER 0x01db Sony RF mouse/kbd Receiver VGP-WRC1 /* Sony Ericsson products */ product SONYERICSSON DCU10 0x0528 USB Cable @@ -2244,6 +2282,10 @@ product SPARKLAN RT2573 0x0004 RT2573 /* Sphairon Access Systems GmbH products */ product SPHAIRON UB801R 0x0110 UB801R +/* Stelera Wireless products */ +product STELERA ZEROCD 0x1000 Zerocd Installer +product STELERA C105 0x1002 Stelera/Bandrish C105 USB + /* STMicroelectronics products */ product STMICRO BIOCPU 0x2016 Biometric Coprocessor product STMICRO COMMUNICATOR 0x7554 USB Communicator @@ -2448,6 +2490,9 @@ product YAMAHA RTW65I 0x4002 NetVolante RTW65i Broadband&ISDN Wireless Router product YANO U640MO 0x0101 U640MO-03 product YANO FW800HD 0x05fc METALWEAR-HDD +/* Yiso Wireless Co. products */ +product YISO C893 0xc893 CDMA 2000 1xEVDO PC Card + /* Z-Com products */ product ZCOM M4Y750 0x0001 M4Y-750 product ZCOM XI725 0x0002 XI-725/726 diff --git a/sys/dev/usb2/include/usb2_hid.h b/sys/dev/usb/usbhid.h index 1a8650e..db6d370 100644 --- a/sys/dev/usb2/include/usb2_hid.h +++ b/sys/dev/usb/usbhid.h @@ -29,7 +29,7 @@ #ifndef _USB2_HID_H_ #define _USB2_HID_H_ -#include <dev/usb2/include/usb2_endian.h> +#include <dev/usb/usb_endian.h> #define UR_GET_HID_DESCRIPTOR 0x06 #define UDESC_HID 0x21 diff --git a/sys/dev/usb2/wlan/if_rum2.c b/sys/dev/usb/wlan/if_rum.c index 6b702fa..9b903f0 100644 --- a/sys/dev/usb2/wlan/if_rum2.c +++ b/sys/dev/usb/wlan/if_rum.c @@ -27,24 +27,24 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR rum_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/wlan/usb2_wlan.h> -#include <dev/usb2/wlan/if_rumreg.h> -#include <dev/usb2/wlan/if_rumvar.h> -#include <dev/usb2/wlan/if_rumfw.h> +#include <dev/usb/wlan/usb_wlan.h> +#include <dev/usb/wlan/if_rumreg.h> +#include <dev/usb/wlan/if_rumvar.h> +#include <dev/usb/wlan/if_rumfw.h> #if USB_DEBUG static int rum_debug = 0; @@ -109,8 +109,7 @@ static const struct usb2_device_id rum_devs[] = { MODULE_DEPEND(rum, wlan, 1, 1, 1); MODULE_DEPEND(rum, wlan_amrr, 1, 1, 1); -MODULE_DEPEND(rum, usb2_wlan, 1, 1, 1); -MODULE_DEPEND(rum, usb2_core, 1, 1, 1); +MODULE_DEPEND(rum, usb, 1, 1, 1); static device_probe_t rum_match; static device_attach_t rum_attach; diff --git a/sys/dev/usb2/wlan/if_rumfw.h b/sys/dev/usb/wlan/if_rumfw.h index 0f08674..0f08674 100644 --- a/sys/dev/usb2/wlan/if_rumfw.h +++ b/sys/dev/usb/wlan/if_rumfw.h diff --git a/sys/dev/usb2/wlan/if_rumreg.h b/sys/dev/usb/wlan/if_rumreg.h index 75a51bc..75a51bc 100644 --- a/sys/dev/usb2/wlan/if_rumreg.h +++ b/sys/dev/usb/wlan/if_rumreg.h diff --git a/sys/dev/usb2/wlan/if_rumvar.h b/sys/dev/usb/wlan/if_rumvar.h index 1b58dc4..1b58dc4 100644 --- a/sys/dev/usb2/wlan/if_rumvar.h +++ b/sys/dev/usb/wlan/if_rumvar.h diff --git a/sys/dev/usb2/wlan/if_ural2.c b/sys/dev/usb/wlan/if_ural.c index b48cecd..aebffaa 100644 --- a/sys/dev/usb2/wlan/if_ural2.c +++ b/sys/dev/usb/wlan/if_ural.c @@ -29,23 +29,23 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> #define USB_DEBUG_VAR ural_debug -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> -#include <dev/usb2/wlan/usb2_wlan.h> -#include <dev/usb2/wlan/if_uralreg.h> -#include <dev/usb2/wlan/if_uralvar.h> +#include <dev/usb/wlan/usb_wlan.h> +#include <dev/usb/wlan/if_uralreg.h> +#include <dev/usb/wlan/if_uralvar.h> #if USB_DEBUG static int ural_debug = 0; @@ -374,8 +374,7 @@ static driver_t ural_driver = { static devclass_t ural_devclass; DRIVER_MODULE(ural, ushub, ural_driver, ural_devclass, NULL, 0); -MODULE_DEPEND(ural, usb2_wlan, 1, 1, 1); -MODULE_DEPEND(ural, usb2_core, 1, 1, 1); +MODULE_DEPEND(ural, usb, 1, 1, 1); MODULE_DEPEND(ural, wlan, 1, 1, 1); MODULE_DEPEND(ural, wlan_amrr, 1, 1, 1); diff --git a/sys/dev/usb2/wlan/if_uralreg.h b/sys/dev/usb/wlan/if_uralreg.h index 042cf5a..042cf5a 100644 --- a/sys/dev/usb2/wlan/if_uralreg.h +++ b/sys/dev/usb/wlan/if_uralreg.h diff --git a/sys/dev/usb2/wlan/if_uralvar.h b/sys/dev/usb/wlan/if_uralvar.h index c7e5469..c7e5469 100644 --- a/sys/dev/usb2/wlan/if_uralvar.h +++ b/sys/dev/usb/wlan/if_uralvar.h diff --git a/sys/dev/usb2/wlan/if_zyd2.c b/sys/dev/usb/wlan/if_zyd.c index a5b1e2e..1d8b38f 100644 --- a/sys/dev/usb2/wlan/if_zyd2.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -27,21 +27,21 @@ __FBSDID("$FreeBSD$"); */ #include "usbdevs.h" -#include <dev/usb2/include/usb2_standard.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_lookup.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_debug.h> -#include <dev/usb2/core/usb2_request.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/wlan/usb2_wlan.h> -#include <dev/usb2/wlan/if_zydreg.h> -#include <dev/usb2/wlan/if_zydfw.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_mfunc.h> +#include <dev/usb/usb_error.h> + +#include <dev/usb/usb_core.h> +#include <dev/usb/usb_lookup.h> +#include <dev/usb/usb_process.h> +#include <dev/usb/usb_debug.h> +#include <dev/usb/usb_request.h> +#include <dev/usb/usb_busdma.h> +#include <dev/usb/usb_util.h> + +#include <dev/usb/wlan/usb_wlan.h> +#include <dev/usb/wlan/if_zydreg.h> +#include <dev/usb/wlan/if_zydfw.h> #if USB_DEBUG static int zyd_debug = 0; @@ -3116,7 +3116,6 @@ static driver_t zyd_driver = { static devclass_t zyd_devclass; DRIVER_MODULE(zyd, ushub, zyd_driver, zyd_devclass, NULL, 0); -MODULE_DEPEND(zyd, usb2_wlan, 1, 1, 1); -MODULE_DEPEND(zyd, usb2_core, 1, 1, 1); +MODULE_DEPEND(zyd, usb, 1, 1, 1); MODULE_DEPEND(zyd, wlan, 1, 1, 1); MODULE_DEPEND(zyd, wlan_amrr, 1, 1, 1); diff --git a/sys/dev/usb2/wlan/if_zydfw.h b/sys/dev/usb/wlan/if_zydfw.h index 46f5c2a..46f5c2a 100644 --- a/sys/dev/usb2/wlan/if_zydfw.h +++ b/sys/dev/usb/wlan/if_zydfw.h diff --git a/sys/dev/usb2/wlan/if_zydreg.h b/sys/dev/usb/wlan/if_zydreg.h index 8ef34e3..8ef34e3 100644 --- a/sys/dev/usb2/wlan/if_zydreg.h +++ b/sys/dev/usb/wlan/if_zydreg.h diff --git a/sys/dev/usb2/wlan/usb2_wlan.h b/sys/dev/usb/wlan/usb_wlan.h index 9db120e..9db120e 100644 --- a/sys/dev/usb2/wlan/usb2_wlan.h +++ b/sys/dev/usb/wlan/usb_wlan.h diff --git a/sys/dev/usb2/bluetooth/usb2_bluetooth.c b/sys/dev/usb2/bluetooth/usb2_bluetooth.c deleted file mode 100644 index a8c9f54..0000000 --- a/sys/dev/usb2/bluetooth/usb2_bluetooth.c +++ /dev/null @@ -1,31 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/bluetooth/usb2_bluetooth.h> - -MODULE_VERSION(usb2_bluetooth, 1); -MODULE_DEPEND(usb2_bluetooth, usb2_core, 1, 1, 1); diff --git a/sys/dev/usb2/bluetooth/usb2_bluetooth.h b/sys/dev/usb2/bluetooth/usb2_bluetooth.h deleted file mode 100644 index b4b1761..0000000 --- a/sys/dev/usb2/bluetooth/usb2_bluetooth.h +++ /dev/null @@ -1,30 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _USB2_BLUETOOTH_H_ -#define _USB2_BLUETOOTH_H_ - -#endif /* _USB2_BLUETOOTH_H_ */ diff --git a/sys/dev/usb2/controller/uss820dci_pccard.c b/sys/dev/usb2/controller/uss820dci_pccard.c deleted file mode 100644 index f57935d..0000000 --- a/sys/dev/usb2/controller/uss820dci_pccard.c +++ /dev/null @@ -1,266 +0,0 @@ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -/*- - * Copyright (c) 2008 Hans Petter Selasky <hselasky@freebsd.org> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_defs.h> -#include <dev/usb2/include/usb2_standard.h> - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/core/usb2_busdma.h> -#include <dev/usb2/core/usb2_process.h> -#include <dev/usb2/core/usb2_config_td.h> -#include <dev/usb2/core/usb2_sw_transfer.h> -#include <dev/usb2/core/usb2_util.h> - -#include <dev/usb2/controller/usb2_controller.h> -#include <dev/usb2/controller/usb2_bus.h> -#include <dev/usb2/controller/uss820dci.h> - -#include <dev/pccard/pccardreg.h> -#include <dev/pccard/pccardvar.h> - -#include <sys/rman.h> - -static device_probe_t uss820_pccard_probe; -static device_attach_t uss820_pccard_attach; -static device_detach_t uss820_pccard_detach; -static device_suspend_t uss820_pccard_suspend; -static device_resume_t uss820_pccard_resume; -static device_shutdown_t uss820_pccard_shutdown; - -static uint8_t uss820_pccard_lookup(device_t dev); - -static device_method_t uss820dci_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, uss820_pccard_probe), - DEVMETHOD(device_attach, uss820_pccard_attach), - DEVMETHOD(device_detach, uss820_pccard_detach), - DEVMETHOD(device_suspend, uss820_pccard_suspend), - DEVMETHOD(device_resume, uss820_pccard_resume), - DEVMETHOD(device_shutdown, uss820_pccard_shutdown), - - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - - {0, 0} -}; - -static driver_t uss820dci_driver = { - .name = "uss820", - .methods = uss820dci_methods, - .size = sizeof(struct uss820dci_softc), -}; - -static devclass_t uss820dci_devclass; - -DRIVER_MODULE(uss820, pccard, uss820dci_driver, uss820dci_devclass, 0, 0); -MODULE_DEPEND(uss820, usb2_core, 1, 1, 1); - -static const char *const uss820_desc = "USS820 USB Device Controller"; - -static int -uss820_pccard_suspend(device_t dev) -{ - struct uss820dci_softc *sc = device_get_softc(dev); - int err; - - err = bus_generic_suspend(dev); - if (err == 0) { - uss820dci_suspend(sc); - } - return (err); -} - -static int -uss820_pccard_resume(device_t dev) -{ - struct uss820dci_softc *sc = device_get_softc(dev); - int err; - - uss820dci_resume(sc); - - err = bus_generic_resume(dev); - - return (err); -} - -static int -uss820_pccard_shutdown(device_t dev) -{ - struct uss820dci_softc *sc = device_get_softc(dev); - int err; - - err = bus_generic_shutdown(dev); - if (err) - return (err); - - uss820dci_uninit(sc); - - return (0); -} - -static uint8_t -uss820_pccard_lookup(device_t dev) -{ - uint32_t prod; - uint32_t vend; - - pccard_get_vendor(dev, &vend); - pccard_get_product(dev, &prod); - - /* ID's will be added later */ - return (0); -} - -static int -uss820_pccard_probe(device_t dev) -{ - if (uss820_pccard_lookup(dev)) { - device_set_desc(dev, uss820_desc); - return (0); - } - return (ENXIO); -} -static int -uss820_pccard_attach(device_t dev) -{ - struct uss820dci_softc *sc = device_get_softc(dev); - int err; - int rid; - - if (sc == NULL) { - return (ENXIO); - } - /* get all DMA memory */ - - if (usb2_bus_mem_alloc_all(&sc->sc_bus, - USB_GET_DMA_TAG(dev), NULL)) { - return (ENOMEM); - } - rid = 0; - sc->sc_io_res = - bus_alloc_resource_any(dev, SYS_RES_IOPORT, &rid, RF_ACTIVE); - - if (!sc->sc_io_res) { - goto error; - } - sc->sc_io_tag = rman_get_bustag(sc->sc_io_res); - sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res); - sc->sc_io_size = rman_get_size(sc->sc_io_res); - - /* multiply all addresses by 4 */ - sc->sc_reg_shift = 2; - - rid = 0; - sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, - RF_SHAREABLE | RF_ACTIVE); - if (sc->sc_irq_res == NULL) { - goto error; - } - sc->sc_bus.bdev = device_add_child(dev, "usbus", -1); - if (!(sc->sc_bus.bdev)) { - goto error; - } - device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); - - err = usb2_config_td_setup(&sc->sc_config_td, sc, - &sc->sc_bus.mtx, NULL, 0, 4); - if (err) { - device_printf(dev, "could not setup config thread!\n"); - goto error; - } -#if (__FreeBSD_version >= 700031) - err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - NULL, (void *)uss820dci_interrupt, sc, &sc->sc_intr_hdl); -#else - err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, - (void *)uss820dci_interrupt, sc, &sc->sc_intr_hdl); -#endif - if (err) { - sc->sc_intr_hdl = NULL; - goto error; - } - err = uss820dci_init(sc); - if (err) { - device_printf(dev, "Init failed\n"); - goto error; - } - err = device_probe_and_attach(sc->sc_bus.bdev); - if (err) { - device_printf(dev, "USB probe and attach failed\n"); - goto error; - } - return (0); - -error: - uss820_pccard_detach(dev); - return (ENXIO); -} - -static int -uss820_pccard_detach(device_t dev) -{ - struct uss820dci_softc *sc = device_get_softc(dev); - device_t bdev; - int err; - - if (sc->sc_bus.bdev) { - bdev = sc->sc_bus.bdev; - device_detach(bdev); - device_delete_child(dev, bdev); - } - /* during module unload there are lots of children leftover */ - device_delete_all_children(dev); - - if (sc->sc_irq_res && sc->sc_intr_hdl) { - /* - * only call at91_udp_uninit() after at91_udp_init() - */ - uss820dci_uninit(sc); - - err = bus_teardown_intr(dev, sc->sc_irq_res, - sc->sc_intr_hdl); - sc->sc_intr_hdl = NULL; - } - if (sc->sc_irq_res) { - bus_release_resource(dev, SYS_RES_IRQ, 0, - sc->sc_irq_res); - sc->sc_irq_res = NULL; - } - if (sc->sc_io_res) { - bus_release_resource(dev, SYS_RES_IOPORT, 0, - sc->sc_io_res); - sc->sc_io_res = NULL; - } - usb2_config_td_unsetup(&sc->sc_config_td); - - usb2_bus_mem_free_all(&sc->sc_bus, NULL); - - return (0); -} diff --git a/sys/dev/usb2/image/usb2_image.c b/sys/dev/usb2/image/usb2_image.c deleted file mode 100644 index 5f6badb..0000000 --- a/sys/dev/usb2/image/usb2_image.c +++ /dev/null @@ -1,31 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/image/usb2_image.h> - -MODULE_VERSION(usb2_image, 1); -MODULE_DEPEND(usb2_image, usb2_core, 1, 1, 1); diff --git a/sys/dev/usb2/image/usb2_image.h b/sys/dev/usb2/image/usb2_image.h deleted file mode 100644 index ce1526e..0000000 --- a/sys/dev/usb2/image/usb2_image.h +++ /dev/null @@ -1,30 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _USB2_IMAGE_H_ -#define _USB2_IMAGE_H_ - -#endif /* _USB2_IMAGE_H_ */ diff --git a/sys/dev/usb2/input/usb2_input.c b/sys/dev/usb2/input/usb2_input.c deleted file mode 100644 index 56f9ff2..0000000 --- a/sys/dev/usb2/input/usb2_input.c +++ /dev/null @@ -1,31 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/input/usb2_input.h> - -MODULE_VERSION(usb2_input, 1); -MODULE_DEPEND(usb2_input, usb2_core, 1, 1, 1); diff --git a/sys/dev/usb2/input/usb2_input.h b/sys/dev/usb2/input/usb2_input.h deleted file mode 100644 index 0b51853..0000000 --- a/sys/dev/usb2/input/usb2_input.h +++ /dev/null @@ -1,30 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _USB2_INPUT_H_ -#define _USB2_INPUT_H_ - -#endif /* _USB2_INPUT_H_ */ diff --git a/sys/dev/usb2/misc/usb2_misc.c b/sys/dev/usb2/misc/usb2_misc.c deleted file mode 100644 index 74eb6c5..0000000 --- a/sys/dev/usb2/misc/usb2_misc.c +++ /dev/null @@ -1,31 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/misc/usb2_misc.h> - -MODULE_VERSION(usb2_misc, 1); -MODULE_DEPEND(usb2_misc, usb2_core, 1, 1, 1); diff --git a/sys/dev/usb2/misc/usb2_misc.h b/sys/dev/usb2/misc/usb2_misc.h deleted file mode 100644 index dabf9e3..0000000 --- a/sys/dev/usb2/misc/usb2_misc.h +++ /dev/null @@ -1,30 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _USB2_MISC_H_ -#define _USB2_MISC_H_ - -#endif /* _USB2_MISC_H_ */ diff --git a/sys/dev/usb2/ndis/if_ndis_usb2.c b/sys/dev/usb2/ndis/if_ndis_usb2.c deleted file mode 100644 index 3e2aaa2..0000000 --- a/sys/dev/usb2/ndis/if_ndis_usb2.c +++ /dev/null @@ -1,144 +0,0 @@ -/*- - * Copyright (c) 2005 - * Bill Paul <wpaul@windriver.com>. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Bill Paul. - * 4. Neither the name of the author nor the names of any co-contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> - -#include <dev/usb2/core/usb2_core.h> - -#include <sys/socket.h> -#include <sys/rman.h> - -#include <net/if.h> -#include <net/if_arp.h> -#include <net/ethernet.h> -#include <net/if_dl.h> -#include <net/if_media.h> - -#include <net/bpf.h> - -#include <net80211/ieee80211_var.h> - -#include <compat/ndis/pe_var.h> -#include <compat/ndis/cfg_var.h> -#include <compat/ndis/resource_var.h> -#include <compat/ndis/ntoskrnl_var.h> -#include <compat/ndis/ndis_var.h> - -#include <dev/if_ndis/if_ndisvar.h> - -MODULE_DEPEND(ndis, usb2_ndis, 1, 1, 1); -MODULE_DEPEND(ndis, usb2_core, 1, 1, 1); -MODULE_DEPEND(ndis, ndisapi, 1, 1, 1); -MODULE_DEPEND(ndis, if_ndis, 1, 1, 1); - -static device_probe_t ndisusb2_probe; -static device_attach_t ndisusb2_attach; -static struct resource_list *ndis_get_resource_list(device_t, device_t); - -extern device_attach_t ndis_attach; -extern device_shutdown_t ndis_shutdown; -extern device_detach_t ndis_detach; -extern device_suspend_t ndis_suspend; -extern device_resume_t ndis_resume; -extern int ndisdrv_modevent(module_t, int, void *); - -extern unsigned char drv_data[]; - -static device_method_t ndis_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, ndisusb2_probe), - DEVMETHOD(device_attach, ndisusb2_attach), - DEVMETHOD(device_detach, ndis_detach), - DEVMETHOD(device_shutdown, ndis_shutdown), - - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - DEVMETHOD(bus_get_resource_list, ndis_get_resource_list), - - {0, 0} -}; - -static driver_t ndis_driver = { - "ndis", - ndis_methods, - sizeof(struct ndis_softc) -}; - -static devclass_t ndis_devclass; - -DRIVER_MODULE(ndis, ushub, ndis_driver, ndis_devclass, ndisdrv_modevent, 0); - -static int -ndisusb2_probe(device_t dev) -{ - struct usb2_attach_arg *uaa = device_get_ivars(dev); - - if (windrv_lookup(0, "USB Bus") == NULL) { - return (ENXIO); - } - if (uaa->usb2_mode != USB_MODE_HOST) { - return (ENXIO); - } - return (ENXIO); -} - -static int -ndisusb2_attach(device_t dev) -{ - struct ndis_softc *sc = device_get_softc(dev); - driver_object *drv; - - sc->ndis_dev = dev; - - /* Create PDO for this device instance */ - - drv = windrv_lookup(0, "USB Bus"); - windrv_create_pdo(drv, dev); - - if (ndis_attach(dev) != 0) { - return (ENXIO); - } - return (0); /* success */ -} - -static struct resource_list * -ndis_get_resource_list(device_t dev, device_t child) -{ - struct ndis_softc *sc = device_get_softc(dev); - - return (BUS_GET_RESOURCE_LIST(device_get_parent(sc->ndis_dev), dev)); -} diff --git a/sys/dev/usb2/ndis/usb2_ndis.c b/sys/dev/usb2/ndis/usb2_ndis.c deleted file mode 100644 index 1776e0d..0000000 --- a/sys/dev/usb2/ndis/usb2_ndis.c +++ /dev/null @@ -1,31 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/ndis/usb2_ndis.h> - -MODULE_VERSION(usb2_ndis, 1); -MODULE_DEPEND(usb2_ndis, usb2_core, 1, 1, 1); diff --git a/sys/dev/usb2/ndis/usb2_ndis.h b/sys/dev/usb2/ndis/usb2_ndis.h deleted file mode 100644 index 7f187e1..0000000 --- a/sys/dev/usb2/ndis/usb2_ndis.h +++ /dev/null @@ -1,30 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _USB2_NDIS_H_ -#define _USB2_NDIS_H_ - -#endif /* _USB2_NDIS_H_ */ diff --git a/sys/dev/usb2/sound/usb2_sound.c b/sys/dev/usb2/sound/usb2_sound.c deleted file mode 100644 index 0e6994b..0000000 --- a/sys/dev/usb2/sound/usb2_sound.c +++ /dev/null @@ -1,31 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/sound/usb2_sound.h> - -MODULE_VERSION(usb2_sound, 1); -MODULE_DEPEND(usb2_sound, usb2_core, 1, 1, 1); diff --git a/sys/dev/usb2/sound/usb2_sound.h b/sys/dev/usb2/sound/usb2_sound.h deleted file mode 100644 index 5b6ae15..0000000 --- a/sys/dev/usb2/sound/usb2_sound.h +++ /dev/null @@ -1,30 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _USB2_SOUND_H_ -#define _USB2_SOUND_H_ - -#endif /* _USB2_SOUND_H_ */ diff --git a/sys/dev/usb2/storage/usb2_storage.c b/sys/dev/usb2/storage/usb2_storage.c deleted file mode 100644 index c8233ef..0000000 --- a/sys/dev/usb2/storage/usb2_storage.c +++ /dev/null @@ -1,31 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/storage/usb2_storage.h> - -MODULE_VERSION(usb2_storage, 1); -MODULE_DEPEND(usb2_storage, usb2_core, 1, 1, 1); diff --git a/sys/dev/usb2/storage/usb2_storage.h b/sys/dev/usb2/storage/usb2_storage.h deleted file mode 100644 index f40828a..0000000 --- a/sys/dev/usb2/storage/usb2_storage.h +++ /dev/null @@ -1,30 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _USB2_STORAGE_H_ -#define _USB2_STORAGE_H_ - -#endif /* _USB2_STORAGE_H_ */ diff --git a/sys/dev/usb2/wlan/usb2_wlan.c b/sys/dev/usb2/wlan/usb2_wlan.c deleted file mode 100644 index 35c9cbb..0000000 --- a/sys/dev/usb2/wlan/usb2_wlan.c +++ /dev/null @@ -1,31 +0,0 @@ -/* $FreeBSD$ */ -/*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <dev/usb2/core/usb2_core.h> -#include <dev/usb2/wlan/usb2_wlan.h> - -MODULE_VERSION(usb2_wlan, 1); -MODULE_DEPEND(usb2_wlan, usb2_core, 1, 1, 1); |
