jepler/circuitpython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

alif/machine_spi: Improve transfer function to poll events.

Browse source 
Poll events during SPI transfer (USB fails during long transfers
otherwise).  And add a timeout for the blocking transfer.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
This commit is contained in:
iabdalkader 2025-06-17 18:59:31 +02:00 committed by Damien George
parent 4a1edc4866
commit 16f9d7fdc3
1 changed files with 46 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
ports/alif/machine_spi.c
View file

@ -39,6 +39,7 @@ typedef struct _machine_spi_obj_t {
uint8_t id;
SPI_Type *inst;
bool is_lp;
uint32_t bits;
} machine_spi_obj_t;
static machine_spi_obj_t machine_spi_obj[] = {
@ -246,6 +247,9 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
// Get static peripheral object.
machine_spi_obj_t *self = &machine_spi_obj[spi_id];
// Set args
self->bits = args[ARG_bits].u_int;
// here we would check the sck/mosi/miso pins and configure them, but it's not implemented
if (args[ARG_sck].u_obj != MP_OBJ_NULL ||
args[ARG_mosi].u_obj != MP_OBJ_NULL ||
@ -294,22 +298,50 @@ static void machine_spi_deinit(mp_obj_base_t *self_in) {
}
}
static void machine_spi_poll_flag(SPI_Type *spi, uint32_t flag, uint32_t timeout) {
mp_uint_t tick_start = mp_hal_ticks_ms();
while (!(spi->SPI_SR & flag)) {
if (mp_hal_ticks_ms() - tick_start >= timeout) {
mp_raise_OSError(MP_ETIMEDOUT);
}
mp_event_handle_nowait();
}
}
static void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
spi_transfer_t spi_xfer = {
.tx_buff = src,
.tx_total_cnt = len,
.rx_buff = dest,
.rx_total_cnt = len,
.tx_default_val = 0xFF,
.tx_default_enable = true,
.mode = SPI_TMOD_TX_AND_RX,
};
// TODO redo transfer_blocking to timeout and poll events.
if (!self->is_lp) {
spi_transfer_blocking(self->inst, &spi_xfer);
} else {
lpspi_transfer_blocking(self->inst, &spi_xfer);
volatile uint32_t *dr = self->inst->SPI_DR;
spi_set_tmod(self->inst, SPI_TMOD_TX_AND_RX);
for (size_t i = 0; i < len; i++) {
// Wait for space in the TX FIFO
machine_spi_poll_flag(self->inst, SPI_SR_TFNF, 100);
// Send data
if (src == NULL) {
*dr = 0xFFFFFFFFU;
} else if (self->bits > 16) {
*dr = ((uint32_t *)src)[i];
} else if (self->bits > 8) {
*dr = ((uint16_t *)src)[i];
} else {
*dr = ((uint8_t *)src)[i];
}
// Wait for data in the RX FIFO
machine_spi_poll_flag(self->inst, SPI_SR_RFNE, 100);
// Recv data
if (dest == NULL) {
(void)*dr;
} else if (self->bits > 16) {
((uint32_t *)dest)[i] = *dr;
} else if (self->bits > 8) {
((uint16_t *)dest)[i] = *dr;
} else {
((uint8_t *)dest)[i] = *dr;
}
}
}