mordae/pico-sdr
1
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix circular buffer reading

Browse source
This commit is contained in:
Jan Hamal Dvořák 2024-06-15 17:57:27 +02:00
parent de9dc0e6fd
commit 46aee7f5d2
1 changed files with 9 additions and 11 deletions

20
src/main.c
View file

@ -459,8 +459,8 @@ static void rf_rx_stop(void)
static void rf_rx(void) static void rf_rx(void)
{ {
uint32_t *prev_addr = rx_cos; const uint32_t base = (uint32_t)rx_cos;
unsigned pos = 0; int pos = 0;
int64_t dcI = 0, dcQ = 0; int64_t dcI = 0, dcQ = 0;
int prevI = 0, prevQ = 0; int prevI = 0, prevQ = 0;
@ -472,19 +472,17 @@ static void rf_rx(void)
return; return;
} }
uint32_t *this_addr = (uint32_t *)dma_hw->ch[dma_ch_in_cos].write_addr; int head = (dma_hw->ch[dma_ch_in_cos].write_addr - base) / 4;
int delta = (head < pos ? head + RX_WORDS : head) - pos;
while (prev_addr <= this_addr && this_addr <= prev_addr + RX_STRIDE) { while (delta < RX_STRIDE) {
this_addr = (uint32_t *)dma_hw->ch[dma_ch_in_cos].write_addr;
sleep_us(1); sleep_us(1);
head = (dma_hw->ch[dma_ch_in_cos].write_addr - base) / 4;
delta = (head < pos ? head + RX_WORDS : head) - pos;
} }
prev_addr += RX_STRIDE; const uint32_t *cos_ptr = rx_cos + pos;
if (prev_addr >= rx_cos + RX_WORDS) const uint32_t *sin_ptr = rx_sin + pos;
prev_addr = rx_cos;
uint32_t *cos_ptr = rx_cos + pos;
uint32_t *sin_ptr = rx_sin + pos;
pos = (pos + RX_STRIDE) & (RX_WORDS - 1); pos = (pos + RX_STRIDE) & (RX_WORDS - 1);