TonBERRY/tonberry-pico
3
0
Fork 0
Code Issues 12 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

Merge pull request 'fix-interrupt-race' (#45) from fix-interrupt-race into main
Some checks failed
Check code formatting / Check-C-Format (push) Has been cancelled
Details
Build RPi Pico firmware image / Build-Firmware (push) Has been cancelled
Details
Check code formatting / Check-Python-Flake8 (push) Has been cancelled
Details
Check code formatting / Check-Bash-Shellcheck (push) Has been cancelled
Details
Run unit tests on host / Run-Unit-Tests (push) Has been cancelled
Details
Run pytests / Check-Pytest (push) Has been cancelled
Details

Browse Source 
Reviewed-on: #45
Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>
This commit was merged in pull request #45.
This commit is contained in:
Matthias Blankertz
2025-10-30 16:52:25 +00:00
parent 92f9ce3d5a 23d5b050dc
commit a81952fb8a
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
software/modules/audiocore/i2s.c
View File

@@ -91,19 +91,21 @@ void i2s_stop(void)
{
if (!i2s_context.playback_active)
return;
bool have_data = false;
do {
while (true) {
const long flags = save_and_disable_interrupts();
const int next_buf = (i2s_context.cur_playing + 1) % AUDIO_BUFS;
have_data = i2s_context.has_data[next_buf];
const bool have_data = i2s_context.has_data[next_buf];
if (!have_data) {
i2s_context.playback_active = false;
shared_context.underruns = 0;
restore_interrupts(flags);
break;
}
__wfi();
restore_interrupts(flags);
if (have_data)
__wfi();
} while (have_data);
const long flags = save_and_disable_interrupts();
i2s_context.playback_active = false;
shared_context.underruns = 0;
restore_interrupts(flags);
__nop(); // Ensure at least two instructions between enable interrupts and subsequent disable
__nop();
}
// Workaround rp2040 E13
dma_channel_set_irq1_enabled(i2s_context.dma_ch, false);
dma_channel_abort(i2s_context.dma_ch);

16
software/modules/rp2_sd/sd_spi.c
View File

@@ -12,13 +12,15 @@
#include <pico/time.h>
#include <string.h>
typedef enum { DMA_READ_TOKEN, DMA_READ, DMA_IDLE } sd_dma_state;
struct sd_dma_context {
uint8_t *read_buf;
size_t len;
uint8_t crc_buf[2];
uint8_t read_token_buf;
uint8_t wrdata;
_Atomic enum { DMA_READ_TOKEN, DMA_READ, DMA_IDLE } state;
_Atomic sd_dma_state state;
};
struct sd_spi_context {
@@ -111,8 +113,18 @@ static void __time_critical_func(sd_spi_dma_isr)(void)
void sd_spi_wait_complete(void)
{
while (sd_spi_context.sd_dma_context.state != DMA_IDLE)
while (true) {
const long flags = save_and_disable_interrupts();
const sd_dma_state state = sd_spi_context.sd_dma_context.state;
if (state == DMA_IDLE) {
restore_interrupts(flags);
return;
}
__wfi();
restore_interrupts(flags);
__nop(); // Ensure at least two instructions between enable interrupts and subsequent disable
__nop();
}
}
bool sd_cmd_read_is_complete(void) { return sd_spi_context.sd_dma_context.state == DMA_IDLE; }