PERFORCE change 158138 for review
John Baldwin
jhb at FreeBSD.org
Mon Feb 23 10:51:11 PST 2009
http://perforce.freebsd.org/chv.cgi?CH=158138
Change 158138 by jhb at jhb_jhbbsd on 2009/02/23 18:50:42
IFC @158135
Affected files ...
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#73 integrate
.. //depot/projects/smpng/sys/amd64/conf/USB2#2 integrate
.. //depot/projects/smpng/sys/arm/conf/AVILA#14 integrate
.. //depot/projects/smpng/sys/arm/conf/BWCT#7 integrate
.. //depot/projects/smpng/sys/arm/conf/CAMBRIA#3 integrate
.. //depot/projects/smpng/sys/arm/conf/HL200#7 integrate
.. //depot/projects/smpng/sys/arm/conf/KB920X#14 integrate
.. //depot/projects/smpng/sys/arm/conf/NSLU#6 integrate
.. //depot/projects/smpng/sys/conf/files#229 integrate
.. //depot/projects/smpng/sys/conf/kmod.mk#71 integrate
.. //depot/projects/smpng/sys/dev/usb/README.TXT#1 branch
.. //depot/projects/smpng/sys/dev/usb/bluetooth/TODO.TXT#1 branch
.. //depot/projects/smpng/sys/dev/usb/bluetooth/ng_ubt.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/bluetooth/ng_ubt_var.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/bluetooth/ubtbcmfw.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/at91dci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/at91dci.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/at91dci_atmelarm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/atmegadci_atmelarm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/ehci.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_ixp4xx.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_mbus.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/musb_otg_atmelarm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/ohci.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/ohci_atmelarm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/ohci_pci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/uhci.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/uhci_pci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/controller/uss820dci_atmelarm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/image/uscanner.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/input/uhid.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/input/ums.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/input/usb_rdesc.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/misc/udbp.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_auereg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_axereg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_cdcereg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_cuereg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_kuefw.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_kuereg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_ruereg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/if_udavreg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/uark.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/uftdi_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/umct.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/sound/uaudio.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/sound/uaudio.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/sound/uaudio_pcm.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/sound/uaudio_reg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/storage/ata-usb.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/storage/rio500_usb.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/storage/umass.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/storage/urio.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/template/usb_template.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/template/usb_template.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/template/usb_template_cdce.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/template/usb_template_msc.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/template/usb_template_mtp.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/ufm_ioctl.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb.h#15 branch
.. //depot/projects/smpng/sys/dev/usb/usb_bus.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_busdma.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_busdma.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_cdc.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_controller.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_core.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_core.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_debug.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_debug.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_defs.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_dev.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_dev.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_device.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_device.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_dynamic.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_dynamic.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_endian.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_error.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_error.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_generic.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_generic.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_handle_request.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_handle_request.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_hid.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_hid.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_hub.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_hub.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_if.m#4 branch
.. //depot/projects/smpng/sys/dev/usb/usb_ioctl.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_lookup.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_lookup.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_mbuf.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_mbuf.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_mfunc.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_msctest.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_msctest.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_parse.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_parse.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_pci.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_process.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_process.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_request.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_request.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_revision.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_sw_transfer.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_sw_transfer.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_transfer.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_util.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/usb_util.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/usbdevs#128 branch
.. //depot/projects/smpng/sys/dev/usb/usbhid.h#6 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_rumfw.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_rumreg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_rumvar.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_uralreg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_uralvar.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_zydfw.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/if_zydreg.h#1 branch
.. //depot/projects/smpng/sys/dev/usb/wlan/usb_wlan.h#1 branch
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/TODO.TXT#2 delete
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/ng_ubt2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/ng_ubt2_var.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/ubtbcmfw2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/usb2_bluetooth.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/bluetooth/usb2_bluetooth.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/at91dci.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/at91dci.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/at91dci_atmelarm.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/atmegadci.c#3 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/atmegadci.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/atmegadci_atmelarm.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/ehci2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/ehci2.h#5 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/ehci2_ixp4xx.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/ehci2_mbus.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/ehci2_pci.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg_atmelarm.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/ohci2.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/ohci2.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/ohci2_atmelarm.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/ohci2_pci.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/uhci2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/uhci2.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/uhci2_pci.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/usb2_bus.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/usb2_controller.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/usb2_controller.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/usb2_pci.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci_atmelarm.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/core/README.TXT#2 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_busdma.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_busdma.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_compat_linux.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_compat_linux.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_core.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_core.h#6 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_debug.c#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_debug.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_dev.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_dev.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_device.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_device.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_dynamic.c#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_dynamic.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_error.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_generic.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_generic.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_handle_request.c#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_handle_request.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_hid.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_hid.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_hub.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_hub.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_if.m#2 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_lookup.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_lookup.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_mbuf.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_mbuf.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_msctest.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_msctest.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_parse.c#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_parse.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_process.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_process.h#5 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_request.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_request.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_sw_transfer.c#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_sw_transfer.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_transfer.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_transfer.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_util.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/core/usb2_util.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_aue2.c#8 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_auereg.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_axe2.c#8 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_axereg.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cdce2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cdcereg.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cue2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cuereg.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kue2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kuefw.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kuereg.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_rue2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_ruereg.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_udav2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/if_udavreg.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/usb2_ethernet.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/ethernet/usb2_ethernet.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/image/usb2_image.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/image/usb2_image.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/image/uscanner2.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/include/ufm2_ioctl.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_cdc.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_defs.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_endian.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_error.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_hid.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_ioctl.h#6 delete
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_mfunc.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_revision.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/include/usb2_standard.h#5 delete
.. //depot/projects/smpng/sys/dev/usb2/input/uhid2.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/input/ukbd2.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/input/ums2.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/input/usb2_input.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/input/usb2_input.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/input/usb2_rdesc.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/misc/udbp2.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/misc/udbp2.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/misc/ufm2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/misc/usb2_misc.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/misc/usb2_misc.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/ndis/if_ndis_usb2.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/ndis/usb2_ndis.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/ndis/usb2_ndis.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/quirk/usb2_quirk.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/quirk/usb2_quirk.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/u3g2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/uark2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/ubsa2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/ubser2.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/uchcom2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/ucycom2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/ufoma2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/uftdi2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/uftdi2_reg.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/ugensa2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/uipaq2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/ulpt2.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/umct2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/umodem2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/umoscom2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/uplcom2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/usb2_serial.c#4 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/usb2_serial.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/uslcom2.c#3 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/uvisor2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/serial/uvscom2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2_pcm.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2_reg.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/sound/usb2_sound.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/sound/usb2_sound.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/storage/ata-usb2.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/storage/umass2.c#8 delete
.. //depot/projects/smpng/sys/dev/usb2/storage/urio2.c#6 delete
.. //depot/projects/smpng/sys/dev/usb2/storage/usb2_storage.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/storage/usb2_storage.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/storage/ustorage2_fs.c#5 delete
.. //depot/projects/smpng/sys/dev/usb2/template/usb2_template.c#3 delete
.. //depot/projects/smpng/sys/dev/usb2/template/usb2_template.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/template/usb2_template_cdce.c#3 delete
.. //depot/projects/smpng/sys/dev/usb2/template/usb2_template_msc.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/template/usb2_template_mtp.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2.c#8 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_rumfw.h#2 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_rumreg.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_rumvar.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_ural2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_uralreg.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_uralvar.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_zyd2.c#7 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_zydfw.h#3 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/if_zydreg.h#4 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/usb2_wlan.c#2 delete
.. //depot/projects/smpng/sys/dev/usb2/wlan/usb2_wlan.h#2 delete
.. //depot/projects/smpng/sys/i386/conf/GENERIC#105 integrate
.. //depot/projects/smpng/sys/i386/conf/USB2#2 integrate
.. //depot/projects/smpng/sys/i386/conf/XBOX#11 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC#65 integrate
.. //depot/projects/smpng/sys/modules/Makefile#156 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubt/Makefile#8 integrate
.. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#7 integrate
.. //depot/projects/smpng/sys/modules/sound/driver/uaudio/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/usb/Makefile#13 branch
.. //depot/projects/smpng/sys/modules/usb/at91dci/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/atmegadci/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/aue/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/axe/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/cdce/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/cue/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ehci/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/kue/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/musb/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ohci/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/quirk/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/rue/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/rum/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/template/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/u3g/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uark/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ubsa/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ubser/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uchcom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ucom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ucycom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/udav/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/udbp/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uether/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ufm/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ufoma/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uftdi/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ugensa/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uhci/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uhid/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uipaq/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ukbd/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ulpt/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/umass/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/umct/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/umodem/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/umoscom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ums/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uplcom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/ural/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/urio/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/usb/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uscanner/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/usfs/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uslcom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uss820dci/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uvisor/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/uvscom/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb/zyd/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/usb2/Makefile#6 delete
.. //depot/projects/smpng/sys/modules/usb2/bluetooth/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/bluetooth_fw/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/bluetooth_ng/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/controller/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/controller_at91dci/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/controller_atmegadci/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/controller_ehci/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/controller_musb/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/controller_ohci/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/controller_uhci/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/controller_uss820dci/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/core/Makefile#4 delete
.. //depot/projects/smpng/sys/modules/usb2/ethernet/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/ethernet_aue/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/ethernet_axe/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/ethernet_cdce/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/ethernet_cue/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/ethernet_dav/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/ethernet_kue/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/ethernet_rue/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/image/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/input/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/input_hid/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/input_kbd/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/input_ms/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/misc/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/misc_dbp/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/misc_fm/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/ndis/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/quirk/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/scanner/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_3g/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_ark/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_bsa/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_bser/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_chcom/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_cycom/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_foma/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_ftdi/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_gensa/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_ipaq/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_lpt/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_mct/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_modem/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_moscom/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_plcom/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_slcom/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_visor/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/serial_vscom/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/sound/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/storage/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/storage_ata/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/storage_fs/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/storage_mass/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/storage_rio/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/template/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/wlan/Makefile#2 delete
.. //depot/projects/smpng/sys/modules/usb2/wlan_ral/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/wlan_rum/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/usb2/wlan_zyd/Makefile#3 delete
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#81 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#55 integrate
.. //depot/projects/smpng/sys/powerpc/conf/MPC85XX#5 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#89 integrate
.. //depot/projects/smpng/sys/sun4v/conf/GENERIC#14 integrate
Differences ...
==== //depot/projects/smpng/sys/amd64/conf/GENERIC#73 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.520 2009/02/15 23:40:37 svn Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.521 2009/02/23 18:34:56 thompsa Exp $
cpu HAMMER
ident GENERIC
@@ -281,97 +281,38 @@
# Note that 'bpf' is required for DHCP.
device bpf # Berkeley packet filter
-# USB core support
-device usb2_core
-# USB controller support
-device usb2_controller
-device usb2_controller_ehci
-device usb2_controller_ohci
-device usb2_controller_uhci
-# USB mass storage support
-device usb2_storage
-device usb2_storage_mass
-# USB ethernet support, requires miibus
-device usb2_ethernet
-device usb2_ethernet_aue
-device usb2_ethernet_axe
-device usb2_ethernet_cdce
-device usb2_ethernet_cue
-device usb2_ethernet_kue
-device usb2_ethernet_rue
-device usb2_ethernet_dav
-# USB wireless LAN support
-device usb2_wlan
-device usb2_wlan_rum
-device usb2_wlan_ral
-device usb2_wlan_zyd
-# USB serial device support
-device usb2_serial
-device usb2_serial_ark
-device usb2_serial_bsa
-device usb2_serial_bser
-device usb2_serial_chcom
-device usb2_serial_cycom
-device usb2_serial_foma
-device usb2_serial_ftdi
-device usb2_serial_gensa
-device usb2_serial_ipaq
-device usb2_serial_lpt
-device usb2_serial_mct
-device usb2_serial_modem
-device usb2_serial_moscom
-device usb2_serial_plcom
-device usb2_serial_slcom
-device usb2_serial_visor
-device usb2_serial_vscom
-# USB bluetooth support
-#device usb2_bluetooth
-#device usb2_bluetooth_ng
-# USB input device support
-device usb2_input
-device usb2_input_hid
-device usb2_input_kbd
-device usb2_input_ms
-# USB sound and MIDI device support
-#device usb2_sound
-# USB scanner support
-device usb2_image
-device usb2_scanner
-
-# USB support (deprecated)
-#device uhci # UHCI PCI->USB interface
-#device ohci # OHCI PCI->USB interface
-#device ehci # EHCI PCI->USB interface (USB 2.0)
-#device usb # USB Bus (required)
+# USB support
+device uhci # UHCI PCI->USB interface
+device ohci # OHCI PCI->USB interface
+device ehci # EHCI PCI->USB interface (USB 2.0)
+device usb # USB Bus (required)
#device udbp # USB Double Bulk Pipe devices
-#device ugen # Generic
-#device uhid # "Human Interface Devices"
-#device ukbd # Keyboard
-#device ulpt # Printer
-#device umass # Disks/Mass storage - Requires scbus and da
-#device ums # Mouse
-#device ural # Ralink Technology RT2500USB wireless NICs
-#device rum # Ralink Technology RT2501USB wireless NICs
-#device urio # Diamond Rio 500 MP3 player
-#device uscanner # Scanners
+device uhid # "Human Interface Devices"
+device ukbd # Keyboard
+device ulpt # Printer
+device umass # Disks/Mass storage - Requires scbus and da
+device ums # Mouse
+device ural # Ralink Technology RT2500USB wireless NICs
+device rum # Ralink Technology RT2501USB wireless NICs
+device urio # Diamond Rio 500 MP3 player
+device uscanner # Scanners
# USB Serial devices
-#device ucom # Generic com ttys
-#device uark # Technologies ARK3116 based serial adapters
-#device ubsa # Belkin F5U103 and compatible serial adapters
-#device uftdi # For FTDI usb serial adapters
-#device uipaq # Some WinCE based devices
-#device uplcom # Prolific PL-2303 serial adapters
-#device uslcom # SI Labs CP2101/CP2102 serial adapters
-#device uvisor # Visor and Palm devices
-#device uvscom # USB serial support for DDI pocket's PHS
+device uark # Technologies ARK3116 based serial adapters
+device ubsa # Belkin F5U103 and compatible serial adapters
+device uftdi # For FTDI usb serial adapters
+device uipaq # Some WinCE based devices
+device uplcom # Prolific PL-2303 serial adapters
+device uslcom # SI Labs CP2101/CP2102 serial adapters
+device uvisor # Visor and Palm devices
+device uvscom # USB serial support for DDI pocket's PHS
# USB Ethernet, requires miibus
-#device aue # ADMtek USB Ethernet
-#device axe # ASIX Electronics USB Ethernet
-#device cdce # Generic USB over Ethernet
-#device cue # CATC USB Ethernet
-#device kue # Kawasaki LSI USB Ethernet
-#device rue # RealTek RTL8150 USB Ethernet
-#device udav # Davicom DM9601E USB
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cdce # Generic USB over Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
+device rue # RealTek RTL8150 USB Ethernet
+device udav # Davicom DM9601E USB
# FireWire support
device firewire # FireWire bus code
==== //depot/projects/smpng/sys/amd64/conf/USB2#2 (text+ko) ====
@@ -2,7 +2,7 @@
# USB2 -- Generic kernel configuration file for FreeBSD/amd64 with USBng
# stack.
#
-# $FreeBSD: src/sys/amd64/conf/USB2,v 1.3 2009/01/13 19:05:10 thompsa Exp $
+# $FreeBSD: src/sys/amd64/conf/USB2,v 1.4 2009/02/23 18:34:56 thompsa Exp $
include GENERIC
@@ -13,7 +13,6 @@
nodevice ohci
nodevice ehci
nodevice usb
-nodevice ugen
nodevice uhid
nodevice ukbd
nodevice ulpt
@@ -25,7 +24,6 @@
nodevice urio
nodevice uscanner
# USB Serial devices
-nodevice ucom
nodevice u3g
nodevice uark
nodevice ubsa
==== //depot/projects/smpng/sys/arm/conf/AVILA#14 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/AVILA,v 1.23 2009/02/18 01:37:57 sam Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.24 2009/02/23 18:34:56 thompsa Exp $
ident AVILA
@@ -133,7 +133,6 @@
#options USB_DEBUG
device ohci
device ehci
-device ugen
#device umass
#device scbus # SCSI bus (required for SCSI)
#device da # Direct Access (disks)
==== //depot/projects/smpng/sys/arm/conf/BWCT#7 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/BWCT,v 1.8 2008/11/30 17:53:19 sam Exp $
+# $FreeBSD: src/sys/arm/conf/BWCT,v 1.9 2009/02/23 18:34:56 thompsa Exp $
ident BWCT
@@ -108,7 +108,6 @@
#options USB_DEBUG
#device ohci
#device usb
-#device ugen
#device umass # Disks/Mass storage - Requires scbus and da
#device at91_qdmmc
==== //depot/projects/smpng/sys/arm/conf/CAMBRIA#3 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.3 2009/02/18 01:37:57 sam Exp $
+# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.4 2009/02/23 18:34:56 thompsa Exp $
ident CAMBRIA
@@ -103,7 +103,6 @@
options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
#options USB_DEBUG
device ehci
-device ugen
device umass
device scbus # SCSI bus (required for SCSI)
device da # Direct Access (disks)
==== //depot/projects/smpng/sys/arm/conf/HL200#7 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/HL200,v 1.8 2008/12/27 19:03:57 bz Exp $
+# $FreeBSD: src/sys/arm/conf/HL200,v 1.9 2009/02/23 18:34:56 thompsa Exp $
ident HL200
@@ -97,7 +97,6 @@
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
#device udbp # USB Double Bulk Pipe devices
-device ugen # Generic
device uhid # "Human Interface Devices"
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
@@ -115,7 +114,6 @@
device rue # RealTek RTL8150 USB Ethernet
device udav
# usb serial
-device ucom
device uark
device ubsa
#device ubser # not yet converted.
==== //depot/projects/smpng/sys/arm/conf/KB920X#14 (text) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/KB920X,v 1.21 2008/11/30 17:53:19 sam Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.22 2009/02/23 18:34:56 thompsa Exp $
ident KB920X
@@ -98,7 +98,6 @@
device ohci # OHCI localbus->USB interface
device usb # USB Bus (required)
#device udbp # USB Double Bulk Pipe devices
-device ugen # Generic
device uhid # "Human Interface Devices"
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
@@ -116,7 +115,6 @@
device rue # RealTek RTL8150 USB Ethernet
device udav
# usb serial
-device ucom
device uark
device ubsa
device uftdi
==== //depot/projects/smpng/sys/arm/conf/NSLU#6 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/NSLU,v 1.5 2008/12/28 11:04:24 bz Exp $
+# $FreeBSD: src/sys/arm/conf/NSLU,v 1.6 2009/02/23 18:34:56 thompsa Exp $
ident NSLU
@@ -112,7 +112,6 @@
options USB_DEBUG
device ohci
device ehci
-device ugen
device umass
device scbus # SCSI bus (required for SCSI)
device da # Direct Access (disks)
==== //depot/projects/smpng/sys/conf/files#229 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1371 2009/02/18 06:33:10 thompsa Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1372 2009/02/23 18:34:56 thompsa Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -80,12 +80,12 @@
compile-with "${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \
no-obj no-implicit-rule before-depend \
clean "teken_state.h"
-usbdevs.h optional usb | usb2_core \
+usbdevs.h optional usb | ousb \
dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \
no-obj no-implicit-rule before-depend \
clean "usbdevs.h"
-usbdevs_data.h optional usb | usb2_core \
+usbdevs_data.h optional usb | ousb \
dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \
no-obj no-implicit-rule before-depend \
@@ -502,7 +502,7 @@
dev/ata/chipsets/ata-via.c optional ata pci | atavia
dev/ata/ata-disk.c optional atadisk
dev/ata/ata-raid.c optional ataraid
-dev/ata/ata-usb.c optional atausb
+dev/ata/ata-usb.c optional atausb ousb
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
dev/ata/atapi-tape.c optional atapist
@@ -1393,9 +1393,9 @@
dev/sound/pcm/sndstat.c optional sound
dev/sound/pcm/sound.c optional sound
dev/sound/pcm/vchan.c optional sound
-#dev/sound/usb/upcm.c optional snd_upcm usb
-dev/sound/usb/uaudio.c optional snd_uaudio usb
-dev/sound/usb/uaudio_pcm.c optional snd_uaudio usb
+#dev/sound/usb/upcm.c optional snd_upcm ousb
+dev/sound/usb/uaudio.c optional snd_uaudio ousb
+dev/sound/usb/uaudio_pcm.c optional snd_uaudio ousb
dev/sound/midi/midi.c optional sound
dev/sound/midi/mpu401.c optional sound
dev/sound/midi/mpu_if.m optional sound
@@ -1478,200 +1478,188 @@
dev/ubsec/ubsec.c optional ubsec
#
# USB support
-dev/usb/ehci.c optional ehci
-dev/usb/ehci_ddb.c optional ehci
-dev/usb/ehci_pci.c optional ehci pci
-dev/usb/hid.c optional usb
-dev/usb/if_aue.c optional aue
-dev/usb/if_axe.c optional axe
-dev/usb/if_cdce.c optional cdce
-dev/usb/if_cue.c optional cue
-dev/usb/if_kue.c optional kue
-dev/usb/if_ural.c optional ural
-dev/usb/if_rue.c optional rue
-dev/usb/if_rum.c optional rum
-dev/usb/if_udav.c optional udav
-dev/usb/if_zyd.c optional zyd
-dev/usb/ohci.c optional ohci
-dev/usb/ohci_pci.c optional ohci pci
-dev/usb/sl811hs.c optional slhci
-dev/usb/slhci_pccard.c optional slhci pccard
-dev/usb/uark.c optional uark
-dev/usb/u3g.c optional u3g
-dev/usb/ubsa.c optional ubsa
-dev/usb/ubser.c optional ubser
-dev/usb/ucom.c optional ucom
-dev/usb/ucycom.c optional ucycom
-dev/usb/udbp.c optional udbp
-dev/usb/ufoma.c optional ufoma
-dev/usb/ufm.c optional ufm
-dev/usb/uftdi.c optional uftdi
-dev/usb/ugen.c optional ugen
-dev/usb/uhci.c optional uhci
-dev/usb/uhci_pci.c optional uhci pci
-dev/usb/uhid.c optional uhid
-dev/usb/uhub.c optional usb
-dev/usb/uipaq.c optional uipaq
-dev/usb/ukbd.c optional ukbd
-dev/usb/ulpt.c optional ulpt
-dev/usb/umass.c optional umass
-dev/usb/umct.c optional umct
-dev/usb/umodem.c optional umodem
-dev/usb/ums.c optional ums
-dev/usb/uplcom.c optional uplcom
-dev/usb/urio.c optional urio
-dev/usb/usb.c optional usb
-dev/usb/usb_ethersubr.c optional usb
-dev/usb/usb_if.m optional usb
-dev/usb/usb_mem.c optional usb
-dev/usb/usb_quirks.c optional usb
-dev/usb/usb_subr.c optional usb
-dev/usb/usbdi.c optional usb
-dev/usb/usbdi_util.c optional usb
-dev/usb/uscanner.c optional uscanner
-dev/usb/uslcom.c optional uslcom
-dev/usb/uvisor.c optional uvisor
-dev/usb/uvscom.c optional uvscom
+legacy/dev/usb/ehci.c optional oehci
+legacy/dev/usb/ehci_ddb.c optional oehci
+legacy/dev/usb/ehci_pci.c optional oehci pci
+legacy/dev/usb/hid.c optional ousb
+legacy/dev/usb/if_aue.c optional oaue
+legacy/dev/usb/if_axe.c optional oaxe
+legacy/dev/usb/if_cdce.c optional ocdce
+legacy/dev/usb/if_cue.c optional ocue
+legacy/dev/usb/if_kue.c optional okue
+legacy/dev/usb/if_ural.c optional oural
+legacy/dev/usb/if_rue.c optional orue
+legacy/dev/usb/if_rum.c optional orum
+legacy/dev/usb/if_udav.c optional oudav
+legacy/dev/usb/if_zyd.c optional ozyd
+legacy/dev/usb/ohci.c optional oohci
+legacy/dev/usb/ohci_pci.c optional oohci pci
+legacy/dev/usb/sl811hs.c optional oslhci
+legacy/dev/usb/slhci_pccard.c optional oslhci pccard
+legacy/dev/usb/uark.c optional ouark
+legacy/dev/usb/u3g.c optional ou3g
+legacy/dev/usb/ubsa.c optional oubsa
+legacy/dev/usb/ubser.c optional oubser
+legacy/dev/usb/ucom.c optional oucom
+legacy/dev/usb/ucycom.c optional oucycom
+legacy/dev/usb/udbp.c optional oudbp
+legacy/dev/usb/ufoma.c optional oufoma
+legacy/dev/usb/ufm.c optional oufm
+legacy/dev/usb/uftdi.c optional ouftdi
+legacy/dev/usb/ugen.c optional ougen
+legacy/dev/usb/uhci.c optional ouhci
+legacy/dev/usb/uhci_pci.c optional ouhci pci
+legacy/dev/usb/uhid.c optional ouhid
+legacy/dev/usb/uhub.c optional ousb
+legacy/dev/usb/uipaq.c optional ouipaq
+legacy/dev/usb/ukbd.c optional oukbd
+legacy/dev/usb/ulpt.c optional oulpt
+legacy/dev/usb/umass.c optional oumass
+legacy/dev/usb/umct.c optional oumct
+legacy/dev/usb/umodem.c optional oumodem
+legacy/dev/usb/ums.c optional oums
+legacy/dev/usb/uplcom.c optional ouplcom
+legacy/dev/usb/urio.c optional ourio
+legacy/dev/usb/usb.c optional ousb
+legacy/dev/usb/usb_ethersubr.c optional ousb
+legacy/dev/usb/usb_if.m optional ousb
+legacy/dev/usb/usb_mem.c optional ousb
+legacy/dev/usb/usb_quirks.c optional ousb
+legacy/dev/usb/usb_subr.c optional ousb
+legacy/dev/usb/usbdi.c optional ousb
+legacy/dev/usb/usbdi_util.c optional ousb
+legacy/dev/usb/uscanner.c optional ouscanner
+legacy/dev/usb/uslcom.c optional ouslcom
+legacy/dev/usb/uvisor.c optional ouvisor
+legacy/dev/usb/uvscom.c optional ouvscom
#
-# USB2 controller drivers
+# USB controller drivers
#
-dev/usb2/controller/at91dci.c optional usb2_core usb2_controller usb2_controller_at91dci
-dev/usb2/controller/at91dci_atmelarm.c optional usb2_core usb2_controller usb2_controller_at91dci at91rm9200
-dev/usb2/controller/musb2_otg.c optional usb2_core usb2_controller usb2_controller_musb
-dev/usb2/controller/musb2_otg_atmelarm.c optional usb2_core usb2_controller usb2_controller_musb at91rm9200
-dev/usb2/controller/ehci2.c optional usb2_core usb2_controller usb2_controller_ehci
-dev/usb2/controller/ehci2_pci.c optional usb2_core usb2_controller usb2_controller_ehci pci
-dev/usb2/controller/ohci2.c optional usb2_core usb2_controller usb2_controller_ohci
-dev/usb2/controller/ohci2_atmelarm.c optional usb2_core usb2_controller usb2_controller_ohci at91rm9200
-dev/usb2/controller/ohci2_pci.c optional usb2_core usb2_controller usb2_controller_ohci pci
-dev/usb2/controller/uhci2.c optional usb2_core usb2_controller usb2_controller_uhci
-dev/usb2/controller/uhci2_pci.c optional usb2_core usb2_controller usb2_controller_uhci pci
-dev/usb2/controller/uss820dci.c optional usb2_core usb2_controller usb2_controller_uss820dci
-dev/usb2/controller/uss820dci_atmelarm.c optional usb2_core usb2_controller usb2_controller_uss820dci at91rm9200
-dev/usb2/controller/usb2_controller.c optional usb2_core usb2_controller
+dev/usb/controller/at91dci.c optional at91dci
+dev/usb/controller/at91dci_atmelarm.c optional at91dci at91rm9200
+dev/usb/controller/musb_otg.c optional musb
+dev/usb/controller/musb_otg_atmelarm.c optional musb at91rm9200
+dev/usb/controller/ehci.c optional ehci
+dev/usb/controller/ehci_pci.c optional ehci pci
+dev/usb/controller/ohci.c optional ohci
+dev/usb/controller/ohci_atmelarm.c optional ohci at91rm9200
+dev/usb/controller/ohci_pci.c optional ohci pci
+dev/usb/controller/uhci.c optional uhci
+dev/usb/controller/uhci_pci.c optional uhci pci
+dev/usb/controller/uss820dci.c optional uss820dci
+dev/usb/controller/uss820dci_atmelarm.c optional uss820dci at91rm9200
+dev/usb/controller/usb_controller.c optional usb
#
-# USB2 storage drivers
+# USB storage drivers
#
-dev/usb2/storage/ata-usb2.c optional usb2_core usb2_storage usb2_storage_ata
-dev/usb2/storage/umass2.c optional usb2_core usb2_storage usb2_storage_mass
-dev/usb2/storage/urio2.c optional usb2_core usb2_storage usb2_storage_rio
-dev/usb2/storage/usb2_storage.c optional usb2_core usb2_storage
-dev/usb2/storage/ustorage2_fs.c optional usb2_core usb2_storage usb2_storage_fs
+dev/usb/storage/ata-usb.c optional atausb
+dev/usb/storage/umass.c optional umass
+dev/usb/storage/urio.c optional urio
+dev/usb/storage/ustorage_fs.c optional usfs
#
-# USB2 NDIS driver
+# USB core
#
-dev/usb2/ndis/if_ndis_usb2.c optional usb2_core usb2_ndis
-dev/usb2/ndis/usb2_ndis.c optional usb2_core usb2_ndis
+dev/usb/usb_busdma.c optional usb
+dev/usb/usb_compat_linux.c optional usb
+dev/usb/usb_core.c optional usb
+dev/usb/usb_debug.c optional usb
+dev/usb/usb_dev.c optional usb
+dev/usb/usb_device.c optional usb
+dev/usb/usb_dynamic.c optional usb
+dev/usb/usb_error.c optional usb
+dev/usb/usb_generic.c optional usb
+dev/usb/usb_handle_request.c optional usb
+dev/usb/usb_hid.c optional usb
+dev/usb/usb_hub.c optional usb
+dev/usb/usb_if.m optional usb
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list