diff options
| author | hselasky <hselasky@FreeBSD.org> | 2013-05-28 18:51:30 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2013-05-28 18:51:30 +0000 |
| commit | 3d6f59397cf8ef71ef502c8367d7ea4206264f3a (patch) | |
| tree | 70717ebc957552f68e27ab3207f5e92bde33956c /sys/dev | |
| parent | 9e2cb0c5b73a1978d727e2e6499f5175e07184f9 (diff) | |
| download | FreeBSD-src-3d6f59397cf8ef71ef502c8367d7ea4206264f3a.zip FreeBSD-src-3d6f59397cf8ef71ef502c8367d7ea4206264f3a.tar.gz | |
Revert r251023 until a more proper solution is found
for ATI based USB controllers.
MFC after: 1 week
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/controller/ehci.c | 19 | ||||
| -rw-r--r-- | sys/dev/usb/controller/uhci.c | 13 |
2 files changed, 0 insertions, 32 deletions
diff --git a/sys/dev/usb/controller/ehci.c b/sys/dev/usb/controller/ehci.c index f0616f9..51b012b 100644 --- a/sys/dev/usb/controller/ehci.c +++ b/sys/dev/usb/controller/ehci.c @@ -2454,7 +2454,6 @@ ehci_device_isoc_fs_enter(struct usb_xfer *xfer) uint16_t tlen; uint8_t sa; uint8_t sb; - uint8_t first = 1; #ifdef USB_DEBUG uint8_t once = 1; @@ -2619,16 +2618,6 @@ ehci_device_isoc_fs_enter(struct usb_xfer *xfer) EHCI_SITD_IOC | EHCI_SITD_ACTIVE | EHCI_SITD_SET_LEN(*plen)); - } else if (first != 0) { - /* - * Workaround for lost or too early - * completion interrupt: - */ - first = 0; - td->sitd_status = htohc32(sc, - EHCI_SITD_IOC | - EHCI_SITD_ACTIVE | - EHCI_SITD_SET_LEN(*plen)); } else { td->sitd_status = htohc32(sc, EHCI_SITD_ACTIVE | @@ -2770,7 +2759,6 @@ ehci_device_isoc_hs_enter(struct usb_xfer *xfer) uint8_t td_no; uint8_t page_no; uint8_t shift = usbd_xfer_get_fps_shift(xfer); - uint8_t first = 1; #ifdef USB_DEBUG uint8_t once = 1; @@ -2932,13 +2920,6 @@ ehci_device_isoc_hs_enter(struct usb_xfer *xfer) /* set IOC bit if we are complete */ if (nframes == 0) { td->itd_status[td_no - 1] |= htohc32(sc, EHCI_ITD_IOC); - } else if (first != 0) { - /* - * Workaround for lost or too early - * completion interrupt: - */ - first = 0; - td->itd_status[0] |= htohc32(sc, EHCI_ITD_IOC); } usb_pc_cpu_flush(td->page_cache); #ifdef USB_DEBUG diff --git a/sys/dev/usb/controller/uhci.c b/sys/dev/usb/controller/uhci.c index 49ce4e1..fe3cf93 100644 --- a/sys/dev/usb/controller/uhci.c +++ b/sys/dev/usb/controller/uhci.c @@ -2138,7 +2138,6 @@ uhci_device_isoc_enter(struct usb_xfer *xfer) uint32_t nframes; uint32_t temp; uint32_t *plen; - uint8_t first = 1; #ifdef USB_DEBUG uint8_t once = 1; @@ -2254,18 +2253,6 @@ uhci_device_isoc_enter(struct usb_xfer *xfer) UHCI_TD_ACTIVE | UHCI_TD_IOS | UHCI_TD_IOC)); - } else if (first != 0) { - /* - * Workaround for lost or too early completion - * interrupt: - */ - first = 0; - td->td_status = htole32 - (UHCI_TD_ZERO_ACTLEN - (UHCI_TD_SET_ERRCNT(0) | - UHCI_TD_ACTIVE | - UHCI_TD_IOS | - UHCI_TD_IOC)); } else { td->td_status = htole32 (UHCI_TD_ZERO_ACTLEN |
