diff options
| author | hselasky <hselasky@FreeBSD.org> | 2012-10-01 05:42:43 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2012-10-01 05:42:43 +0000 |
| commit | c081610de9c447caf8b6eb3137c7529f871ba3cb (patch) | |
| tree | d1865f2fe48b18b7e4afe4cd5abe6f41cfde18ba /sys/dev/usb/controller/ohci.c | |
| parent | c5105a1581548a5e5614be938eeee28e123a0b4a (diff) | |
| download | FreeBSD-src-c081610de9c447caf8b6eb3137c7529f871ba3cb.zip FreeBSD-src-c081610de9c447caf8b6eb3137c7529f871ba3cb.tar.gz | |
Inherit USB mode from RootHUB port where the USB device is connected.
Only RootHUB ports can be dual mode. Disallow OTG ports on external HUBs.
This simplifies some checks in the USB controller drivers.
MFC after: 1 week
Diffstat (limited to 'sys/dev/usb/controller/ohci.c')
| -rw-r--r-- | sys/dev/usb/controller/ohci.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/usb/controller/ohci.c b/sys/dev/usb/controller/ohci.c index a3179f1..89517f3 100644 --- a/sys/dev/usb/controller/ohci.c +++ b/sys/dev/usb/controller/ohci.c @@ -2315,6 +2315,7 @@ ohci_roothub_exec(struct usb_device *udev, } v = OREAD4(sc, OHCI_RH_PORT_STATUS(index)); DPRINTFN(9, "port status=0x%04x\n", v); + v &= ~UPS_PORT_MODE_DEVICE; /* force host mode */ USETW(sc->sc_hub_desc.ps.wPortStatus, v); USETW(sc->sc_hub_desc.ps.wPortChange, v >> 16); len = sizeof(sc->sc_hub_desc.ps); @@ -2551,10 +2552,6 @@ ohci_ep_init(struct usb_device *udev, struct usb_endpoint_descriptor *edesc, edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_addr); - if (udev->flags.usb_mode != USB_MODE_HOST) { - /* not supported */ - return; - } if (udev->device_index != sc->sc_addr) { switch (edesc->bmAttributes & UE_XFERTYPE) { case UE_CONTROL: |
