Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Feb 2009 18:31:01 +0000 (UTC)
From:      Andrew Thompson <thompsa@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r188942 - in head/sys/dev: usb usb/bluetooth usb/controller usb/image usb/input usb/misc usb/net usb/quirk usb/serial usb/sound usb/storage usb/template usb/wlan usb2
Message-ID:  <200902231831.n1NIV1tj032376@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: thompsa
Date: Mon Feb 23 18:31:00 2009
New Revision: 188942
URL: http://svn.freebsd.org/changeset/base/188942

Log:
  Move the new USB stack into its new home.

Added:
  head/sys/dev/usb/
  head/sys/dev/usb/README.TXT   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/README.TXT
  head/sys/dev/usb/bluetooth/
  head/sys/dev/usb/bluetooth/TODO.TXT   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/bluetooth/TODO.TXT
  head/sys/dev/usb/bluetooth/ng_ubt.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/bluetooth/ng_ubt2.c
  head/sys/dev/usb/bluetooth/ng_ubt_var.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/bluetooth/ng_ubt2_var.h
  head/sys/dev/usb/bluetooth/ubtbcmfw.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/bluetooth/ubtbcmfw2.c
  head/sys/dev/usb/controller/
  head/sys/dev/usb/controller/at91dci.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/at91dci.c
  head/sys/dev/usb/controller/at91dci.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/controller/at91dci.h
  head/sys/dev/usb/controller/at91dci_atmelarm.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/at91dci_atmelarm.c
  head/sys/dev/usb/controller/atmegadci.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/atmegadci.c
  head/sys/dev/usb/controller/atmegadci.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/controller/atmegadci.h
  head/sys/dev/usb/controller/atmegadci_atmelarm.c   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/controller/atmegadci_atmelarm.c
  head/sys/dev/usb/controller/ehci.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/ehci2.c
  head/sys/dev/usb/controller/ehci.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/controller/ehci2.h
  head/sys/dev/usb/controller/ehci_ixp4xx.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/ehci2_ixp4xx.c
  head/sys/dev/usb/controller/ehci_mbus.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/ehci2_mbus.c
  head/sys/dev/usb/controller/ehci_pci.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/ehci2_pci.c
  head/sys/dev/usb/controller/musb_otg.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/musb2_otg.c
  head/sys/dev/usb/controller/musb_otg.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/controller/musb2_otg.h
  head/sys/dev/usb/controller/musb_otg_atmelarm.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/musb2_otg_atmelarm.c
  head/sys/dev/usb/controller/ohci.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/ohci2.c
  head/sys/dev/usb/controller/ohci.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/controller/ohci2.h
  head/sys/dev/usb/controller/ohci_atmelarm.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/ohci2_atmelarm.c
  head/sys/dev/usb/controller/ohci_pci.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/ohci2_pci.c
  head/sys/dev/usb/controller/uhci.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/uhci2.c
  head/sys/dev/usb/controller/uhci.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/controller/uhci2.h
  head/sys/dev/usb/controller/uhci_pci.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/uhci2_pci.c
  head/sys/dev/usb/controller/usb_controller.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/usb2_controller.c
  head/sys/dev/usb/controller/uss820dci.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/uss820dci.c
  head/sys/dev/usb/controller/uss820dci.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/controller/uss820dci.h
  head/sys/dev/usb/controller/uss820dci_atmelarm.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/controller/uss820dci_atmelarm.c
  head/sys/dev/usb/image/
  head/sys/dev/usb/image/uscanner.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/image/uscanner2.c
  head/sys/dev/usb/input/
  head/sys/dev/usb/input/uhid.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/input/uhid2.c
  head/sys/dev/usb/input/ukbd.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/input/ukbd2.c
  head/sys/dev/usb/input/ums.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/input/ums2.c
  head/sys/dev/usb/input/usb_rdesc.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/input/usb2_rdesc.h
  head/sys/dev/usb/misc/
  head/sys/dev/usb/misc/udbp.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/misc/udbp2.c
  head/sys/dev/usb/misc/udbp.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/misc/udbp2.h
  head/sys/dev/usb/misc/ufm.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/misc/ufm2.c
  head/sys/dev/usb/net/
  head/sys/dev/usb/net/if_aue.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/ethernet/if_aue2.c
  head/sys/dev/usb/net/if_auereg.h
     - copied unchanged from r188941, head/sys/dev/usb2/ethernet/if_auereg.h
  head/sys/dev/usb/net/if_axe.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/ethernet/if_axe2.c
  head/sys/dev/usb/net/if_axereg.h
     - copied unchanged from r188941, head/sys/dev/usb2/ethernet/if_axereg.h
  head/sys/dev/usb/net/if_cdce.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/ethernet/if_cdce2.c
  head/sys/dev/usb/net/if_cdcereg.h
     - copied unchanged from r188941, head/sys/dev/usb2/ethernet/if_cdcereg.h
  head/sys/dev/usb/net/if_cue.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/ethernet/if_cue2.c
  head/sys/dev/usb/net/if_cuereg.h
     - copied unchanged from r188941, head/sys/dev/usb2/ethernet/if_cuereg.h
  head/sys/dev/usb/net/if_kue.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/ethernet/if_kue2.c
  head/sys/dev/usb/net/if_kuefw.h
     - copied unchanged from r188941, head/sys/dev/usb2/ethernet/if_kuefw.h
  head/sys/dev/usb/net/if_kuereg.h
     - copied unchanged from r188941, head/sys/dev/usb2/ethernet/if_kuereg.h
  head/sys/dev/usb/net/if_rue.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/ethernet/if_rue2.c
  head/sys/dev/usb/net/if_ruereg.h
     - copied unchanged from r188941, head/sys/dev/usb2/ethernet/if_ruereg.h
  head/sys/dev/usb/net/if_udav.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/ethernet/if_udav2.c
  head/sys/dev/usb/net/if_udavreg.h
     - copied unchanged from r188941, head/sys/dev/usb2/ethernet/if_udavreg.h
  head/sys/dev/usb/net/usb_ethernet.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/ethernet/usb2_ethernet.c
  head/sys/dev/usb/net/usb_ethernet.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/ethernet/usb2_ethernet.h
  head/sys/dev/usb/quirk/
  head/sys/dev/usb/quirk/usb_quirk.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/quirk/usb2_quirk.c
  head/sys/dev/usb/quirk/usb_quirk.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/quirk/usb2_quirk.h
  head/sys/dev/usb/serial/
  head/sys/dev/usb/serial/u3g.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/u3g2.c
  head/sys/dev/usb/serial/uark.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/uark2.c
  head/sys/dev/usb/serial/ubsa.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/ubsa2.c
  head/sys/dev/usb/serial/ubser.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/ubser2.c
  head/sys/dev/usb/serial/uchcom.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/uchcom2.c
  head/sys/dev/usb/serial/ucycom.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/ucycom2.c
  head/sys/dev/usb/serial/ufoma.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/ufoma2.c
  head/sys/dev/usb/serial/uftdi.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/uftdi2.c
  head/sys/dev/usb/serial/uftdi_reg.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/serial/uftdi2_reg.h
  head/sys/dev/usb/serial/ugensa.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/ugensa2.c
  head/sys/dev/usb/serial/uipaq.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/uipaq2.c
  head/sys/dev/usb/serial/ulpt.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/ulpt2.c
  head/sys/dev/usb/serial/umct.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/umct2.c
  head/sys/dev/usb/serial/umodem.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/umodem2.c
  head/sys/dev/usb/serial/umoscom.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/umoscom2.c
  head/sys/dev/usb/serial/uplcom.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/uplcom2.c
  head/sys/dev/usb/serial/usb_serial.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/usb2_serial.c
  head/sys/dev/usb/serial/usb_serial.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/serial/usb2_serial.h
  head/sys/dev/usb/serial/uslcom.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/uslcom2.c
  head/sys/dev/usb/serial/uvisor.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/uvisor2.c
  head/sys/dev/usb/serial/uvscom.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/serial/uvscom2.c
  head/sys/dev/usb/sound/
  head/sys/dev/usb/sound/uaudio.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/sound/uaudio2.c
  head/sys/dev/usb/sound/uaudio.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/sound/uaudio2.h
  head/sys/dev/usb/sound/uaudio_pcm.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/sound/uaudio2_pcm.c
  head/sys/dev/usb/sound/uaudio_reg.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/sound/uaudio2_reg.h
  head/sys/dev/usb/storage/
  head/sys/dev/usb/storage/ata-usb.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/storage/ata-usb2.c
  head/sys/dev/usb/storage/rio500_usb.h   (props changed)
     - copied unchanged from r188941, head/sys/legacy/dev/usb/rio500_usb.h
  head/sys/dev/usb/storage/umass.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/storage/umass2.c
  head/sys/dev/usb/storage/urio.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/storage/urio2.c
  head/sys/dev/usb/storage/ustorage_fs.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/storage/ustorage2_fs.c
  head/sys/dev/usb/template/
  head/sys/dev/usb/template/usb_template.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/template/usb2_template.c
  head/sys/dev/usb/template/usb_template.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/template/usb2_template.h
  head/sys/dev/usb/template/usb_template_cdce.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/template/usb2_template_cdce.c
  head/sys/dev/usb/template/usb_template_msc.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/template/usb2_template_msc.c
  head/sys/dev/usb/template/usb_template_mtp.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/template/usb2_template_mtp.c
  head/sys/dev/usb/ufm_ioctl.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/include/ufm2_ioctl.h
  head/sys/dev/usb/usb.h   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/include/usb2_standard.h
  head/sys/dev/usb/usb_bus.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/controller/usb2_bus.h
  head/sys/dev/usb/usb_busdma.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_busdma.c
  head/sys/dev/usb/usb_busdma.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_busdma.h
  head/sys/dev/usb/usb_cdc.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/include/usb2_cdc.h
  head/sys/dev/usb/usb_compat_linux.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_compat_linux.c
  head/sys/dev/usb/usb_compat_linux.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_compat_linux.h
  head/sys/dev/usb/usb_controller.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/controller/usb2_controller.h
  head/sys/dev/usb/usb_core.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_core.c
  head/sys/dev/usb/usb_core.h   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_core.h
  head/sys/dev/usb/usb_debug.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_debug.c
  head/sys/dev/usb/usb_debug.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_debug.h
  head/sys/dev/usb/usb_defs.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/include/usb2_defs.h
  head/sys/dev/usb/usb_dev.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_dev.c
  head/sys/dev/usb/usb_dev.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_dev.h
  head/sys/dev/usb/usb_device.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_device.c
  head/sys/dev/usb/usb_device.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_device.h
  head/sys/dev/usb/usb_dynamic.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_dynamic.c
  head/sys/dev/usb/usb_dynamic.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_dynamic.h
  head/sys/dev/usb/usb_endian.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/include/usb2_endian.h
  head/sys/dev/usb/usb_error.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_error.c
  head/sys/dev/usb/usb_error.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/include/usb2_error.h
  head/sys/dev/usb/usb_generic.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_generic.c
  head/sys/dev/usb/usb_generic.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_generic.h
  head/sys/dev/usb/usb_handle_request.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_handle_request.c
  head/sys/dev/usb/usb_handle_request.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_handle_request.h
  head/sys/dev/usb/usb_hid.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_hid.c
  head/sys/dev/usb/usb_hid.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_hid.h
  head/sys/dev/usb/usb_hub.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_hub.c
  head/sys/dev/usb/usb_hub.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_hub.h
  head/sys/dev/usb/usb_if.m   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_if.m
  head/sys/dev/usb/usb_ioctl.h   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/include/usb2_ioctl.h
  head/sys/dev/usb/usb_lookup.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_lookup.c
  head/sys/dev/usb/usb_lookup.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_lookup.h
  head/sys/dev/usb/usb_mbuf.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_mbuf.c
  head/sys/dev/usb/usb_mbuf.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_mbuf.h
  head/sys/dev/usb/usb_mfunc.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/include/usb2_mfunc.h
  head/sys/dev/usb/usb_msctest.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_msctest.c
  head/sys/dev/usb/usb_msctest.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_msctest.h
  head/sys/dev/usb/usb_parse.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_parse.c
  head/sys/dev/usb/usb_parse.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_parse.h
  head/sys/dev/usb/usb_pci.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/controller/usb2_pci.h
  head/sys/dev/usb/usb_process.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_process.c
  head/sys/dev/usb/usb_process.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_process.h
  head/sys/dev/usb/usb_request.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_request.c
  head/sys/dev/usb/usb_request.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_request.h
  head/sys/dev/usb/usb_revision.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/include/usb2_revision.h
  head/sys/dev/usb/usb_sw_transfer.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_sw_transfer.c
  head/sys/dev/usb/usb_sw_transfer.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_sw_transfer.h
  head/sys/dev/usb/usb_transfer.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_transfer.c
  head/sys/dev/usb/usb_transfer.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_transfer.h
  head/sys/dev/usb/usb_util.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/core/usb2_util.c
  head/sys/dev/usb/usb_util.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/core/usb2_util.h
  head/sys/dev/usb/usbdevs   (props changed)
     - copied unchanged from r188941, head/sys/legacy/dev/usb/usbdevs
  head/sys/dev/usb/usbhid.h   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/include/usb2_hid.h
  head/sys/dev/usb/wlan/
  head/sys/dev/usb/wlan/if_rum.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/wlan/if_rum2.c
  head/sys/dev/usb/wlan/if_rumfw.h
     - copied unchanged from r188941, head/sys/dev/usb2/wlan/if_rumfw.h
  head/sys/dev/usb/wlan/if_rumreg.h
     - copied unchanged from r188941, head/sys/dev/usb2/wlan/if_rumreg.h
  head/sys/dev/usb/wlan/if_rumvar.h
     - copied unchanged from r188941, head/sys/dev/usb2/wlan/if_rumvar.h
  head/sys/dev/usb/wlan/if_ural.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/wlan/if_ural2.c
  head/sys/dev/usb/wlan/if_uralreg.h
     - copied unchanged from r188941, head/sys/dev/usb2/wlan/if_uralreg.h
  head/sys/dev/usb/wlan/if_uralvar.h
     - copied unchanged from r188941, head/sys/dev/usb2/wlan/if_uralvar.h
  head/sys/dev/usb/wlan/if_zyd.c   (contents, props changed)
     - copied, changed from r188941, head/sys/dev/usb2/wlan/if_zyd2.c
  head/sys/dev/usb/wlan/if_zydfw.h
     - copied unchanged from r188941, head/sys/dev/usb2/wlan/if_zydfw.h
  head/sys/dev/usb/wlan/if_zydreg.h
     - copied unchanged from r188941, head/sys/dev/usb2/wlan/if_zydreg.h
  head/sys/dev/usb/wlan/usb_wlan.h   (props changed)
     - copied unchanged from r188941, head/sys/dev/usb2/wlan/usb2_wlan.h
