address conflicts

Author: timchinowsky

ports/raspberrypi/bindings/rp2pio/StateMachine.c

@@ -623,7 +623,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_writing_obj, rp2pio_statemachi
 MP_PROPERTY_GETTER(rp2pio_statemachine_writing_obj,
     (mp_obj_t)&rp2pio_statemachine_get_writing_obj);
 
-
 //|     pending_write: int
 //|     pending: int
 //|     """Returns the number of pending buffers for background writing.

ports/raspberrypi/common-hal/rp2pio/StateMachine.c

@@ -1156,6 +1156,8 @@ bool common_hal_rp2pio_statemachine_background_write(rp2pio_statemachine_obj_t *
         false);
 
     common_hal_mcu_disable_interrupts();
+    // Acknowledge any previous pending interrupt
+    dma_hw->ints0 |= 1u << channel_write;
     MP_STATE_PORT(background_pio)[channel_write] = self;
     dma_hw->inte0 |= 1u << channel_write;
     irq_set_mask_enabled(1 << DMA_IRQ_0, true);
@@ -1327,6 +1329,8 @@ bool common_hal_rp2pio_statemachine_background_read(rp2pio_statemachine_obj_t *s
         false);
 
     common_hal_mcu_disable_interrupts();
+    // Acknowledge any previous pending interrupt
+    dma_hw->ints0 |= 1u << channel_read;
     MP_STATE_PORT(background_pio)[channel_read] = self;
     dma_hw->inte1 |= 1u << channel_read;
     irq_set_mask_enabled(1 << DMA_IRQ_1, true);