pbio/drv/bluetooth: Check for HCI enabled.

On some platforms it may not be enabled, e.g. when the USB Bluetooth dongle is
not plugged in.

Author: laurensvalk

lib/pbio/drv/bluetooth/bluetooth.c

@@ -158,6 +158,10 @@ pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect(pbdrv_bluetooth_periphe
 
     pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
 
+    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+        return PBIO_ERROR_INVALID_OP;
+    }
+
     // Can't connect if already connected or already busy.
     if (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PERIPHERAL) || peri->func) {
         return PBIO_ERROR_BUSY;
@@ -300,6 +304,10 @@ pbdrv_bluetooth_advertising_state_t pbdrv_bluetooth_advertising_state;
 
 pbio_error_t pbdrv_bluetooth_start_advertising(bool start) {
 
+    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+        return PBIO_ERROR_INVALID_OP;
+    }
+
     bool is_advertising = pbdrv_bluetooth_advertising_state == PBDRV_BLUETOOTH_ADVERTISING_STATE_ADVERTISING_PYBRICKS;
 
     // Already in requested state. This makes it safe to call stop advertising
@@ -330,6 +338,10 @@ uint8_t pbdrv_bluetooth_broadcast_data_size;
 
 pbio_error_t pbdrv_bluetooth_start_broadcasting(const uint8_t *data, size_t size) {
 
+    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+        return PBIO_ERROR_INVALID_OP;
+    }
+
     if (advertising_or_scan_func) {
         return PBIO_ERROR_BUSY;
     }
@@ -374,6 +386,10 @@ pbdrv_bluetooth_start_observing_callback_t pbdrv_bluetooth_observe_callback;
 
 pbio_error_t pbdrv_bluetooth_start_observing(pbdrv_bluetooth_start_observing_callback_t callback) {
 
+    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+        return PBIO_ERROR_INVALID_OP;
+    }
+
     if (advertising_or_scan_func) {
         return PBIO_ERROR_BUSY;
     }
@@ -593,14 +609,19 @@ pbio_error_t pbdrv_bluetooth_close_user_tasks(pbio_os_state_t *state, pbio_os_ti
 
 void pbdrv_bluetooth_deinit(void) {
 
+    // If Bluetooth is not even initialized, nothing to do.
+    if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+        return;
+    }
+
     // Under normal operation ::pbdrv_bluetooth_close_user_tasks completes
     // normally and there should be no user activity at this point. If there
     // is, a task got stuck, so exit forcefully.
     pbio_os_state_t unused;
     if (pbdrv_bluetooth_await_advertise_or_scan_command(&unused, NULL) != PBIO_SUCCESS ||
         pbdrv_bluetooth_await_peripheral_command(&unused, NULL) != PBIO_SUCCESS) {
 
-        // Hard reset without waitng on completion of any process.
+        // Hard reset without waiting on completion of any process.
         pbdrv_bluetooth_controller_reset_hard();
         return;
     }

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -124,28 +124,6 @@ static hci_con_handle_t uart_con_handle = HCI_CON_HANDLE_INVALID;
 static pup_handset_t handset;
 #endif // PBDRV_CONFIG_BLUETOOTH_BTSTACK_LE
 
-bool pbdrv_bluetooth_is_connected(pbdrv_bluetooth_connection_t connection) {
-    #if PBDRV_CONFIG_BLUETOOTH_BTSTACK_LE
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_LE && le_con_handle != HCI_CON_HANDLE_INVALID) {
-        return true;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_PYBRICKS && pybricks_con_handle != HCI_CON_HANDLE_INVALID) {
-        return true;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_UART && uart_con_handle != HCI_CON_HANDLE_INVALID) {
-        return true;
-    }
-
-    if (connection == PBDRV_BLUETOOTH_CONNECTION_PERIPHERAL && peripheral_singleton.con_handle != HCI_CON_HANDLE_INVALID) {
-        return true;
-    }
-    #endif // PBDRV_CONFIG_BLUETOOTH_BTSTACK_LE
-
-    return false;
-}
-
 #if PBDRV_CONFIG_BLUETOOTH_BTSTACK_LE
 
 /**
@@ -202,6 +180,39 @@ static void propagate_event(uint8_t *packet) {
     event_packet = NULL;
 }
 
+bool pbdrv_bluetooth_is_connected(pbdrv_bluetooth_connection_t connection) {
+
+    // Nothing connected if HCI is not running.
+    if (bluetooth_thread_err != PBIO_ERROR_AGAIN) {
+        return false;
+    }
+
+    #if PBDRV_CONFIG_BLUETOOTH_BTSTACK_LE
+
+    if (connection == PBDRV_BLUETOOTH_CONNECTION_HCI) {
+        return true;
+    }
+
+    if (connection == PBDRV_BLUETOOTH_CONNECTION_LE && le_con_handle != HCI_CON_HANDLE_INVALID) {
+        return true;
+    }
+
+    if (connection == PBDRV_BLUETOOTH_CONNECTION_PYBRICKS && pybricks_con_handle != HCI_CON_HANDLE_INVALID) {
+        return true;
+    }
+
+    if (connection == PBDRV_BLUETOOTH_CONNECTION_UART && uart_con_handle != HCI_CON_HANDLE_INVALID) {
+        return true;
+    }
+
+    if (connection == PBDRV_BLUETOOTH_CONNECTION_PERIPHERAL && peripheral_singleton.con_handle != HCI_CON_HANDLE_INVALID) {
+        return true;
+    }
+    #endif // PBDRV_CONFIG_BLUETOOTH_BTSTACK_LE
+
+    return false;
+}
+
 #if PBDRV_CONFIG_BLUETOOTH_BTSTACK_LE
 static void nordic_spp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
     switch (packet_type) {
@@ -993,6 +1004,10 @@ static pbio_error_t bluetooth_btstack_handle_power_control(pbio_os_state_t *stat
 
 pbio_error_t pbdrv_bluetooth_controller_reset(pbio_os_state_t *state, pbio_os_timer_t *timer) {
 
+    if (pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
+        return PBIO_ERROR_INVALID_OP;
+    }
+
     #if PBDRV_CONFIG_BLUETOOTH_BTSTACK_LE
     static pbio_os_state_t sub;
 

lib/pbio/drv/bluetooth/bluetooth_simulation.c

@@ -31,6 +31,11 @@ pbio_error_t pbdrv_bluetooth_stop_advertising_func(pbio_os_state_t *state, void
 }
 
 bool pbdrv_bluetooth_is_connected(pbdrv_bluetooth_connection_t connection) {
+
+    if (connection == PBDRV_BLUETOOTH_CONNECTION_HCI) {
+        return true;
+    }
+
     if (connection == PBDRV_BLUETOOTH_CONNECTION_LE) {
         return true;
     }

lib/pbio/drv/bluetooth/bluetooth_stm32_bluenrg.c

@@ -290,6 +290,11 @@ pbio_error_t pbdrv_bluetooth_stop_advertising_func(pbio_os_state_t *state, void
 
 
 bool pbdrv_bluetooth_is_connected(pbdrv_bluetooth_connection_t connection) {
+
+    if (connection == PBDRV_BLUETOOTH_CONNECTION_HCI) {
+        return true;
+    }
+
     if (connection == PBDRV_BLUETOOTH_CONNECTION_LE && conn_handle) {
         return true;
     }

lib/pbio/drv/bluetooth/bluetooth_stm32_cc2640.c

@@ -321,6 +321,11 @@ pbio_error_t pbdrv_bluetooth_stop_advertising_func(pbio_os_state_t *state, void
 }
 
 bool pbdrv_bluetooth_is_connected(pbdrv_bluetooth_connection_t connection) {
+
+    if (connection == PBDRV_BLUETOOTH_CONNECTION_HCI) {
+        return true;
+    }
+
     if (connection == PBDRV_BLUETOOTH_CONNECTION_LE && conn_handle != NO_CONNECTION && !busy_disconnecting) {
         return true;
     }

lib/pbio/include/pbdrv/bluetooth.h

@@ -22,6 +22,8 @@
  * BLE characteristic connection identifiers.
  */
 typedef enum {
+    /* Whether Bluetooth is present and enabled on this platform. */
+    PBDRV_BLUETOOTH_CONNECTION_HCI,
     /* A low energy device connection. */
     PBDRV_BLUETOOTH_CONNECTION_LE,
     /** The Pybricks service. */