Deleted:
  head/sys/dev/usb2/

Copied and modified: head/sys/dev/usb/README.TXT (from r188941, head/sys/dev/usb2/core/README.TXT)
==============================================================================
--- head/sys/dev/usb2/core/README.TXT	Mon Feb 23 18:22:49 2009	(r188941, copy source)
+++ head/sys/dev/usb/README.TXT	Mon Feb 23 18:31:00 2009	(r188942)
@@ -47,7 +47,7 @@ functions to setup INTERRUPT- and ISOCHR
 |        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 sl
  
 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
 ===============

Copied: head/sys/dev/usb/bluetooth/TODO.TXT (from r188941, head/sys/dev/usb2/bluetooth/TODO.TXT)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/usb/bluetooth/TODO.TXT	Mon Feb 23 18:31:00 2009	(r188942, copy of r188941, head/sys/dev/usb2/bluetooth/TODO.TXT)
@@ -0,0 +1,18 @@
+$Id: TODO,v 1.1 2002/11/24 19:46:56 max Exp $
+$FreeBSD$
+
+1) SMP/Locking
+
+	The code makes use of ng_send_fn() whenever possible. Just
+	need to verify and make sure i did it right
+
+2) Firmware upgrade
+
+	According to Bluetooth spec device may present third interface
+	to perform firmware upgrade. 3Com USB Bluetooth dongle has
+	such interface. Need to implement set of Netgraph messages.
+
+3) Isochronous USB transfers (SCO data)
+
+	Tried to fix isochrounous transfers, which are still disabled
+	by default.

