From a8d51f092f1b660d0f6921369ad2bc3f9368296c Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Tue, 27 Oct 2020 18:16:17 +0100 Subject: [PATCH] add missing default switch cases --- platform/libusb/hci_transport_h2_libusb.c | 18 ++++++++++++++++-- src/btstack_base64_decoder.c | 4 ++++ src/btstack_slip.c | 3 +++ src/hci_transport_h5.c | 3 +++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/platform/libusb/hci_transport_h2_libusb.c b/platform/libusb/hci_transport_h2_libusb.c index 314a3fa21..ede39bdfb 100644 --- a/platform/libusb/hci_transport_h2_libusb.c +++ b/platform/libusb/hci_transport_h2_libusb.c @@ -434,6 +434,9 @@ static void handle_isochronous_data(uint8_t * buffer, uint16_t size){ packet_handler(HCI_SCO_DATA_PACKET, sco_buffer, sco_read_pos); sco_state_machine_init(); break; + default: + btstack_assert(false); + break; } } } @@ -1183,6 +1186,8 @@ static int usb_close(void){ doing_pollfds = 0; } + /* fall through */ + case LIB_USB_INTERFACE_CLAIMED: // Cancel all transfers, ignore warnings for this libusb_set_debug(NULL, LIBUSB_LOG_LEVEL_ERROR); @@ -1281,11 +1286,20 @@ static int usb_close(void){ #endif log_info("Libusb shutdown complete"); + /* fall through */ + case LIB_USB_DEVICE_OPENDED: libusb_close(handle); + /* fall through */ + case LIB_USB_OPENED: libusb_exit(NULL); + break; + + default: + btstack_assert(false); + break; } libusb_state = LIB_USB_CLOSED; @@ -1314,7 +1328,7 @@ static int usb_send_cmd_packet(uint8_t *packet, int size){ // submit transfer r = libusb_submit_transfer(command_out_transfer); - + if (r < 0) { usb_command_active = 0; log_error("Error submitting cmd transfer %d", r); @@ -1330,7 +1344,7 @@ static int usb_send_acl_packet(uint8_t *packet, int size){ if (libusb_state != LIB_USB_TRANSFERS_ALLOCATED) return -1; // log_info("usb_send_acl_packet enter, size %u", size); - + // prepare transfer int completed = 0; libusb_fill_bulk_transfer(acl_out_transfer, handle, acl_out_addr, packet, size, diff --git a/src/btstack_base64_decoder.c b/src/btstack_base64_decoder.c index 120253846..397a4f12d 100644 --- a/src/btstack_base64_decoder.c +++ b/src/btstack_base64_decoder.c @@ -42,6 +42,7 @@ */ #include "btstack_base64_decoder.h" +#include "btstack_debug.h" #include /** @@ -119,6 +120,9 @@ int btstack_base64_decoder_process_byte(btstack_base64_decoder_t * context, uin case 99: result = BTSTACK_BASE64_DECODER_INVALID; break; + default: + btstack_assert(false); + break; } return result; } diff --git a/src/btstack_slip.c b/src/btstack_slip.c index 63d6e556b..5fd5113ef 100644 --- a/src/btstack_slip.c +++ b/src/btstack_slip.c @@ -215,6 +215,9 @@ void btstack_slip_decoder_process(uint8_t input){ break; } break; + default: + btstack_assert(false); + break; } } diff --git a/src/hci_transport_h5.c b/src/hci_transport_h5.c index e58f0b46b..a8ec2645b 100644 --- a/src/hci_transport_h5.c +++ b/src/hci_transport_h5.c @@ -704,6 +704,9 @@ static void hci_transport_h5_process_frame(uint16_t frame_size){ // reset inactvitiy timer hci_transport_inactivity_timer_set(); break; + default: + // invalid packet type, ignore + break; } break;