pbio/drv/bluetooth: Use peripheral reference.

Start getting rid of the singleton instance so we
can eventually support more than one.

Author: laurensvalk

lib/pbio/drv/bluetooth/bluetooth.c

@@ -177,14 +177,11 @@ void pbdrv_bluetooth_peripheral_release(pbdrv_bluetooth_peripheral_t *peripheral
     peripheral->user = NULL;
 }
 
-const char *pbdrv_bluetooth_peripheral_get_name(void) {
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+const char *pbdrv_bluetooth_peripheral_get_name(pbdrv_bluetooth_peripheral_t *peri) {
     return peri->name;
 }
 
-pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect(pbdrv_bluetooth_peripheral_connect_config_t *config) {
-
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect(pbdrv_bluetooth_peripheral_t *peri, pbdrv_bluetooth_peripheral_connect_config_t *config) {
 
     if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_HCI)) {
         return PBIO_ERROR_INVALID_OP;
@@ -214,9 +211,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect(pbdrv_bluetooth_periphe
     return PBIO_SUCCESS;
 }
 
-pbio_error_t pbdrv_bluetooth_peripheral_disconnect(void) {
-
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+pbio_error_t pbdrv_bluetooth_peripheral_disconnect(pbdrv_bluetooth_peripheral_t *peri) {
 
     // Busy doing something else.
     if (peri->func) {
@@ -236,9 +231,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_disconnect(void) {
     return PBIO_SUCCESS;
 }
 
-pbio_error_t pbdrv_bluetooth_peripheral_discover_characteristic(pbdrv_bluetooth_peripheral_char_t *characteristic) {
-
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+pbio_error_t pbdrv_bluetooth_peripheral_discover_characteristic(pbdrv_bluetooth_peripheral_t *peri, pbdrv_bluetooth_peripheral_char_t *characteristic) {
 
     if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PERIPHERAL)) {
         return PBIO_ERROR_NO_DEV;
@@ -249,16 +242,14 @@ pbio_error_t pbdrv_bluetooth_peripheral_discover_characteristic(pbdrv_bluetooth_
 
     // Initialize operation for handling on the main thread.
     characteristic->handle = 0;
-    peripheral_singleton.char_now = characteristic;
+    peri->char_now = characteristic;
     peri->func = pbdrv_bluetooth_peripheral_discover_characteristic_func;
     peri->err = PBIO_ERROR_AGAIN;
     pbio_os_request_poll();
     return PBIO_SUCCESS;
 }
 
-pbio_error_t pbdrv_bluetooth_peripheral_read_characteristic(pbdrv_bluetooth_peripheral_char_t *characteristic) {
-
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+pbio_error_t pbdrv_bluetooth_peripheral_read_characteristic(pbdrv_bluetooth_peripheral_t *peri, pbdrv_bluetooth_peripheral_char_t *characteristic) {
 
     if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PERIPHERAL)) {
         return PBIO_ERROR_NO_DEV;
@@ -268,7 +259,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_read_characteristic(pbdrv_bluetooth_peri
     }
 
     // Initialize operation for handling on the main thread.
-    peripheral_singleton.char_now = characteristic;
+    peri->char_now = characteristic;
     peri->func = pbdrv_bluetooth_peripheral_read_characteristic_func;
     peri->err = PBIO_ERROR_AGAIN;
     pbio_os_request_poll();
@@ -279,9 +270,7 @@ uint16_t pbdrv_bluetooth_char_write_handle;
 uint8_t pbdrv_bluetooth_char_write_data[PBDRV_BLUETOOTH_MAX_CHAR_SIZE];
 size_t pbdrv_bluetooth_char_write_size;
 
-pbio_error_t pbdrv_bluetooth_peripheral_write_characteristic(uint16_t handle, const uint8_t *data, size_t size) {
-
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+pbio_error_t pbdrv_bluetooth_peripheral_write_characteristic(pbdrv_bluetooth_peripheral_t *peri, uint16_t handle, const uint8_t *data, size_t size) {
 
     if (!pbdrv_bluetooth_is_connected(PBDRV_BLUETOOTH_CONNECTION_PERIPHERAL)) {
         return PBIO_ERROR_NO_DEV;
@@ -306,7 +295,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_write_characteristic(uint16_t handle, co
 
 pbio_error_t pbdrv_bluetooth_await_peripheral_command(pbio_os_state_t *state, void *context) {
 
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+    pbdrv_bluetooth_peripheral_t *peri = context;
 
     // If the user is no longer calling this then the operation is no longer
     // of interest and will be cancelled if the active function supports it.
@@ -626,12 +615,12 @@ pbio_error_t pbdrv_bluetooth_close_user_tasks(pbio_os_state_t *state, pbio_os_ti
     pbdrv_bluetooth_cancel_operation_request();
 
     // Let ongoing user tasks finish first.
-    PBIO_OS_AWAIT(state, &sub, pbdrv_bluetooth_await_peripheral_command(&sub, NULL));
+    PBIO_OS_AWAIT(state, &sub, pbdrv_bluetooth_await_peripheral_command(&sub, &peripheral_singleton));
     PBIO_OS_AWAIT(state, &sub, pbdrv_bluetooth_await_advertise_or_scan_command(&sub, NULL));
 
     // Disconnect peripheral.
-    pbdrv_bluetooth_peripheral_disconnect();
-    PBIO_OS_AWAIT(state, &sub, pbdrv_bluetooth_await_peripheral_command(&sub, NULL));
+    pbdrv_bluetooth_peripheral_disconnect(&peripheral_singleton);
+    PBIO_OS_AWAIT(state, &sub, pbdrv_bluetooth_await_peripheral_command(&sub, &peripheral_singleton));
 
     // Stop scanning.
     pbdrv_bluetooth_start_observing(NULL);

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -588,7 +588,7 @@ pbio_error_t pbdrv_bluetooth_send_pybricks_value_notification(pbio_os_state_t *s
 
 pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect_func(pbio_os_state_t *state, void *context) {
 
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+    pbdrv_bluetooth_peripheral_t *peri = context;
     pbdrv_bluetooth_ad_match_result_flags_t flags;
     uint8_t btstack_error;
 
@@ -803,7 +803,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect_func(pbio_os_state_t *s
 
 pbio_error_t pbdrv_bluetooth_peripheral_discover_characteristic_func(pbio_os_state_t *state, void *context) {
 
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+    pbdrv_bluetooth_peripheral_t *peri = context;
     gatt_client_characteristic_t *current_char = &peri->platform_state->current_char;
 
     uint8_t btstack_error;
@@ -910,7 +910,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_discover_characteristic_func(pbio_os_sta
 
 pbio_error_t pbdrv_bluetooth_peripheral_read_characteristic_func(pbio_os_state_t *state, void *context) {
 
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+    pbdrv_bluetooth_peripheral_t *peri = context;
 
     uint8_t btstack_error;
 
@@ -959,7 +959,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_read_characteristic_func(pbio_os_state_t
 
 pbio_error_t pbdrv_bluetooth_peripheral_write_characteristic_func(pbio_os_state_t *state, void *context) {
 
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+    pbdrv_bluetooth_peripheral_t *peri = context;
 
     uint8_t btstack_error;
 
@@ -998,7 +998,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_write_characteristic_func(pbio_os_state_
 
 pbio_error_t pbdrv_bluetooth_peripheral_disconnect_func(pbio_os_state_t *state, void *context) {
 
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+    pbdrv_bluetooth_peripheral_t *peri = context;
 
     PBIO_OS_ASYNC_BEGIN(state);
 

lib/pbio/drv/bluetooth/bluetooth_stm32_bluenrg.c

@@ -336,7 +336,7 @@ pbio_error_t pbdrv_bluetooth_send_pybricks_value_notification(pbio_os_state_t *s
 }
 
 pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect_func(pbio_os_state_t *state, void *context) {
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+    pbdrv_bluetooth_peripheral_t *peri = context;
 
     // Scan and connect timeout, if applicable.
     bool timed_out = peri->config->timeout && pbio_os_timer_is_expired(&peri->timer);
@@ -455,7 +455,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect_func(pbio_os_state_t *s
 }
 
 pbio_error_t pbdrv_bluetooth_peripheral_discover_characteristic_func(pbio_os_state_t *state, void *context) {
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+    pbdrv_bluetooth_peripheral_t *peri = context;
 
     PBIO_OS_ASYNC_BEGIN(state);
 
@@ -573,7 +573,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_write_characteristic_func(pbio_os_state_
 
 pbio_error_t pbdrv_bluetooth_peripheral_disconnect_func(pbio_os_state_t *state, void *context) {
 
-    pbdrv_bluetooth_peripheral_t *peri = &peripheral_singleton;
+    pbdrv_bluetooth_peripheral_t *peri = context;
 
     PBIO_OS_ASYNC_BEGIN(state);
 

lib/pbio/include/pbdrv/bluetooth.h

@@ -386,7 +386,7 @@ void pbdrv_bluetooth_peripheral_release(pbdrv_bluetooth_peripheral_t *peripheral
  *
  * @return  The name of the connected peripheral. May not be set.
  */
-const char *pbdrv_bluetooth_peripheral_get_name(void);
+const char *pbdrv_bluetooth_peripheral_get_name(pbdrv_bluetooth_peripheral_t *peripheral);
 
 /**
  * Starts scanning for a BLE device and connects to it.
@@ -395,7 +395,7 @@ const char *pbdrv_bluetooth_peripheral_get_name(void);
  * @return               ::PBIO_SUCCESS if the operation was scheduled.
  *                       ::PBIO_ERROR_BUSY if already connected or another peripheral operation is ongoing.
  */
-pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect(pbdrv_bluetooth_peripheral_connect_config_t *config);
+pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect(pbdrv_bluetooth_peripheral_t *peripheral, pbdrv_bluetooth_peripheral_connect_config_t *config);
 
 /**
  * Disconnect from the peripheral.
@@ -404,7 +404,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect(pbdrv_bluetooth_periphe
  * @return                     ::PBIO_SUCCESS if disconnection schefuled or when already disconnected.
  *                             ::PBIO_ERROR_BUSY if another peripheral operation is ongoing.
  */
-pbio_error_t pbdrv_bluetooth_peripheral_disconnect(void);
+pbio_error_t pbdrv_bluetooth_peripheral_disconnect(pbdrv_bluetooth_peripheral_t *peripheral);
 
 /**
  * Find a characteristic by UUID and properties.
@@ -417,7 +417,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_disconnect(void);
  *                             ::PBIO_ERROR_BUSY if another peripheral operation is ongoing.
  *                             ::PBIO_ERROR_NO_DEV if no peripheral is connected.
  */
-pbio_error_t pbdrv_bluetooth_peripheral_discover_characteristic(pbdrv_bluetooth_peripheral_char_t *characteristic);
+pbio_error_t pbdrv_bluetooth_peripheral_discover_characteristic(pbdrv_bluetooth_peripheral_t *peripheral, pbdrv_bluetooth_peripheral_char_t *characteristic);
 
 /**
  * Read a characteristic.
@@ -427,13 +427,14 @@ pbio_error_t pbdrv_bluetooth_peripheral_discover_characteristic(pbdrv_bluetooth_
  *                             ::PBIO_ERROR_NO_DEV if not connected to a peripheral.
  *                             ::PBIO_ERROR_BUSY if another operation is ongoing.
  */
-pbio_error_t pbdrv_bluetooth_peripheral_read_characteristic(pbdrv_bluetooth_peripheral_char_t *characteristic);
+pbio_error_t pbdrv_bluetooth_peripheral_read_characteristic(pbdrv_bluetooth_peripheral_t *peripheral, pbdrv_bluetooth_peripheral_char_t *characteristic);
 
 /**
  * Write a value to a peripheral characteristic without response.
  *
  * The write is queued for transmission and does not await completion.
  *
+ * @param [in]  peri       The peripheral to write to.
  * @param [in]  handle     The handle of the characteristic value to write.
  * @param [in]  data       The data to write.
  * @param [in]  size       The size of @p data in bytes.
@@ -442,14 +443,14 @@ pbio_error_t pbdrv_bluetooth_peripheral_read_characteristic(pbdrv_bluetooth_peri
  *                         ::PBIO_ERROR_BUSY if another peripheral operation is ongoing.
  *                         ::PBIO_ERROR_INVALID_ARG if @p size is too big.
  */
-pbio_error_t pbdrv_bluetooth_peripheral_write_characteristic(uint16_t handle, const uint8_t *data, size_t size);
+pbio_error_t pbdrv_bluetooth_peripheral_write_characteristic(pbdrv_bluetooth_peripheral_t *peripheral, uint16_t handle, const uint8_t *data, size_t size);
 
 /**
  * Awaits for a task associated with a peripheral to complete. Used to await
  * characteristic discover/read/write, scan-and-connect, or disconnect.
  *
  * @param [in]  state          Protothread state. Not used in all implementations.
- * @param [in]  context        Not used.
+ * @param [in]  context        The peripheral.
  * @return                     ::PBIO_SUCCESS on completion.
  *                             ::PBIO_ERROR_AGAIN while awaiting.
  *                             or a thread specific error code if the operation failed.
@@ -599,19 +600,19 @@ static inline pbio_error_t pbdrv_bluetooth_peripheral_get_available(pbdrv_blueto
 static inline void pbdrv_bluetooth_peripheral_release(pbdrv_bluetooth_peripheral_t *peripheral, void *user) {
 }
 
-static inline const char *pbdrv_bluetooth_peripheral_get_name(void) {
+static inline const char *pbdrv_bluetooth_peripheral_get_name(pbdrv_bluetooth_peripheral_t *peripheral) {
     return NULL;
 }
 
-static inline pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect(pbdrv_bluetooth_peripheral_connect_config_t *config) {
+static inline pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect(pbdrv_bluetooth_peripheral_t *peripheral, pbdrv_bluetooth_peripheral_connect_config_t *config) {
     return PBIO_ERROR_NOT_SUPPORTED;
 }
 
-static inline pbio_error_t pbdrv_bluetooth_peripheral_disconnect(void) {
+static inline pbio_error_t pbdrv_bluetooth_peripheral_disconnect(pbdrv_bluetooth_peripheral_t *peripheral) {
     return PBIO_ERROR_NOT_SUPPORTED;
 }
 
-static inline pbio_error_t pbdrv_bluetooth_peripheral_discover_characteristic(pbdrv_bluetooth_peripheral_char_t *characteristic) {
+static inline pbio_error_t pbdrv_bluetooth_peripheral_discover_characteristic(pbdrv_bluetooth_peripheral_t *peripheral, pbdrv_bluetooth_peripheral_char_t *characteristic) {
     return PBIO_ERROR_NOT_SUPPORTED;
 }
 
@@ -620,7 +621,7 @@ static inline pbio_error_t pbdrv_bluetooth_peripheral_read_characteristic(
     return PBIO_ERROR_NOT_SUPPORTED;
 }
 
-static inline pbio_error_t pbdrv_bluetooth_peripheral_write_characteristic(uint16_t handle, const uint8_t *data, size_t size) {
+static inline pbio_error_t pbdrv_bluetooth_peripheral_write_characteristic(pbdrv_bluetooth_peripheral_t *peripheral, uint16_t handle, const uint8_t *data, size_t size) {
     return PBIO_ERROR_NOT_SUPPORTED;
 }