pbio/drv/bluetooth: Pass user object to scan filters.

This was still using part of the singleton code, but we need to generalize this for multi-peripheral support too. This was missed when upgrading the object handling for notifications.

Author: laurensvalk

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -432,7 +432,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
                 // Match advertisement data against context-specific filter.
                 pbdrv_bluetooth_ad_match_result_flags_t adv_flags = PBDRV_BLUETOOTH_AD_MATCH_NONE;
                 if (peri->config->match_adv) {
-                    adv_flags = peri->config->match_adv(event_type, data, NULL, address, peri->bdaddr);
+                    adv_flags = peri->config->match_adv(peri->user, event_type, data, NULL, address, peri->bdaddr);
                 }
 
                 if (adv_flags & PBDRV_BLUETOOTH_AD_MATCH_VALUE) {
@@ -454,7 +454,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
 
                 pbdrv_bluetooth_ad_match_result_flags_t rsp_flags = PBDRV_BLUETOOTH_AD_MATCH_NONE;
                 if (peri->config->match_adv_rsp) {
-                    rsp_flags = peri->config->match_adv_rsp(event_type, NULL, detected_name, address, peri->bdaddr);
+                    rsp_flags = peri->config->match_adv_rsp(peri->user, event_type, NULL, detected_name, address, peri->bdaddr);
                 }
                 if ((rsp_flags & PBDRV_BLUETOOTH_AD_MATCH_VALUE) && (rsp_flags & PBDRV_BLUETOOTH_AD_MATCH_ADDRESS)) {
 

lib/pbio/drv/bluetooth/bluetooth_stm32_bluenrg.c

@@ -372,7 +372,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect_func(pbio_os_state_t *s
         le_advertising_info *subevt = (void *)&read_buf[5];
 
         // Context specific advertisement filter.
-        pbdrv_bluetooth_ad_match_result_flags_t adv_flags = peri->config->match_adv(subevt->evt_type, subevt->data_RSSI, NULL, subevt->bdaddr, peri->bdaddr);
+        pbdrv_bluetooth_ad_match_result_flags_t adv_flags = peri->config->match_adv(peri->user, subevt->evt_type, subevt->data_RSSI, NULL, subevt->bdaddr, peri->bdaddr);
 
         // If it doesn't match context-specific filter, keep scanning.
         if (!(adv_flags & PBDRV_BLUETOOTH_AD_MATCH_VALUE)) {
@@ -409,7 +409,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect_func(pbio_os_state_t *s
         // If the response data is not right or if the address doesn't match advertisement, keep scanning.
         le_advertising_info *subevt = (void *)&read_buf[5];
         const char *detected_name = (char *)&subevt->data_RSSI[2];
-        pbdrv_bluetooth_ad_match_result_flags_t rsp_flags = peri->config->match_adv_rsp(subevt->evt_type, NULL, detected_name, subevt->bdaddr, peri->bdaddr);
+        pbdrv_bluetooth_ad_match_result_flags_t rsp_flags = peri->config->match_adv_rsp(peri->user, subevt->evt_type, NULL, detected_name, subevt->bdaddr, peri->bdaddr);
         if (!(rsp_flags & PBDRV_BLUETOOTH_AD_MATCH_VALUE) || !(rsp_flags & PBDRV_BLUETOOTH_AD_MATCH_ADDRESS)) {
             continue;
         }

lib/pbio/drv/bluetooth/bluetooth_stm32_cc2640.c

@@ -448,7 +448,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect_func(pbio_os_state_t *s
         }
 
         // Context specific advertisement filter.
-        pbdrv_bluetooth_ad_match_result_flags_t adv_flags = peri->config->match_adv(read_buf[9], &read_buf[19], NULL, &read_buf[11], peri->bdaddr);
+        pbdrv_bluetooth_ad_match_result_flags_t adv_flags = peri->config->match_adv(peri->user, read_buf[9], &read_buf[19], NULL, &read_buf[11], peri->bdaddr);
 
         // If it doesn't match context-specific filter, keep scanning.
         if (!(adv_flags & PBDRV_BLUETOOTH_AD_MATCH_VALUE)) {
@@ -495,7 +495,7 @@ pbio_error_t pbdrv_bluetooth_peripheral_scan_and_connect_func(pbio_os_state_t *s
 
         const char *detected_name = (const char *)&read_buf[21];
         const uint8_t *response_address = &read_buf[11];
-        pbdrv_bluetooth_ad_match_result_flags_t rsp_flags = peri->config->match_adv_rsp(read_buf[9], NULL, detected_name, response_address, peri->bdaddr);
+        pbdrv_bluetooth_ad_match_result_flags_t rsp_flags = peri->config->match_adv_rsp(peri->user, read_buf[9], NULL, detected_name, response_address, peri->bdaddr);
 
         // If the response data is not right or if the address doesn't match advertisement, keep scanning.
         if (!(rsp_flags & PBDRV_BLUETOOTH_AD_MATCH_VALUE) || !(rsp_flags & PBDRV_BLUETOOTH_AD_MATCH_ADDRESS)) {

lib/pbio/include/pbdrv/bluetooth.h

@@ -65,6 +65,7 @@ typedef enum {
 /**
  * Callback to match an advertisement or scan response.
  *
+ * @param [in]  user        The user of this peripheral, usually a high-level object.
  * @param [in]  event_type  The type of advertisement.
  * @param [in]  data        The advertisement data.
  * @param [in]  name        The name to match. If NULL, no name filter is applied.
@@ -73,7 +74,7 @@ typedef enum {
  * @return                  True if the advertisement matches, false otherwise.
  */
 typedef pbdrv_bluetooth_ad_match_result_flags_t (*pbdrv_bluetooth_ad_match_t)
-    (uint8_t event_type, const uint8_t *data, const char *name, const uint8_t *addr, const uint8_t *match_addr);
+    (void *user, uint8_t event_type, const uint8_t *data, const char *name, const uint8_t *addr, const uint8_t *match_addr);
 
 struct _pbdrv_bluetooth_send_context_t {
     /** Callback that is called when the data has been sent. */
@@ -137,7 +138,7 @@ typedef struct _pbdrv_bluetooth_peripheral_t pbdrv_bluetooth_peripheral_t;
 /**
  * Callback that is called when a peripheral sends a notification.
  *
- * @param [in]  user        The addressee, usually a high-level object.
+ * @param [in]  user        The user of this peripheral, usually a high-level object.
  * @param [in]  data        The data that was received.
  * @param [in]  size        The size of @p data in bytes.
  */

pybricks/iodevices/pb_type_iodevices_lwp3device.c

@@ -85,10 +85,6 @@ static pbdrv_bluetooth_peripheral_char_t pb_lwp3device_char = {
     .request_notification = true,
 };
 
-// Needed for global notification callback. This is cleared when the finalizer
-// runs.
-static mp_obj_t self_obj;
-
 typedef struct {
     mp_obj_base_t base;
     /**
@@ -172,16 +168,15 @@ static void handle_remote_notification(void *user, const uint8_t *value, uint32_
     }
 }
 
-static pbdrv_bluetooth_ad_match_result_flags_t lwp3_advertisement_matches(uint8_t event_type, const uint8_t *data, const char *name, const uint8_t *addr, const uint8_t *match_addr) {
+static pbdrv_bluetooth_ad_match_result_flags_t lwp3_advertisement_matches(void *user, uint8_t event_type, const uint8_t *data, const char *name, const uint8_t *addr, const uint8_t *match_addr) {
 
     pbdrv_bluetooth_ad_match_result_flags_t flags = PBDRV_BLUETOOTH_AD_MATCH_NONE;
 
-    if (self_obj == MP_OBJ_NULL) {
+    pb_lwp3device_obj_t *self = user;
+    if (!self) {
         return flags;
     }
 
-    pb_lwp3device_obj_t *self = MP_OBJ_TO_PTR(self_obj);
-
     // Whether this looks like a LWP3 advertisement of the correct hub kind.
     if (event_type == PBDRV_BLUETOOTH_AD_TYPE_ADV_IND
         && data[3] == 17 /* length */
@@ -199,16 +194,15 @@ static pbdrv_bluetooth_ad_match_result_flags_t lwp3_advertisement_matches(uint8_
     return flags;
 }
 
-static pbdrv_bluetooth_ad_match_result_flags_t lwp3_advertisement_response_matches(uint8_t event_type, const uint8_t *data, const char *name, const uint8_t *addr, const uint8_t *match_addr) {
+static pbdrv_bluetooth_ad_match_result_flags_t lwp3_advertisement_response_matches(void *user, uint8_t event_type, const uint8_t *data, const char *name, const uint8_t *addr, const uint8_t *match_addr) {
 
     pbdrv_bluetooth_ad_match_result_flags_t flags = PBDRV_BLUETOOTH_AD_MATCH_NONE;
 
-    if (self_obj == MP_OBJ_NULL) {
+    pb_lwp3device_obj_t *self = user;
+    if (!self) {
         return flags;
     }
 
-    pb_lwp3device_obj_t *self = MP_OBJ_TO_PTR(self_obj);
-
     // This is the only value check we do on LWP3 response messages.
     if (event_type == PBDRV_BLUETOOTH_AD_TYPE_SCAN_RSP) {
         flags |= PBDRV_BLUETOOTH_AD_MATCH_VALUE;
@@ -493,7 +487,6 @@ static mp_obj_t pb_type_pupdevices_Remote_make_new(const mp_obj_type_t *type, si
     pb_module_tools_assert_blocking();
 
     pb_lwp3device_obj_t *self = mp_obj_malloc_with_finaliser(pb_lwp3device_obj_t, type);
-    self_obj = MP_OBJ_FROM_PTR(self);
 
     self->buttons = pb_type_Keypad_obj_new(MP_OBJ_FROM_PTR(self), pb_type_remote_button_pressed);
     self->light = pb_type_ColorLight_external_obj_new(MP_OBJ_FROM_PTR(self), pb_type_pupdevices_Remote_light_on);
@@ -624,7 +617,6 @@ static mp_obj_t pb_type_iodevices_LWP3Device_make_new(const mp_obj_type_t *type,
     }
 
     pb_lwp3device_obj_t *self = mp_obj_malloc_var_with_finaliser(pb_lwp3device_obj_t, uint8_t, LWP3_MAX_MESSAGE_SIZE * noti_num, type);
-    self_obj = MP_OBJ_FROM_PTR(self);
 
     memset(self->notification_buffer, 0, LWP3_MAX_MESSAGE_SIZE * noti_num);
     self->noti_num = noti_num;

pybricks/iodevices/pb_type_iodevices_xbox_controller.c

@@ -114,7 +114,7 @@ static void handle_notification(void *user, const uint8_t *value, uint32_t size)
 
 #define _16BIT_AS_LE(x) ((x) & 0xff), (((x) >> 8) & 0xff)
 
-static pbdrv_bluetooth_ad_match_result_flags_t xbox_advertisement_matches(uint8_t event_type, const uint8_t *data, const char *name, const uint8_t *addr, const uint8_t *match_addr) {
+static pbdrv_bluetooth_ad_match_result_flags_t xbox_advertisement_matches(void *user, uint8_t event_type, const uint8_t *data, const char *name, const uint8_t *addr, const uint8_t *match_addr) {
 
     // The controller seems to advertise three different packets, so allow all.
 
@@ -165,7 +165,7 @@ static pbdrv_bluetooth_ad_match_result_flags_t xbox_advertisement_matches(uint8_
     return flags;
 }
 
-static pbdrv_bluetooth_ad_match_result_flags_t xbox_advertisement_response_matches(uint8_t event_type, const uint8_t *data, const char *name, const uint8_t *addr, const uint8_t *match_addr) {
+static pbdrv_bluetooth_ad_match_result_flags_t xbox_advertisement_response_matches(void *user, uint8_t event_type, const uint8_t *data, const char *name, const uint8_t *addr, const uint8_t *match_addr) {
 
     pbdrv_bluetooth_ad_match_result_flags_t flags = PBDRV_BLUETOOTH_AD_MATCH_NONE;