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

usb_queue: Cleanup

Browse Source
This commit is contained in:
Ben Gamari
2013-07-03 14:51:41 -04:00
parent ac29621a36
commit ee46cf1fc4
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
firmware/hackrf_usb/usb_queue.c
View File

@ -31,9 +31,8 @@
struct _usb_transfer_t { struct _usb_transfer_t {
struct _usb_transfer_t* next; struct _usb_transfer_t* next;
usb_transfer_descriptor_t td ATTR_ALIGNED(64); usb_transfer_descriptor_t td ATTR_ALIGNED(64);
unsigned int actual_length; unsigned int maximum_length;
usb_endpoint_t* endpoint; usb_endpoint_t* endpoint;
bool finished;
transfer_completion_cb completion_cb; transfer_completion_cb completion_cb;
}; };
@ -56,25 +55,13 @@ void usb_queue_init() {
t->next = NULL; t->next = NULL;
} }
static bool usb_endpoint_is_in(const uint_fast8_t endpoint_address) {
return (endpoint_address & 0x80) ? true : false;
}
#if 0
static usb_transfer_t* usb_transfer(
const uint_fast8_t endpoint_address
) {
return endpoint_transfers[USB_ENDPOINT_INDEX(endpoint_address)];
}
#endif
static void fill_in_transfer(usb_transfer_t* transfer, static void fill_in_transfer(usb_transfer_t* transfer,
void* const data, void* const data,
const uint32_t maximum_length const uint32_t maximum_length
) { ) {
usb_transfer_descriptor_t* const td = &transfer->td; usb_transfer_descriptor_t* const td = &transfer->td;
// Configure a transfer. // Configure the transfer. descriptor
td->total_bytes = td->total_bytes =
USB_TD_DTD_TOKEN_TOTAL_BYTES(maximum_length) USB_TD_DTD_TOKEN_TOTAL_BYTES(maximum_length)
| USB_TD_DTD_TOKEN_IOC | USB_TD_DTD_TOKEN_IOC
@ -86,8 +73,11 @@ static void fill_in_transfer(usb_transfer_t* transfer,
td->buffer_pointer_page[2] = ((uint32_t)data + 0x2000) & 0xfffff000; td->buffer_pointer_page[2] = ((uint32_t)data + 0x2000) & 0xfffff000;
td->buffer_pointer_page[3] = ((uint32_t)data + 0x3000) & 0xfffff000; td->buffer_pointer_page[3] = ((uint32_t)data + 0x3000) & 0xfffff000;
td->buffer_pointer_page[4] = ((uint32_t)data + 0x4000) & 0xfffff000; td->buffer_pointer_page[4] = ((uint32_t)data + 0x4000) & 0xfffff000;
transfer->maximum_length = maximum_length;
} }
/* Allocate a transfer */
static usb_transfer_t* allocate_transfer() static usb_transfer_t* allocate_transfer()
{ {
while (free_transfers == NULL); while (free_transfers == NULL);
@ -95,10 +85,19 @@ static usb_transfer_t* allocate_transfer()
usb_transfer_t* const transfer = free_transfers; usb_transfer_t* const transfer = free_transfers;
free_transfers = transfer->next; free_transfers = transfer->next;
//enable_irqs(); //enable_irqs();
transfer->finished = false;
return transfer; return transfer;
} }
/* Place a transfer in the free list */
static void free_transfer(usb_transfer_t* const transfer)
{
//disable_irqs(); // FIXME
transfer->next = free_transfers;
free_transfers = transfer;
//enable_irqs();
}
/* Add a transfer to the end of an endpoint's queue */
static void endpoint_add_transfer( static void endpoint_add_transfer(
const usb_endpoint_t* const endpoint, const usb_endpoint_t* const endpoint,
usb_transfer_t* const transfer usb_transfer_t* const transfer
@ -116,6 +115,7 @@ 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( static usb_transfer_t* endpoint_pop_transfer(
const usb_endpoint_t* const endpoint const usb_endpoint_t* const endpoint
) { ) {
@ -168,9 +168,8 @@ void usb_transfer_schedule_ack(
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); usb_transfer_t* transfer = endpoint_pop_transfer(endpoint);
unsigned int transferred = transfer->actual_length - transfer->td.total_bytes; unsigned int transferred = transfer->maximum_length - transfer->td.total_bytes;
if (transfer->completion_cb) if (transfer->completion_cb)
transfer->completion_cb(transfer, transferred); transfer->completion_cb(transfer, transferred);
else if (usb_endpoint_is_in(transfer->endpoint->address)) free_transfer(transfer);
transfer->finished = true;
} }