mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-28 19:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

use async transfer for command packets

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2013-03-06 18:06:22 +00:00
parent c9810d4de6
commit 4a4906b5db
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/hci_transport_usb.c
View File

@ -102,6 +102,7 @@ static struct libusb_transfer *command_out_transfer;
static uint8_t hci_event_in_buffer[ASYNC_BUFFERS][HCI_ACL_BUFFER_SIZE]; // bigger than largest packet
static uint8_t hci_bulk_in_buffer[ASYNC_BUFFERS][HCI_ACL_BUFFER_SIZE]; // bigger than largest packet
static uint8_t hci_control_buffer[3 + 256 + LIBUSB_CONTROL_SETUP_SIZE];
// For (ab)use as a linked list of received packets
static struct libusb_transfer *handle_packet;
@ -111,7 +112,7 @@ static timer_source_t usb_timer;
static int usb_timer_active;
static int usb_acl_out_active = 0;
static int usb_command_out_active = 0;
static int usb_command_active = 0;
// endpoint addresses
static int event_in_addr;
@ -277,6 +278,11 @@ static int usb_process_ds(struct data_source *ds) {
log_info("acl out done");
usb_acl_out_active = 0;
resubmit = 0;
} else if (handle_packet->endpoint == 0){
log_info("command done");
usb_command_active = 0;
resubmit = 0;
} else {
@ -551,19 +557,30 @@ static int usb_send_cmd_packet(uint8_t *packet, int size){
int r;
if (libusb_state != LIB_USB_TRANSFERS_ALLOCATED) return -1;
// async
libusb_fill_control_setup(hci_control_buffer, LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE, 0, 0, 0, size);
memcpy(hci_control_buffer + LIBUSB_CONTROL_SETUP_SIZE, packet, size);
int completed = 0;
libusb_fill_control_transfer(command_out_transfer, handle, hci_control_buffer, async_callback, &completed, 0);
command_out_transfer->flags = LIBUSB_TRANSFER_FREE_BUFFER;
r = libusb_submit_transfer(command_out_transfer);
// Use synchronous call to sent out command
r = libusb_control_transfer(handle,
LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE,
0, 0, 0, packet, size, 0);
// // Use synchronous call to sent out command
// r = libusb_control_transfer(handle,
// LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE,
// 0, 0, 0, packet, size, 0);
if (r < 0 || r !=size ) {
log_error("Error submitting control transfer %d", r);
return r;
return -1;
}
hci_dump_packet( HCI_COMMAND_DATA_PACKET, 0, packet, size);
usb_command_active = 1;
return 0;
}
@ -594,6 +611,17 @@ static int usb_send_acl_packet(uint8_t *packet, int size){
return 0;
}
static int usb_can_send_packet_now(uint8_t packet_type){
switch (packet_type){
case HCI_COMMAND_DATA_PACKET:
return !usb_command_active;
case HCI_ACL_DATA_PACKET:
return !usb_acl_out_active;
default:
return 0;
}
}
static int usb_send_packet(uint8_t packet_type, uint8_t * packet, int size){
switch (packet_type){
case HCI_COMMAND_DATA_PACKET:
@ -609,9 +637,6 @@ static void usb_register_packet_handler(void (*handler)(uint8_t packet_type, uin
log_info("registering packet handler");
packet_handler = handler;
}
static int usb_can_send_packet_now(uint8_t packet_type){
return !usb_acl_out_active;
}
static const char * usb_get_transport_name(void){
return "USB";