Skip to content

Commit 62061c8

Browse files
committed
address conflicts
1 parent 1e8f045 commit 62061c8

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

ports/raspberrypi/bindings/rp2pio/StateMachine.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_writing_obj, rp2pio_statemachi
623623
MP_PROPERTY_GETTER(rp2pio_statemachine_writing_obj,
624624
(mp_obj_t)&rp2pio_statemachine_get_writing_obj);
625625

626-
627626
//| pending_write: int
628627
//| pending: int
629628
//| """Returns the number of pending buffers for background writing.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,6 +1344,8 @@ bool common_hal_rp2pio_statemachine_background_read(rp2pio_statemachine_obj_t *s
13441344
false);
13451345

13461346
common_hal_mcu_disable_interrupts();
1347+
// Acknowledge any previous pending interrupt
1348+
dma_hw->ints0 |= 1u << channel_read;
13471349
MP_STATE_PORT(background_pio)[channel_read] = self;
13481350
dma_hw->inte1 |= 1u << channel_read;
13491351
irq_set_mask_enabled(1 << DMA_IRQ_1, true);

0 commit comments

Comments
 (0)