Copied and modified: head/sys/dev/usb/bluetooth/ng_ubt.c (from r188941, head/sys/dev/usb2/bluetooth/ng_ubt2.c)
==============================================================================
--- head/sys/dev/usb2/bluetooth/ng_ubt2.c	Mon Feb 23 18:22:49 2009	(r188941, copy source)
+++ head/sys/dev/usb/bluetooth/ng_ubt.c	Mon Feb 23 18:31:00 2009	(r188942)
@@ -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,
 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);
 

Copied: head/sys/dev/usb/bluetooth/ng_ubt_var.h (from r188941, head/sys/dev/usb2/bluetooth/ng_ubt2_var.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/usb/bluetooth/ng_ubt_var.h	Mon Feb 23 18:31:00 2009	(r188942, copy of r188941, head/sys/dev/usb2/bluetooth/ng_ubt2_var.h)
@@ -0,0 +1,131 @@
+/*
+ * ng_ubt_var.h
+ */
+
+/*-
+ * Copyright (c) 2001-2009 Maksim Yevmenkin <m_evmenkin@yahoo.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.
+ *
+ * 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.
+ *
+ * $Id: ng_ubt_var.h,v 1.2 2003/03/22 23:44:36 max Exp $
+ * $FreeBSD$
+ */
+
+#ifndef _NG_UBT_VAR_H_
+#define	_NG_UBT_VAR_H_	1
+
+/* Debug printf's */
+#define	UBT_DEBUG(level, sc, fmt, ...)				\
+do {								\
+	if ((sc)->sc_debug >= (level))				\
+		device_printf((sc)->sc_dev, "%s:%d: " fmt, 	\
+			__FUNCTION__, __LINE__,## __VA_ARGS__);	\
+} while (0)
+
+#define	UBT_ALERT(...)		UBT_DEBUG(NG_UBT_ALERT_LEVEL, __VA_ARGS__)
+#define	UBT_ERR(...)		UBT_DEBUG(NG_UBT_ERR_LEVEL, __VA_ARGS__)
+#define	UBT_WARN(...)		UBT_DEBUG(NG_UBT_WARN_LEVEL, __VA_ARGS__)
+#define	UBT_INFO(...)		UBT_DEBUG(NG_UBT_INFO_LEVEL, __VA_ARGS__)
+
+#define UBT_NG_LOCK(sc)		mtx_lock(&(sc)->sc_ng_mtx)
+#define UBT_NG_UNLOCK(sc)	mtx_unlock(&(sc)->sc_ng_mtx)
+
+/* Bluetooth USB control request type */
+#define	UBT_HCI_REQUEST		0x20
+#define	UBT_DEFAULT_QLEN	64
+#define	UBT_ISOC_NFRAMES	32	/* should be factor of 8 */
+
+/* Bluetooth USB defines */
+enum {
+	/* Interface #0 transfers */
+	UBT_IF_0_BULK_DT_WR = 0,
+	UBT_IF_0_BULK_DT_RD,
+	UBT_IF_0_INTR_DT_RD,
+	UBT_IF_0_CTRL_DT_WR,
+	
+	/* Interface #1 transfers */
+	UBT_IF_1_ISOC_DT_RD1,
+	UBT_IF_1_ISOC_DT_RD2,
+	UBT_IF_1_ISOC_DT_WR1,
+	UBT_IF_1_ISOC_DT_WR2,
+
+	UBT_N_TRANSFER,		/* total number of transfers */
+};
+
+/* USB device softc structure */
+struct ubt_softc {
+	device_t		sc_dev;		/* for debug printf */
+
+	/* State */
+	ng_ubt_node_debug_ep	sc_debug;	/* debug level */
+
+	ng_ubt_node_stat_ep	sc_stat;	/* statistic */
+#define	UBT_STAT_PCKTS_SENT(sc)		(sc)->sc_stat.pckts_sent ++
+#define	UBT_STAT_BYTES_SENT(sc, n)	(sc)->sc_stat.bytes_sent += (n)
+#define	UBT_STAT_PCKTS_RECV(sc)		(sc)->sc_stat.pckts_recv ++
+#define	UBT_STAT_BYTES_RECV(sc, n)	(sc)->sc_stat.bytes_recv += (n)
+#define	UBT_STAT_OERROR(sc)		(sc)->sc_stat.oerrors ++
+#define	UBT_STAT_IERROR(sc)		(sc)->sc_stat.ierrors ++
+#define	UBT_STAT_RESET(sc)	bzero(&(sc)->sc_stat, sizeof((sc)->sc_stat))
+
+	/* USB device specific */
+	struct mtx		sc_if_mtx;	/* interfaces lock */
+	struct usb2_xfer	*sc_xfer[UBT_N_TRANSFER];
+
+	struct mtx		sc_ng_mtx;	/* lock for shared NG data */
+
+	/* HCI commands */
+	struct ng_bt_mbufq	sc_cmdq;	/* HCI command queue */
+#define	UBT_CTRL_BUFFER_SIZE	(sizeof(struct usb2_device_request) +	\
+				 sizeof(ng_hci_cmd_pkt_t) + NG_HCI_CMD_PKT_SIZE)
+#define	UBT_INTR_BUFFER_SIZE	(MCLBYTES-1)	/* reserve 1 byte for ID-tag */
+
+	/* ACL data */
+	struct ng_bt_mbufq	sc_aclq;	/* ACL data queue */
+#define	UBT_BULK_READ_BUFFER_SIZE (MCLBYTES-1)	/* reserve 1 byte for ID-tag */
+#define	UBT_BULK_WRITE_BUFFER_SIZE (MCLBYTES)
+
+	/* SCO data */
+	struct ng_bt_mbufq	sc_scoq;	/* SCO data queue */
+	struct mbuf		*sc_isoc_in_buffer; /* SCO reassembly buffer */
+
+	/* Netgraph specific */
+	node_p			sc_node;	/* pointer back to node */
+	hook_p			sc_hook;	/* upstream hook */
+
+	/* Glue */
+	int			sc_task_flags;	/* task flags */
+#define UBT_FLAG_T_PENDING	(1 << 0)	/* task pending */
+#define UBT_FLAG_T_STOP_ALL	(1 << 1)	/* stop all xfers */
+#define UBT_FLAG_T_START_ALL	(1 << 2)	/* start all read and isoc
+						   write xfers */
+#define UBT_FLAG_T_START_CTRL	(1 << 3)	/* start control xfer (write) */
+#define UBT_FLAG_T_START_BULK	(1 << 4)	/* start bulk xfer (write) */
+
+	struct task		sc_task;
+};
+typedef struct ubt_softc	ubt_softc_t;
+typedef struct ubt_softc *	ubt_softc_p;
+
+#endif /* ndef _NG_UBT_VAR_H_ */
+

Copied and modified: head/sys/dev/usb/bluetooth/ubtbcmfw.c (from r188941, head/sys/dev/usb2/bluetooth/ubtbcmfw2.c)
==============================================================================
--- head/sys/dev/usb2/bluetooth/ubtbcmfw2.c	Mon Feb 23 18:22:49 2009	(r188941, copy source)
+++ head/sys/dev/usb/bluetooth/ubtbcmfw.c	Mon Feb 23 18:31:00 2009	(r188942)
@@ -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

Copied and modified: head/sys/dev/usb/controller/at91dci.c (from r188941, head/sys/dev/usb2/controller/at91dci.c)
==============================================================================
--- head/sys/dev/usb2/controller/at91dci.c	Mon Feb 23 18:22:49 2009	(r188941, copy source)
+++ head/sys/dev/usb/controller/at91dci.c	Mon Feb 23 18:31:00 2009	(r188942)
@@ -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)) - \

