From f8cabe82f71add182702f32e1b1444a44c83eb74 Mon Sep 17 00:00:00 2001 From: Nicko van Someren Date: Sat, 6 Jan 2024 16:33:12 -0700 Subject: [PATCH 1/2] rp2/rp2_dma: Fix fetching 'write' buffers for writing not reading. Signed-off-by: Nicko van Someren --- ports/rp2/rp2_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/rp2/rp2_dma.c b/ports/rp2/rp2_dma.c index acc18d08c58da..893498265aa41 100644 --- a/ports/rp2/rp2_dma.c +++ b/ports/rp2/rp2_dma.c @@ -86,7 +86,7 @@ STATIC const uint32_t rp2_dma_ctrl_field_count = MP_ARRAY_SIZE(rp2_dma_ctrl_fiel STATIC uint32_t rp2_dma_register_value_from_obj(mp_obj_t o, int reg_type) { if (reg_type == REG_TYPE_ADDR_READ || reg_type == REG_TYPE_ADDR_WRITE) { mp_buffer_info_t buf_info; - mp_uint_t flags = MP_BUFFER_READ; + mp_uint_t flags = (reg_type == REG_TYPE_ADDR_READ) ? MP_BUFFER_READ : MP_BUFFER_WRITE; if (mp_get_buffer(o, &buf_info, flags)) { return (uint32_t)buf_info.buf; } From 1da45e887af1b5e6e608a13e292aa343f5b9f976 Mon Sep 17 00:00:00 2001 From: Nicko van Someren Date: Sat, 6 Jan 2024 16:33:51 -0700 Subject: [PATCH 2/2] rp2: Provide direct memory access to PIO and SPI FIFOs via proxy arrays. Signed-off-by: Nicko van Someren --- ports/rp2/machine_spi.c | 13 +++++++++++++ ports/rp2/rp2_pio.c | 18 ++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c index fb8e9f56caec5..a4f4243b7a1fd 100644 --- a/ports/rp2/machine_spi.c +++ b/ports/rp2/machine_spi.c @@ -302,6 +302,18 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8 } } +// Buffer protocol implementation for SPI. +// The buffer represents the SPI data FIFO. +STATIC mp_int_t machine_spi_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { + machine_spi_obj_t *self = MP_OBJ_TO_PTR(o_in); + + bufinfo->len = 4; + bufinfo->typecode = 'I'; + bufinfo->buf = (void *)&spi_get_hw(self->spi_inst)->dr; + + return 0; +} + STATIC const mp_machine_spi_p_t machine_spi_p = { .init = machine_spi_init, .transfer = machine_spi_transfer, @@ -314,6 +326,7 @@ MP_DEFINE_CONST_OBJ_TYPE( make_new, machine_spi_make_new, print, machine_spi_print, protocol, &machine_spi_p, + buffer, machine_spi_get_buffer, locals_dict, &mp_machine_spi_locals_dict ); diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c index 3a0ab844eafd4..42e61684b3369 100644 --- a/ports/rp2/rp2_pio.c +++ b/ports/rp2/rp2_pio.c @@ -809,6 +809,23 @@ STATIC mp_obj_t rp2_state_machine_tx_fifo(mp_obj_t self_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(rp2_state_machine_tx_fifo_obj, rp2_state_machine_tx_fifo); +// Buffer protocol implementation for StateMachine. +// The buffer represents one of the FIFO ports of the state machine. Note that a different +// pointer is returned depending on if this is for reading or writing. +STATIC mp_int_t rp2_state_machine_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { + rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(o_in); + + bufinfo->len = 4; + bufinfo->typecode = 'I'; + + if (flags & MP_BUFFER_WRITE) { + bufinfo->buf = (void *)&self->pio->txf[self->sm]; + } else { + bufinfo->buf = (void *)&self->pio->rxf[self->sm]; + } + return 0; +} + // StateMachine.irq(handler=None, trigger=0|1, hard=False) STATIC mp_obj_t rp2_state_machine_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_handler, ARG_trigger, ARG_hard }; @@ -884,6 +901,7 @@ MP_DEFINE_CONST_OBJ_TYPE( MP_TYPE_FLAG_NONE, make_new, rp2_state_machine_make_new, print, rp2_state_machine_print, + buffer, rp2_state_machine_get_buffer, locals_dict, &rp2_state_machine_locals_dict ); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy