Merge pull request adafruit#9285 from dhalbert/nordic-gc-event-handlers

nordic/bluetooth/ble_drv.c: gc entire event handler list

Author: tannewt

ports/nordic/bluetooth/ble_drv.c

@@ -31,7 +31,7 @@ volatile sd_flash_operation_status_t sd_flash_operation_status;
 __attribute__((aligned(4)))
 static uint8_t m_ble_evt_buf[sizeof(ble_evt_t) + (BLE_GATTS_VAR_ATTR_LEN_MAX)];
 
-void ble_drv_reset() {
+void ble_drv_reset(void) {
     // Linked list items will be gc'd.
     MP_STATE_VM(ble_drv_evt_handler_entries) = NULL;
     sd_flash_operation_status = SD_FLASH_OPERATION_DONE;
@@ -136,7 +136,7 @@ void SD_EVT_IRQHandler(void) {
         const uint32_t err_code = sd_ble_evt_get(m_ble_evt_buf, &evt_len);
         if (err_code != NRF_SUCCESS) {
             if (err_code == NRF_ERROR_DATA_SIZE) {
-                printf("NRF_ERROR_DATA_SIZE\n");
+                mp_printf(&mp_plat_print, "NRF_ERROR_DATA_SIZE\n");
             }
 
             break;
@@ -177,4 +177,12 @@ void SD_EVT_IRQHandler(void) {
     #endif
 }
 
+void ble_drv_gc_collect(void) {
+    ble_drv_evt_handler_entry_t *it = MP_STATE_VM(ble_drv_evt_handler_entries);
+    while (it != NULL) {
+        gc_collect_ptr(it);
+        it = it->next;
+    }
+}
+
 MP_REGISTER_ROOT_POINTER(ble_drv_evt_handler_entry_t * ble_drv_evt_handler_entries);

ports/nordic/bluetooth/ble_drv.h

@@ -49,6 +49,7 @@ void ble_drv_reset(void);
 void ble_drv_remove_heap_handlers(void);
 void ble_drv_add_event_handler(ble_drv_evt_handler_t func, void *param);
 void ble_drv_remove_event_handler(ble_drv_evt_handler_t func, void *param);
+void ble_drv_gc_collect(void);
 
 // Allow for user provided entries to prevent allocations outside the VM.
 void ble_drv_add_event_handler_entry(ble_drv_evt_handler_entry_t *entry, ble_drv_evt_handler_t func, void *param);

ports/nordic/common-hal/_bleio/__init__.c

@@ -248,4 +248,5 @@ void bleio_background(void) {
 
 void common_hal_bleio_gc_collect(void) {
     bleio_adapter_gc_collect(&common_hal_bleio_adapter_obj);
+    ble_drv_gc_collect();
 }