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

Don't re-init bulk endpoints on every set_transceiver_mode call

Browse Source 
Previously the firmware would re-initialise the bulk endpoints on
every transceiver mode change including a USB data toggle reset,
which could cause the first bulk packet (512-bytes) to be dropped
by the host if the PID no longer matched.
This commit is contained in:
Mike Walters
2020-02-04 22:14:09 +00:00
parent 92ee144714
commit d8250c6396
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/hackrf_usb/hackrf_usb.c
View File

@ -149,6 +149,8 @@ void usb_configuration_changed(
/* Configuration number equal 0 means usb bus reset. */ /* Configuration number equal 0 means usb bus reset. */
led_off(LED1); led_off(LED1);
} }
usb_endpoint_init(&usb_endpoint_bulk_in);
usb_endpoint_init(&usb_endpoint_bulk_out);
} }
void usb_set_descriptor_by_serial_number(void) void usb_set_descriptor_by_serial_number(void)

7
firmware/hackrf_usb/usb_api_transceiver.c
View File

@ -246,21 +246,19 @@ transceiver_mode_t transceiver_mode(void) {
void set_transceiver_mode(const transceiver_mode_t new_transceiver_mode) { void set_transceiver_mode(const transceiver_mode_t new_transceiver_mode) {
baseband_streaming_disable(&sgpio_config); baseband_streaming_disable(&sgpio_config);
usb_endpoint_disable(&usb_endpoint_bulk_in); usb_endpoint_flush(&usb_endpoint_bulk_in);
usb_endpoint_disable(&usb_endpoint_bulk_out); usb_endpoint_flush(&usb_endpoint_bulk_out);
_transceiver_mode = new_transceiver_mode; _transceiver_mode = new_transceiver_mode;
if( _transceiver_mode == TRANSCEIVER_MODE_RX ) { if( _transceiver_mode == TRANSCEIVER_MODE_RX ) {
led_off(LED3); led_off(LED3);
led_on(LED2); led_on(LED2);
usb_endpoint_init(&usb_endpoint_bulk_in);
rf_path_set_direction(&rf_path, RF_PATH_DIRECTION_RX); rf_path_set_direction(&rf_path, RF_PATH_DIRECTION_RX);
usb_bulk_buffer_tx = false; usb_bulk_buffer_tx = false;
} else if (_transceiver_mode == TRANSCEIVER_MODE_TX) { } else if (_transceiver_mode == TRANSCEIVER_MODE_TX) {
led_off(LED2); led_off(LED2);
led_on(LED3); led_on(LED3);
usb_endpoint_init(&usb_endpoint_bulk_out);
rf_path_set_direction(&rf_path, RF_PATH_DIRECTION_TX); rf_path_set_direction(&rf_path, RF_PATH_DIRECTION_TX);
usb_bulk_buffer_tx = true; usb_bulk_buffer_tx = true;
} else { } else {
@ -293,7 +291,6 @@ usb_request_status_t usb_vendor_request_set_transceiver_mode(
usb_transfer_schedule_ack(endpoint->in); usb_transfer_schedule_ack(endpoint->in);
return USB_REQUEST_STATUS_OK; return USB_REQUEST_STATUS_OK;
case TRANSCEIVER_MODE_CPLD_UPDATE: case TRANSCEIVER_MODE_CPLD_UPDATE:
usb_endpoint_init(&usb_endpoint_bulk_out);
start_cpld_update = true; start_cpld_update = true;
usb_transfer_schedule_ack(endpoint->in); usb_transfer_schedule_ack(endpoint->in);
return USB_REQUEST_STATUS_OK; return USB_REQUEST_STATUS_OK;