diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-10-26 20:23:15 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-10-26 20:23:15 +0000 |
| commit | 8f17b6fdd9def8c843751b1b5f7eb581d17a8a56 (patch) | |
| tree | c87ef421db3c402287e85c11185cd8df2c268cf8 /sys/dev/usb/controller/ohci.c | |
| parent | 78210debc46f624bad3c94f727c3c5b4021c97be (diff) | |
| download | FreeBSD-src-8f17b6fdd9def8c843751b1b5f7eb581d17a8a56.zip FreeBSD-src-8f17b6fdd9def8c843751b1b5f7eb581d17a8a56.tar.gz | |
Remove usb controller takeover code now that it is handled by the pci code.
Reminded by: jhb
Reviewed by: HPS
Diffstat (limited to 'sys/dev/usb/controller/ohci.c')
| -rw-r--r-- | sys/dev/usb/controller/ohci.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/sys/dev/usb/controller/ohci.c b/sys/dev/usb/controller/ohci.c index 637b639..2ced676 100644 --- a/sys/dev/usb/controller/ohci.c +++ b/sys/dev/usb/controller/ohci.c @@ -175,30 +175,6 @@ ohci_controller_init(ohci_softc_t *sc) uint32_t per; uint32_t desca; - /* Determine in what context we are running. */ - ctl = OREAD4(sc, OHCI_CONTROL); - if (ctl & OHCI_IR) { - /* SMM active, request change */ - DPRINTF("SMM active, request owner change\n"); - OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_OCR); - for (i = 0; (i < 100) && (ctl & OHCI_IR); i++) { - usb_pause_mtx(NULL, hz / 1000); - ctl = OREAD4(sc, OHCI_CONTROL); - } - if (ctl & OHCI_IR) { - device_printf(sc->sc_bus.bdev, - "SMM does not respond, resetting\n"); - OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET); - goto reset; - } - } else { - DPRINTF("cold started\n"); -reset: - /* controller was cold started */ - usb_pause_mtx(NULL, - USB_MS_TO_TICKS(USB_BUS_RESET_DELAY)); - } - /* * This reset should not be necessary according to the OHCI spec, but * without it some controllers do not start. |
