move asm volatile to more clearly be after DMA

dhalbert · dhalbert · commit 2f6f882e04b0 · 2024-03-29T13:58:25.000-04:00
diff --git a/ports/nrf/common-hal/analogio/AnalogIn.c b/ports/nrf/common-hal/analogio/AnalogIn.c
@@ -76,13 +76,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
     // Something else might have used the ADC in a different way,
     // so we completely re-initialize it.
 
-    // Adding the "asm volatile" memory fence here or many places after this declaration
-    // fixes an issue with gcc13 which causes `value` to always be zero.
-    // Compiling with gcc10 or gcc12 is fine.
-    // It can also be fixed by declaring `value` to be static.
-    // I think I'd like to declare this as volatile, but that causes type errors.
     nrf_saadc_value_t value = 0;
-    asm volatile ("" : : : "memory");
 
     const nrf_saadc_channel_config_t config = {
         .resistor_p = NRF_SAADC_RESISTOR_DISABLED,
@@ -126,6 +120,13 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
 
     nrf_saadc_disable(NRF_SAADC);
 
+    // Adding the "asm volatile" memory fence here or anywhere after the declaration of `value`
+    // fixes an issue with gcc13 which causes `value` to always be zero.
+    // Compiling with gcc10 or gcc12 is fine.
+    // It can also be fixed by declaring `value` to be static.
+    // I think I'd like to declare `value` as volatile, but that causes type errors.
+    asm volatile ("" : : : "memory");
+
     // Stretch 14-bit ADC reading to 16-bit range
     return (value << 2) | (value >> 12);
 }
