djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove debug prints, improve docs

This commit is contained in:
Jeff Epler 2022-04-19 16:39:04 -05:00
parent b128f180ca
commit ebc426d9e6
No known key found for this signature in database
GPG Key ID: D5BF15AB975AB4DE
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/raspberrypi/bindings/rp2pio/StateMachine.c
View File

@ -426,7 +426,7 @@ STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_arg
}
MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine_write);
//| def continuous_write(self, buffer: Optional[ReadableBuffer], *, start: int = 0, end: Optional[int] = None) -> None:
//| def start_continuous_write(self, buffer: Optional[ReadableBuffer], *, start: int = 0, end: Optional[int] = None) -> None:
//| """Write the data contained in ``buffer`` to the state machine repeatedly until stopped. If the buffer is empty or None, an existing continuous_write is canceled.
//|
//| Writes to the FIFO will match the input buffer's element size. For example, bytearray elements
@ -434,11 +434,12 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine
//| the other byte positions. So, pulling more data in the PIO assembly will read the duplicated values.
//|
//| To perform 16 or 32 bits writes into the FIFO use an `array.array` with a type code of the desired
//| size.
//| size, or use `memoryview.cast` to change the interpretation of an existing buffer.
//|
//| To atomically change from one buffer to another, simply call
//| `StateMachine.continuous_write` again with a different buffer.
//| The call will only return once outputting the new buffer has started.
//| `StateMachine.continuous_write` again with a different buffer with the same element size.
//| The call will only return once DMA has started putting the previous
//| buffer's data into the PIO FIFO.
//|
//| If the buffer is modified while it is being written out, the updated
//| values will be used. However, because of interactions between CPU

11
ports/raspberrypi/common-hal/rp2pio/StateMachine.c
View File

@ -877,14 +877,11 @@ uint8_t rp2pio_statemachine_program_offset(rp2pio_statemachine_obj_t *self) {
return _current_program_offset[pio_index][sm];
}
#define HERE(fmt, ...) (mp_printf(&mp_plat_print, "%s: %d: " fmt "\n", __FILE__, __LINE__,##__VA_ARGS__))
bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_obj_t *self, mp_obj_t buf_obj, const uint8_t *data, size_t len, uint8_t stride_in_bytes) {
uint8_t pio_index = pio_get_index(self->pio);
uint8_t sm = self->state_machine;
if (SM_DMA_ALLOCATED(pio_index, sm) && stride_in_bytes == self->continuous_stride_in_bytes) {
HERE("updating channel pending=%d\n", self->pending_set_data);
while (self->pending_set_data) {
RUN_BACKGROUND_TASKS;
if (self->user_interruptible && mp_hal_is_interrupted()) {
@ -906,13 +903,10 @@ bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_o
common_hal_rp2pio_statemachine_end_continuous_write(self);
HERE("allocating dma channel");
int channel = dma_claim_unused_channel(false);
if (channel == -1) {
HERE("allocating DMA channel failed");
return false;
}
HERE("got channel %d", channel);
SM_DMA_SET_CHANNEL(pio_index, sm, channel);
@ -940,7 +934,6 @@ bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_o
data,
len / stride_in_bytes,
false);
HERE("OK let's go");
common_hal_mcu_disable_interrupts();
MP_STATE_PORT(continuous_pio)[channel] = self;
@ -949,14 +942,10 @@ bool common_hal_rp2pio_statemachine_start_continuous_write(rp2pio_statemachine_o
dma_start_channel_mask(1u << channel);
common_hal_mcu_enable_interrupts();
HERE("mark");
return true;
}
void rp2pio_statemachine_dma_complete(rp2pio_statemachine_obj_t *self, int channel) {
HERE("dma complete[%d] pending set data=%d %sbusy %d@%p", channel, self->pending_set_data, dma_channel_is_busy(channel) ? "not " : "",
self->next_size, self->next_buffer);
dma_channel_set_read_addr(channel, self->next_buffer, false);
dma_channel_set_trans_count(channel, self->next_size, true);