Merge pull request adafruit#2376 from dhalbert/nrf-internal-flash-volatile-fix

tannewt · web-flow · commit 887f64eed8d7 · 2019-12-12T10:17:26.000-08:00
nrf: sd_flash_operation_status should be volatile
diff --git a/ports/nrf/bluetooth/ble_drv.c b/ports/nrf/bluetooth/ble_drv.c
@@ -43,7 +43,7 @@
 nrf_nvic_state_t nrf_nvic_state = { 0 };
 
 // Flag indicating progress of internal flash operation.
-sd_flash_operation_status_t sd_flash_operation_status;
+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_GATT_ATT_MTU_DEFAULT)];
diff --git a/ports/nrf/bluetooth/ble_drv.h b/ports/nrf/bluetooth/ble_drv.h
@@ -59,7 +59,7 @@ typedef enum {
 } sd_flash_operation_status_t;
 
 // Flag indicating progress of internal flash operation.
-extern sd_flash_operation_status_t sd_flash_operation_status;
+extern volatile sd_flash_operation_status_t sd_flash_operation_status;
 
 typedef struct ble_drv_evt_handler_entry {
     struct ble_drv_evt_handler_entry *next;