Copied: head/sys/dev/usb/controller/at91dci.h (from r188941, head/sys/dev/usb2/controller/at91dci.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/usb/controller/at91dci.h	Mon Feb 23 18:31:00 2009	(r188942, copy of r188941, head/sys/dev/usb2/controller/at91dci.h)
@@ -0,0 +1,245 @@
+/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2006 ATMEL
+ * Copyright (c) 2007 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.
+ */
+
+/*
+ * USB Device Port (UDP) register definition, based on
+ * "AT91RM9200.h" provided by ATMEL.
+ */
+
+#ifndef _AT9100_DCI_H_
+#define	_AT9100_DCI_H_
+
+#define	AT91_MAX_DEVICES (USB_MIN_DEVICES + 1)
+
+#define	AT91_UDP_FRM 	0x00		/* Frame number register */
+#define	AT91_UDP_FRM_MASK     (0x7FF <<  0)	/* Frame Number as Defined in
+						 * the Packet Field Formats */
+#define	AT91_UDP_FRM_ERR      (0x1 << 16)	/* Frame Error */
+#define	AT91_UDP_FRM_OK       (0x1 << 17)	/* Frame OK */
+
+#define	AT91_UDP_GSTATE 0x04		/* Global state register */
+#define	AT91_UDP_GSTATE_ADDR  (0x1 <<  0)	/* Addressed state */
+#define	AT91_UDP_GSTATE_CONFG (0x1 <<  1)	/* Configured */
+#define	AT91_UDP_GSTATE_ESR   (0x1 <<  2)	/* Enable Send Resume */
+#define	AT91_UDP_GSTATE_RSM   (0x1 <<  3)	/* A Resume Has Been Sent to
+						 * the Host */
+#define	AT91_UDP_GSTATE_RMW   (0x1 <<  4)	/* Remote Wake Up Enable */
+
+#define	AT91_UDP_FADDR	0x08		/* Function Address Register */
+#define	AT91_UDP_FADDR_MASK  (0x7F << 0)/* Function Address Mask */
+#define	AT91_UDP_FADDR_EN    (0x1 <<  8)/* Function Enable */
+
+#define	AT91_UDP_RES0	0x0C		/* Reserved 0 */
+
+#define	AT91_UDP_IER	0x10		/* Interrupt Enable Register */
+#define	AT91_UDP_IDR	0x14		/* Interrupt Disable Register */
+#define	AT91_UDP_IMR	0x18		/* Interrupt Mask Register */
+#define	AT91_UDP_ISR	0x1C		/* Interrupt Status Register */
+#define	AT91_UDP_ICR	0x20		/* Interrupt Clear Register */
+#define	AT91_UDP_INT_EP(n)   (0x1 <<(n))/* Endpoint "n" Interrupt */
+#define	AT91_UDP_INT_RXSUSP  (0x1 <<  8)/* USB Suspend Interrupt */
+#define	AT91_UDP_INT_RXRSM   (0x1 <<  9)/* USB Resume Interrupt */
+#define	AT91_UDP_INT_EXTRSM  (0x1 << 10)/* USB External Resume Interrupt */
+#define	AT91_UDP_INT_SOFINT  (0x1 << 11)/* USB Start Of frame Interrupt */
+#define	AT91_UDP_INT_END_BR  (0x1 << 12)/* USB End Of Bus Reset Interrupt */
+#define	AT91_UDP_INT_WAKEUP  (0x1 << 13)/* USB Resume Interrupt */
+
+#define	AT91_UDP_INT_BUS \
+  (AT91_UDP_INT_RXSUSP|AT91_UDP_INT_RXRSM| \
+   AT91_UDP_INT_END_BR)
+
+#define	AT91_UDP_INT_EPS \
+  (AT91_UDP_INT_EP(0)|AT91_UDP_INT_EP(1)| \
+   AT91_UDP_INT_EP(2)|AT91_UDP_INT_EP(3)| \
+   AT91_UDP_INT_EP(4)|AT91_UDP_INT_EP(5))
+
+#define	AT91_UDP_INT_DEFAULT \
+  (AT91_UDP_INT_EPS|AT91_UDP_INT_BUS)
+
+#define	AT91_UDP_RES1	0x24		/* Reserved 1 */
+#define	AT91_UDP_RST	0x28		/* Reset Endpoint Register */
+#define	AT91_UDP_RST_EP(n) (0x1 <<  (n))/* Reset Endpoint "n" */
+
+#define	AT91_UDP_RES2	0x2C		/* Reserved 2 */
+
+#define	AT91_UDP_CSR(n) (0x30 + (4*(n)))/* Endpoint Control and Status
+					 * Register */
+#define	AT91_UDP_CSR_TXCOMP (0x1 <<  0)	/* Generates an IN packet with data
+					 * previously written in the DPR */
+#define	AT91_UDP_CSR_RX_DATA_BK0 (0x1 <<  1)	/* Receive Data Bank 0 */
+#define	AT91_UDP_CSR_RXSETUP     (0x1 <<  2)	/* Sends STALL to the Host
+						 * (Control endpoints) */
+#define	AT91_UDP_CSR_ISOERROR    (0x1 <<  3)	/* Isochronous error
+						 * (Isochronous endpoints) */
+#define	AT91_UDP_CSR_STALLSENT   (0x1 <<  3)	/* Stall sent (Control, bulk,
+						 * interrupt endpoints) */
+#define	AT91_UDP_CSR_TXPKTRDY    (0x1 <<  4)	/* Transmit Packet Ready */
+#define	AT91_UDP_CSR_FORCESTALL  (0x1 <<  5)	/* Force Stall (used by
+						 * Control, Bulk and
+						 * Isochronous endpoints). */
+#define	AT91_UDP_CSR_RX_DATA_BK1 (0x1 <<  6)	/* Receive Data Bank 1 (only
+						 * used by endpoints with
+						 * ping-pong attributes). */
+#define	AT91_UDP_CSR_DIR         (0x1 <<  7)	/* Transfer Direction */
+#define	AT91_UDP_CSR_ET_MASK     (0x7 <<  8)	/* Endpoint transfer type mask */
+#define	AT91_UDP_CSR_ET_CTRL     (0x0 <<  8)	/* Control IN+OUT */
+#define	AT91_UDP_CSR_ET_ISO      (0x1 <<  8)	/* Isochronous */
+#define	AT91_UDP_CSR_ET_BULK     (0x2 <<  8)	/* Bulk */
+#define	AT91_UDP_CSR_ET_INT      (0x3 <<  8)	/* Interrupt */
+#define	AT91_UDP_CSR_ET_DIR_OUT  (0x0 <<  8)	/* OUT tokens */
+#define	AT91_UDP_CSR_ET_DIR_IN   (0x4 <<  8)	/* IN tokens */
+#define	AT91_UDP_CSR_DTGLE       (0x1 << 11)	/* Data Toggle */
+#define	AT91_UDP_CSR_EPEDS       (0x1 << 15)	/* Endpoint Enable Disable */
+#define	AT91_UDP_CSR_RXBYTECNT   (0x7FF << 16)	/* Number Of Bytes Available
+						 * in the FIFO */
+
+#define	AT91_UDP_FDR(n) (0x50 + (4*(n)))/* Endpoint FIFO Data Register */
+#define	AT91_UDP_RES3	0x70		/* Reserved 3 */
+#define	AT91_UDP_TXVC	0x74		/* Transceiver Control Register */
+#define	AT91_UDP_TXVC_DIS      (0x1 <<  8)
+
+#define	AT91_UDP_EP_MAX 6		/* maximum number of endpoints
+					 * supported */
+
+#define	AT91_UDP_READ_4(sc, reg) \
+  bus_space_read_4((sc)->sc_io_tag, (sc)->sc_io_hdl, reg)
+
+#define	AT91_UDP_WRITE_4(sc, reg, data)	\
+  bus_space_write_4((sc)->sc_io_tag, (sc)->sc_io_hdl, reg, data)
+
+struct at91dci_td;
+
+typedef uint8_t (at91dci_cmd_t)(struct at91dci_td *td);
+
+struct at91dci_td {
+	bus_space_tag_t io_tag;
+	bus_space_handle_t io_hdl;
+	struct at91dci_td *obj_next;
+	at91dci_cmd_t *func;
+	struct usb2_page_cache *pc;
+	uint32_t offset;
+	uint32_t remainder;
+	uint16_t max_packet_size;
+	uint8_t	status_reg;
+	uint8_t	fifo_reg;
+	uint8_t	fifo_bank:1;
+	uint8_t	error:1;
+	uint8_t	alt_next:1;
+	uint8_t	short_pkt:1;
+	uint8_t	support_multi_buffer:1;
+	uint8_t	did_stall:1;
+};
+
+struct at91dci_std_temp {
+	at91dci_cmd_t *func;
+	struct usb2_page_cache *pc;
+	struct at91dci_td *td;
+	struct at91dci_td *td_next;
+	uint32_t len;
+	uint32_t offset;
+	uint16_t max_frame_size;
+	uint8_t	short_pkt;
+	/*
+         * short_pkt = 0: transfer should be short terminated
+         * short_pkt = 1: transfer should not be short terminated
+         */
+	uint8_t	setup_alt_next;
+};
+
+struct at91dci_config_desc {
+	struct usb2_config_descriptor confd;
+	struct usb2_interface_descriptor ifcd;
+	struct usb2_endpoint_descriptor endpd;
+} __packed;
+
+union at91dci_hub_temp {
+	uWord	wValue;
+	struct usb2_port_status ps;
+};
+
+struct at91dci_ep_flags {
+	uint8_t	fifo_bank:1;		/* hardware specific */
+};
+
+struct at91dci_flags {
+	uint8_t	change_connect:1;
+	uint8_t	change_suspend:1;
+	uint8_t	status_suspend:1;	/* set if suspended */
+	uint8_t	status_vbus:1;		/* set if present */
+	uint8_t	status_bus_reset:1;	/* set if reset complete */
+	uint8_t	remote_wakeup:1;
+	uint8_t	self_powered:1;
+	uint8_t	clocks_off:1;
+	uint8_t	port_powered:1;
+	uint8_t	port_enabled:1;
+	uint8_t	d_pulled_up:1;
+};
+
+struct at91dci_softc {
+	struct usb2_bus sc_bus;
+	union at91dci_hub_temp sc_hub_temp;
+	LIST_HEAD(, usb2_xfer) sc_interrupt_list_head;
+	struct usb2_sw_transfer sc_root_ctrl;
+	struct usb2_sw_transfer sc_root_intr;
+
+	struct usb2_device *sc_devices[AT91_MAX_DEVICES];
+	struct resource *sc_io_res;
+	struct resource *sc_irq_res;
+	void   *sc_intr_hdl;
+	bus_size_t sc_io_size;
+	bus_space_tag_t sc_io_tag;
+	bus_space_handle_t sc_io_hdl;
+
+	void    (*sc_clocks_on) (void *arg);
+	void    (*sc_clocks_off) (void *arg);
+	void   *sc_clocks_arg;
+
+	void    (*sc_pull_up) (void *arg);
+	void    (*sc_pull_down) (void *arg);
+	void   *sc_pull_arg;
+
+	uint8_t	sc_rt_addr;		/* root HUB address */
+	uint8_t	sc_dv_addr;		/* device address */
+	uint8_t	sc_conf;		/* root HUB config */
+
+	uint8_t	sc_hub_idata[1];
+
+	struct at91dci_flags sc_flags;
+	struct at91dci_ep_flags sc_ep_flags[AT91_UDP_EP_MAX];
+};
+
+/* prototypes */
+
+usb2_error_t at91dci_init(struct at91dci_softc *sc);
+void	at91dci_uninit(struct at91dci_softc *sc);
+void	at91dci_suspend(struct at91dci_softc *sc);
+void	at91dci_resume(struct at91dci_softc *sc);
+void	at91dci_interrupt(struct at91dci_softc *sc);
+void	at91dci_vbus_interrupt(struct at91dci_softc *sc, uint8_t is_on);
+
+#endif					/* _AT9100_DCI_H_ */

