Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb_queue: Update queue before calling completion callback

Browse Source
This commit is contained in:
Ben Gamari
2013-07-05 11:15:23 -04:00
parent 5a70772295
commit 969647dbef
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/hackrf_usb/usb_queue.c
View File

@ -165,6 +165,11 @@ void usb_queue_transfer_complete(usb_endpoint_t* const endpoint)
if (status & USB_TD_DTD_TOKEN_STATUS_ACTIVE) if (status & USB_TD_DTD_TOKEN_STATUS_ACTIVE)
break; break;
// Advance the head. We need to do this before invoking the completion
// callback as it might attempt to schedule a new transfer
endpoint_transfers[index] = transfer->next;
usb_transfer_t* next = transfer->next;
// Invoke completion callback // Invoke completion callback
unsigned int total_bytes = (transfer->td.total_bytes & USB_TD_DTD_TOKEN_TOTAL_BYTES_MASK) >> USB_TD_DTD_TOKEN_TOTAL_BYTES_SHIFT; unsigned int total_bytes = (transfer->td.total_bytes & USB_TD_DTD_TOKEN_TOTAL_BYTES_MASK) >> USB_TD_DTD_TOKEN_TOTAL_BYTES_SHIFT;
unsigned int transferred = transfer->maximum_length - total_bytes; unsigned int transferred = transfer->maximum_length - total_bytes;
@ -172,8 +177,6 @@ void usb_queue_transfer_complete(usb_endpoint_t* const endpoint)
transfer->completion_cb(transfer, transferred); transfer->completion_cb(transfer, transferred);
// Advance head and free transfer // Advance head and free transfer
endpoint_transfers[index] = transfer->next;
usb_transfer_t* next = transfer->next;
free_transfer(transfer); free_transfer(transfer);
transfer = next; transfer = next;
} }