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

usb_queue: Account for completion of multiple transfers

Browse Source
This commit is contained in:
Ben Gamari
2013-07-03 19:11:26 -04:00
parent 13589b8695
commit f1fc4a6d73
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
firmware/hackrf_usb/usb_queue.c
View File

@ -93,19 +93,6 @@ static void endpoint_add_transfer(
//enable_irqs(); //enable_irqs();
} }
/* Pop off the transfer at the top of an endpoint's queue */
static usb_transfer_t* endpoint_pop_transfer(
const usb_endpoint_t* const endpoint
) {
uint_fast8_t index = USB_ENDPOINT_INDEX(endpoint->address);
//FIXME disable_irqs();
usb_transfer_t* transfer = endpoint_transfers[index];
assert(transfer != NULL);
endpoint_transfers[index] = transfer->next;
//enable_irqs();
return transfer;
}
void usb_transfer_schedule( void usb_transfer_schedule(
const usb_endpoint_t* const endpoint, const usb_endpoint_t* const endpoint,
void* const data, void* const data,
@ -134,12 +121,12 @@ void usb_transfer_schedule(
// Fill in transfer fields // Fill in transfer fields
transfer->maximum_length = maximum_length; transfer->maximum_length = maximum_length;
transfer->completion_cb = completion_cb; transfer->completion_cb = completion_cb;
transfer->endpoint = endpoint; transfer->endpoint = (usb_endpoint_t*) endpoint;
// TODO: disable_interrupts(); // TODO: disable_interrupts();
usb_transfer_t* tail = endpoint_transfers[index]; usb_transfer_t* tail = endpoint_transfers[index];
endpoint_add_transfer(endpoint, transfer); endpoint_add_transfer(endpoint, transfer);
if (tail == NULL) { if (1 || tail == NULL) {
// The queue is currently empty, we need to re-prime // The queue is currently empty, we need to re-prime
usb_endpoint_schedule_wait(endpoint, &transfer->td); usb_endpoint_schedule_wait(endpoint, &transfer->td);
} else { } else {
@ -156,19 +143,36 @@ void usb_transfer_schedule_ack(
usb_transfer_schedule(endpoint, 0, 0, NULL); usb_transfer_schedule(endpoint, 0, 0, NULL);
} }
/* Called when an endpoint might have completed a transfer */
void usb_queue_transfer_complete(usb_endpoint_t* const endpoint) void usb_queue_transfer_complete(usb_endpoint_t* const endpoint)
{ {
usb_transfer_t* transfer = endpoint_pop_transfer(endpoint); uint_fast8_t index = USB_ENDPOINT_INDEX(endpoint->address);
unsigned int total_bytes = (transfer->td.total_bytes & USB_TD_DTD_TOKEN_TOTAL_BYTES_MASK) >> USB_TD_DTD_TOKEN_TOTAL_BYTES_SHIFT; usb_transfer_t* transfer = endpoint_transfers[index];
unsigned int transferred = transfer->maximum_length - total_bytes;
while (transfer != NULL) {
uint8_t status = transfer->td.total_bytes; uint8_t status = transfer->td.total_bytes;
if (status & USB_TD_DTD_TOKEN_STATUS_ACTIVE
|| status & USB_TD_DTD_TOKEN_STATUS_HALTED // Check for failures
if ( status & USB_TD_DTD_TOKEN_STATUS_HALTED
|| status & USB_TD_DTD_TOKEN_STATUS_BUFFER_ERROR || status & USB_TD_DTD_TOKEN_STATUS_BUFFER_ERROR
|| status & USB_TD_DTD_TOKEN_STATUS_TRANSACTION_ERROR) { || status & USB_TD_DTD_TOKEN_STATUS_TRANSACTION_ERROR) {
assert(0); assert(0);
} }
// Still not finished
if (status & USB_TD_DTD_TOKEN_STATUS_ACTIVE)
break;
// 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 transferred = transfer->maximum_length - total_bytes;
if (transfer->completion_cb) if (transfer->completion_cb)
transfer->completion_cb(transfer, transferred); transfer->completion_cb(transfer, transferred);
// Advance head and free
endpoint_transfers[index] = transfer->next;
usb_transfer_t* next = transfer->next;
free_transfer(transfer); free_transfer(transfer);
transfer = next;
}
} }