Copied and modified: head/sys/dev/usb/controller/at91dci_atmelarm.c (from r188941, head/sys/dev/usb2/controller/at91dci_atmelarm.c)
==============================================================================
--- head/sys/dev/usb2/controller/at91dci_atmelarm.c	Mon Feb 23 18:22:49 2009	(r188941, copy source)
+++ head/sys/dev/usb/controller/at91dci_atmelarm.c	Mon Feb 23 18:31:00 2009	(r188942)
@@ -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>
 

Copied and modified: head/sys/dev/usb/controller/atmegadci.c (from r188941, head/sys/dev/usb2/controller/atmegadci.c)
==============================================================================
--- head/sys/dev/usb2/controller/atmegadci.c	Mon Feb 23 18:22:49 2009	(r188941, copy source)
+++ head/sys/dev/usb/controller/atmegadci.c	Mon Feb 23 18:31:00 2009	(r188942)
@@ -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)) - \

Copied: head/sys/dev/usb/controller/atmegadci.h (from r188941, head/sys/dev/usb2/controller/atmegadci.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/usb/controller/atmegadci.h	Mon Feb 23 18:31:00 2009	(r188942, copy of r188941, head/sys/dev/usb2/controller/atmegadci.h)
@@ -0,0 +1,273 @@
+/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2009 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.
+ */
+
+/*
+ * USB Device Port register definitions, copied from ATMEGA
+ * documentation provided by ATMEL.
+ */
+
+#ifndef _ATMEGADCI_H_
+#define	_ATMEGADCI_H_
+
+#define	ATMEGA_MAX_DEVICES (USB_MIN_DEVICES + 1)
+
+#ifndef ATMEGA_HAVE_BUS_SPACE
+#define	ATMEGA_HAVE_BUS_SPACE 1
+#endif
+
+#define	ATMEGA_UEINT 0xF4
+#define	ATMEGA_UEINT_MASK(n) (1 << (n))	/* endpoint interrupt mask */
+
+#define	ATMEGA_UEBCHX 0xF3		/* FIFO byte count high */
+#define	ATMEGA_UEBCLX 0xF2		/* FIFO byte count low */
+#define	ATMEGA_UEDATX 0xF1		/* FIFO data */
+
+#define	ATMEGA_UEIENX 0xF0		/* interrupt enable register */
+#define	ATMEGA_UEIENX_TXINE (1 << 0)
+#define	ATMEGA_UEIENX_STALLEDE (1 << 1)
+#define	ATMEGA_UEIENX_RXOUTE (1 << 2)
+#define	ATMEGA_UEIENX_RXSTPE (1 << 3)	/* received SETUP packet */
+#define	ATMEGA_UEIENX_NAKOUTE (1 << 4)
+#define	ATMEGA_UEIENX_NAKINE (1 << 6)
+#define	ATMEGA_UEIENX_FLERRE (1 << 7)
+
+#define	ATMEGA_UESTA1X 0xEF
+#define	ATMEGA_UESTA1X_CURRBK (3 << 0)	/* current bank */
+#define	ATMEGA_UESTA1X_CTRLDIR (1 << 2)	/* control endpoint direction */
+
+#define	ATMEGA_UESTA0X 0xEE
+#define	ATMEGA_UESTA0X_NBUSYBK (3 << 0)
+#define	ATMEGA_UESTA0X_DTSEQ (3 << 2)
+#define	ATMEGA_UESTA0X_UNDERFI (1 << 5)	/* underflow */
+#define	ATMEGA_UESTA0X_OVERFI (1 << 6)	/* overflow */
+#define	ATMEGA_UESTA0X_CFGOK (1 << 7)
+
+#define	ATMEGA_UECFG1X 0xED		/* endpoint config register */
+#define	ATMEGA_UECFG1X_ALLOC (1 << 1)
+#define	ATMEGA_UECFG1X_EPBK0 (0 << 2)
+#define	ATMEGA_UECFG1X_EPBK1 (1 << 2)
+#define	ATMEGA_UECFG1X_EPBK2 (2 << 2)
+#define	ATMEGA_UECFG1X_EPBK3 (3 << 2)
+#define	ATMEGA_UECFG1X_EPSIZE(n) ((n) << 4)
+
+#define	ATMEGA_UECFG0X 0xEC
+#define	ATMEGA_UECFG0X_EPDIR (1 << 0)	/* endpoint direction */
+#define	ATMEGA_UECFG0X_EPTYPE0 (0 << 6)
+#define	ATMEGA_UECFG0X_EPTYPE1 (1 << 6)
+#define	ATMEGA_UECFG0X_EPTYPE2 (2 << 6)
+#define	ATMEGA_UECFG0X_EPTYPE3 (3 << 6)
+
+#define	ATMEGA_UECONX 0xEB
+#define	ATMEGA_UECONX_EPEN (1 << 0)
+#define	ATMEGA_UECONX_RSTDT (1 << 3)
+#define	ATMEGA_UECONX_STALLRQC (1 << 4)	/* stall request clear */
+#define	ATMEGA_UECONX_STALLRQ (1 << 5)	/* stall request set */
+
+#define	ATMEGA_UERST 0xEA		/* endpoint reset register */
+#define	ATMEGA_UERST_MASK(n) (1 << (n))
+
+#define	ATMEGA_UENUM 0xE9		/* endpoint number */
+
+#define	ATMEGA_UEINTX 0xE8		/* interrupt register */
+#define	ATMEGA_UEINTX_TXINI (1 << 0)
+#define	ATMEGA_UEINTX_STALLEDI (1 << 1)
+#define	ATMEGA_UEINTX_RXOUTI (1 << 2)
+#define	ATMEGA_UEINTX_RXSTPI (1 << 3)	/* received setup packet */
+#define	ATMEGA_UEINTX_NAKOUTI (1 << 4)
+#define	ATMEGA_UEINTX_RWAL (1 << 5)
+#define	ATMEGA_UEINTX_NAKINI (1 << 6)
+#define	ATMEGA_UEINTX_FIFOCON (1 << 7)
+
+#define	ATMEGA_UDMFN 0xE6
+#define	ATMEGA_UDMFN_FNCERR (1 << 4)
+
+#define	ATMEGA_UDFNUMH 0xE5		/* frame number high */
+#define	ATMEGA_UDFNUMH_MASK 7
+
+#define	ATMEGA_UDFNUML 0xE4		/* frame number low */
+#define	ATMEGA_UDFNUML_MASK 0xFF
+
+#define	ATMEGA_FRAME_MASK 0x7FF
+
+#define	ATMEGA_UDADDR 0xE3		/* USB address */
+#define	ATMEGA_UDADDR_MASK 0x7F
+#define	ATMEGA_UDADDR_ADDEN (1 << 7)
+
+#define	ATMEGA_UDIEN 0xE2		/* USB device interrupt enable */
+#define	ATMEGA_UDINT_SUSPE (1 << 0)
+#define	ATMEGA_UDINT_MSOFE (1 << 1)
+#define	ATMEGA_UDINT_SOFE (1 << 2)
+#define	ATMEGA_UDINT_EORSTE (1 << 3)
+#define	ATMEGA_UDINT_WAKEUPE (1 << 4)
+#define	ATMEGA_UDINT_EORSME (1 << 5)
+#define	ATMEGA_UDINT_UPRSME (1 << 6)
+
+#define	ATMEGA_UDINT 0xE1		/* USB device interrupt status */
+#define	ATMEGA_UDINT_SUSPI (1 << 0)
+#define	ATMEGA_UDINT_MSOFI (1 << 1)
+#define	ATMEGA_UDINT_SOFI (1 << 2)
+#define	ATMEGA_UDINT_EORSTI (1 << 3)
+#define	ATMEGA_UDINT_WAKEUPI (1 << 4)
+#define	ATMEGA_UDINT_EORSMI (1 << 5)
+#define	ATMEGA_UDINT_UPRSMI (1 << 6)
+
+#define	ATMEGA_UDCON 0xE0		/* USB device connection register */
+#define	ATMEGA_UDCON_DETACH (1 << 0)
+#define	ATMEGA_UDCON_RMWKUP (1 << 1)
+#define	ATMEGA_UDCON_LSM (1 << 2)
+#define	ATMEGA_UDCON_RSTCPU (1 << 3)
+
+#define	ATMEGA_USBINT 0xDA
+#define	ATMEGA_USBINT_VBUSTI (1 << 0)	/* USB VBUS interrupt */
+
+#define	ATMEGA_USBSTA 0xD9
+#define	ATMEGA_USBSTA_VBUS (1 << 0)
+#define	ATMEGA_USBSTA_ID (1 << 1)
+
+#define	ATMEGA_USBCON 0xD8
+#define	ATMEGA_USBCON_VBUSTE (1 << 0)
+#define	ATMEGA_USBCON_OTGPADE (1 << 4)
+#define	ATMEGA_USBCON_FRZCLK (1 << 5)
+#define	ATMEGA_USBCON_USBE (1 << 7)
+
+#define	ATMEGA_UHWCON 0xD7
+#define	ATMEGA_UHWCON_UVREGE (1 << 0)
+
+#define	ATMEGA_READ_1(sc, reg) \
+  bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, reg)
+
+#define	ATMEGA_WRITE_1(sc, reg, data) \
+  bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, reg, data)
+
+#define	ATMEGA_WRITE_MULTI_1(sc, reg, ptr, len) \
+  bus_space_write_multi_1((sc)->sc_io_tag, (sc)->sc_io_hdl, reg, ptr, len)
+
+#define	ATMEGA_READ_MULTI_1(sc, reg, ptr, len) \
+  bus_space_read_multi_1((sc)->sc_io_tag, (sc)->sc_io_hdl, reg, ptr, len)
+
+/*
+ * Maximum number of endpoints supported:
+ */
+#define	ATMEGA_EP_MAX 7
+
+struct atmegadci_td;
+
+typedef uint8_t (atmegadci_cmd_t)(struct atmegadci_td *td);
+typedef void (atmegadci_clocks_t)(struct usb2_bus *);
+
+struct atmegadci_td {
+	struct atmegadci_td *obj_next;
+	atmegadci_cmd_t *func;
+	struct usb2_page_cache *pc;
+	uint32_t offset;
+	uint32_t remainder;
+	uint16_t max_packet_size;
+	uint8_t	error:1;
+	uint8_t	alt_next:1;
+	uint8_t	short_pkt:1;
+	uint8_t	support_multi_buffer:1;
+	uint8_t	did_stall:1;
+	uint8_t	ep_no:3;
+};
+
+struct atmegadci_std_temp {
+	atmegadci_cmd_t *func;
+	struct usb2_page_cache *pc;
+	struct atmegadci_td *td;
+	struct atmegadci_td *td_next;
+	uint32_t len;
+	uint32_t offset;
+	uint16_t max_frame_size;
+	uint8_t	short_pkt;
+	/*
+         * short_pkt = 0: transfer should be short terminated
+         * short_pkt = 1: transfer should not be short terminated
+         */
+	uint8_t	setup_alt_next;
+};
+
+struct atmegadci_config_desc {
+	struct usb2_config_descriptor confd;
+	struct usb2_interface_descriptor ifcd;
+	struct usb2_endpoint_descriptor endpd;
+} __packed;
+
+union atmegadci_hub_temp {
+	uWord	wValue;
+	struct usb2_port_status ps;
+};
+
+struct atmegadci_flags {
+	uint8_t	change_connect:1;
+	uint8_t	change_suspend:1;
+	uint8_t	status_suspend:1;	/* set if suspended */
+	uint8_t	status_vbus:1;		/* set if present */
+	uint8_t	status_bus_reset:1;	/* set if reset complete */
+	uint8_t	remote_wakeup:1;
+	uint8_t	self_powered:1;
+	uint8_t	clocks_off:1;
+	uint8_t	port_powered:1;
+	uint8_t	port_enabled:1;
+	uint8_t	d_pulled_up:1;
+};
+
+struct atmegadci_softc {
+	struct usb2_bus sc_bus;
+	union atmegadci_hub_temp sc_hub_temp;
+	LIST_HEAD(, usb2_xfer) sc_interrupt_list_head;
+	struct usb2_sw_transfer sc_root_ctrl;
+	struct usb2_sw_transfer sc_root_intr;
+
+	/* must be set by by the bus interface layer */
+	atmegadci_clocks_t *sc_clocks_on;
+	atmegadci_clocks_t *sc_clocks_off;
+
+	struct usb2_device *sc_devices[ATMEGA_MAX_DEVICES];
+	struct resource *sc_irq_res;
+	void   *sc_intr_hdl;
+#if (ATMEGA_HAVE_BUS_SPACE != 0)
+	struct resource *sc_io_res;
+	bus_space_tag_t sc_io_tag;
+	bus_space_handle_t sc_io_hdl;
+#endif
+	uint8_t	sc_rt_addr;		/* root hub address */
+	uint8_t	sc_dv_addr;		/* device address */
+	uint8_t	sc_conf;		/* root hub config */
+
+	uint8_t	sc_hub_idata[1];
+
+	struct atmegadci_flags sc_flags;
+};
+
+/* prototypes */
+
+usb2_error_t atmegadci_init(struct atmegadci_softc *sc);
+void	atmegadci_uninit(struct atmegadci_softc *sc);
+void	atmegadci_suspend(struct atmegadci_softc *sc);
+void	atmegadci_resume(struct atmegadci_softc *sc);
+void	atmegadci_interrupt(struct atmegadci_softc *sc);
+
+#endif					/* _ATMEGADCI_H_ */

Copied: head/sys/dev/usb/controller/atmegadci_atmelarm.c (from r188941, head/sys/dev/usb2/controller/atmegadci_atmelarm.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/dev/usb/controller/atmegadci_atmelarm.c	Mon Feb 23 18:31:00 2009	(r188942, copy of r188941, head/sys/dev/usb2/controller/atmegadci_atmelarm.c)
@@ -0,0 +1,27 @@
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*-
+ * Copyright (c) 2009 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.
+ */

Copied and modified: head/sys/dev/usb/controller/ehci.c (from r188941, head/sys/dev/usb2/controller/ehci2.c)
==============================================================================
--- head/sys/dev/usb2/controller/ehci2.c	Mon Feb 23 18:22:49 2009	(r188941, copy source)
+++ head/sys/dev/usb/controller/ehci.c	Mon Feb 23 18:31:00 2009	(r188942)
@@ -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>
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902231831.n1NIV1tj032376>