upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-10 09:11:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a regression issue:

Browse source 
- ACK can be received before data arrives in RX FIFO. Handle this.
- Remove obsolete comment.
- Some minor code styling.

MFC after:	2 weeks
This commit is contained in:
Hans Petter Selasky 2014-05-09 16:40:41 +00:00
parent 6052df8ef8
commit 897b7965df
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/dev/usb/controller/dwc_otg.c
View file

@ -1240,6 +1240,10 @@ check_state:
goto complete;
}
} else if (hcint & HCINT_ACK) {
/* wait for data - ACK arrived first */
if (!(hcint & HCINT_SOFTWARE_ONLY))
goto busy;
if (td->ep_type == UE_ISOCHRONOUS) {
/* check if we are complete */
if ((td->remainder == 0) ||
@ -1595,8 +1599,6 @@ dwc_otg_host_data_tx(struct dwc_otg_td *td)
}
}
/* channel must be disabled before we can complete the transfer */
if (hcint & (HCINT_ERRORS | HCINT_RETRY |
HCINT_ACK | HCINT_NYET)) {
@ -1646,15 +1648,13 @@ check_state:
break;
case DWC_CHAN_ST_WAIT_C_ANE:
if (hcint & HCINT_NYET)
if (hcint & HCINT_NYET) {
goto send_cpkt;
if (hcint & (HCINT_RETRY | HCINT_ERRORS)) {
} else if (hcint & (HCINT_RETRY | HCINT_ERRORS)) {
td->did_nak = 1;
td->tt_scheduled = 0;
goto send_pkt;
}
if (hcint & HCINT_ACK) {
} else if (hcint & HCINT_ACK) {
td->offset += td->tx_bytes;
td->remainder -= td->tx_bytes;
td->toggle ^= 1;