sys64738
/
picoprobe-sump
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more refactoring

This commit is contained in:
Triss 2021-07-18 03:02:54 +02:00
parent 4eea88b4f1
commit 70136f55a5
5 changed files with 427 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

390
src/cdc_sump.c
View File

@ -26,27 +26,78 @@
* *
*/ */
#include <pico/stdlib.h>
#include "hardware/clocks.h"
#include "hardware/irq.h"
#include "hardware/pio.h"
#include "hardware/dma.h"
#include "hardware/pwm.h"
#include "hardware/structs/bus_ctrl.h"
#include "tusb.h" #include "tusb.h"
#include "led.h" #include "led.h"
#include "picoprobe_config.h" /*#include "picoprobe_config.h"*/
#define picoprobe_debug(format,...) ((void)0)
#define picoprobe_info(format,...) ((void)0)
#include "cdc_sump_pico.h"
#include "cdc_sump.h" #include "cdc_sump.h"
#if SAMPLING_BITS != 8 && SAMPLING_BITS != 16
#error "Correct sampling width (8 or 16 bits)"
#endif
#if (SUMP_MEMORY_SIZE % SUMP_MAX_CHUNK_SIZE) != 0
#error "Invalid maximal chunk size!"
#endif
#if (SUMP_MEMORY_SIZE / SUMP_MAX_CHUNK_SIZE) < SUMP_DMA_CHANNELS
#error "DMA buffer and DMA channels out of sync!"
#endif
#define SUMP_STATE_CONFIG 0
#define SUMP_STATE_INIT 1
#define SUMP_STATE_TRIGGER 2
#define SUMP_STATE_SAMPLING 3
#define SUMP_STATE_DUMP 4
#define SUMP_STATE_ERROR 5
#define AS_16P(a) (*(uint16_t *)(a)) #define AS_16P(a) (*(uint16_t *)(a))
struct _sump sump; struct _trigger {
uint32_t mask;
uint32_t value;
uint16_t delay;
uint8_t channel;
uint8_t level;
bool serial;
bool start;
};
static struct _sump {
/* internal states */
bool cdc_connected;
uint8_t cmd[5]; // command
uint8_t cmd_pos; // command buffer position
uint8_t state; // SUMP_STATE_*
uint8_t width; // in bytes, 1 = 8 bits, 2 = 16 bits
uint8_t trigger_index;
//uint32_t pio_prog_offset;
uint32_t read_start;
//uint64_t timestamp_start;
/* protocol config */
uint32_t divider; // clock divider
uint32_t read_count;
uint32_t delay_count;
uint32_t flags;
struct _trigger trigger[4];
/* DMA buffer */
uint32_t chunk_size; // in bytes
uint32_t dma_start;
uint32_t dma_count;
//uint32_t dma_curr_idx; // current DMA channel (index)
uint32_t dma_pos;
uint32_t next_count;
uint8_t buffer[SUMP_MEMORY_SIZE];
} sump;
/* utility functions ======================================================= */ /* utility functions ======================================================= */
static void picoprobe_debug_hexa(uint8_t *buf, uint32_t len) /*static void picoprobe_debug_hexa(uint8_t *buf, uint32_t len)
{ {
uint32_t l; uint32_t l;
for (l = 0; len > 0; len--, l++) { for (l = 0; len > 0; len--, l++) {
@ -54,14 +105,14 @@ static void picoprobe_debug_hexa(uint8_t *buf, uint32_t len)
putchar(':'); putchar(':');
printf("%02x", *buf++); printf("%02x", *buf++);
} }
} }*/
static uint8_t *sump_add_metas(uint8_t * buf, uint8_t tag, const char *str) static uint8_t *sump_add_metas(uint8_t * buf, uint8_t tag, const char *str)
{ {
*buf++ = tag; *buf++ = tag;
while (*str) while (*str) *buf++ = (uint8_t)(*str++);
*buf++ = (uint8_t)(*str++);
*buf++ = '\0'; *buf++ = '\0';
return buf; return buf;
} }
@ -94,23 +145,25 @@ static uint8_t *sump_add_meta4(uint8_t * buf, uint8_t tag, uint32_t val)
static void *sump_analyze_trigger8(void *ptr, uint32_t size) static void *sump_analyze_trigger8(void *ptr, uint32_t size)
{ {
uint8_t *src = ptr; uint8_t *src = ptr;
uint8_t v;
uint8_t tmask = sump.trigger[sump.trigger_index].mask; uint8_t tmask = sump.trigger[sump.trigger_index].mask;
uint8_t tvalue = sump.trigger[sump.trigger_index].value; uint8_t tvalue = sump.trigger[sump.trigger_index].value;
uint32_t count = sump.chunk_size; uint32_t count = sump.chunk_size;
for (count = sump.chunk_size; count > 0; count--) { for (count = sump.chunk_size; count > 0; count--) {
v = *src++; uint32_t v = *src++;
if ((v & tmask) != tvalue) if ((v & tmask) != tvalue)
continue; continue;
__next:
while (1) {
if (sump.trigger[sump.trigger_index].start) if (sump.trigger[sump.trigger_index].start)
return src; return src;
sump.trigger_index++; sump.trigger_index++;
tmask = sump.trigger[sump.trigger_index].mask; tmask = sump.trigger[sump.trigger_index].mask;
tvalue = sump.trigger[sump.trigger_index].value; tvalue = sump.trigger[sump.trigger_index].value;
if (tmask == 0 && tvalue == 0)
goto __next; if (tmask != 0 || tvalue != 0) break;
}
} }
return NULL; return NULL;
} }
@ -124,17 +177,21 @@ static void *sump_analyze_trigger16(void *ptr, uint32_t size)
uint32_t count = sump.chunk_size; uint32_t count = sump.chunk_size;
for (count = sump.chunk_size / 2; count > 0; count--) { for (count = sump.chunk_size / 2; count > 0; count--) {
v = *src++; uint32_t v = *src++;
if ((v & tmask) != tvalue) if ((v & tmask) != tvalue)
continue; continue;
__next:
while (1) {
if (sump.trigger[sump.trigger_index].start) if (sump.trigger[sump.trigger_index].start)
return src; return src;
sump.trigger_index++; sump.trigger_index++;
tmask = sump.trigger[sump.trigger_index].mask; tmask = sump.trigger[sump.trigger_index].mask;
tvalue = sump.trigger[sump.trigger_index].value; tvalue = sump.trigger[sump.trigger_index].value;
if (tmask == 0 && tvalue == 0)
goto __next; if (tmask != 0 || tvalue != 0)
break;
}
} }
return NULL; return NULL;
} }
@ -149,11 +206,11 @@ static void *sump_analyze_trigger(void *ptr, uint32_t size)
uint32_t sump_calc_sysclk_divider() uint32_t sump_calc_sysclk_divider()
{ {
uint32_t divider = sump.divider, v;
const uint32_t common_divisor = 4; const uint32_t common_divisor = 4;
uint32_t divider = sump.divider;
if (divider > 65535) divider = 65535;
if (divider > 65535)
divider = 65535;
// return the fractional part in lowest byte (8 bits) // return the fractional part in lowest byte (8 bits)
if (sump.flags & SUMP_FLAG1_DDR) { if (sump.flags & SUMP_FLAG1_DDR) {
// 125Mhz support // 125Mhz support
@ -161,80 +218,55 @@ uint32_t sump_calc_sysclk_divider()
} else { } else {
divider *= 256 / common_divisor; divider *= 256 / common_divisor;
} }
v = sump_hw_get_sysclk();
uint32_t v = sump_hw_get_sysclk();
assert((v % ONE_MHZ) == 0); assert((v % ONE_MHZ) == 0);
// conversion from 100Mhz to sysclk // conversion from 100Mhz to sysclk
v = ((v / ONE_MHZ) * divider) / ((100 / common_divisor) * SAMPLING_DIVIDER); v = ((v / ONE_MHZ) * divider) / ((100 / common_divisor) * SAMPLING_DIVIDER);
v *= sump.width; v *= sump.width;
if (v > 65535 * 256)
v = 65535 * 256; if (v > 65535 * 256) v = 65535 * 256;
else if (v <= 255) else if (v <= 255) v = 256;
v = 256;
picoprobe_debug("%s(): %u %u -> %u (%.4f)\n", __func__, picoprobe_debug("%s(): %u %u -> %u (%.4f)\n", __func__,
sump_hw_get_sysclk(), sump.divider, v, (float)v / 256.0); sump_hw_get_sysclk(), sump.divider, v, (float)v / 256.0);
return v; return v;
} }
void sump_set_chunk_size(void) static void sump_set_chunk_size(void)
{ {
uint32_t clk_hz; uint32_t clk_hz = sump_hw_get_sysclk() / (sump_calc_sysclk_divider() / 256);
clk_hz = sump_hw_get_sysclk() / (sump_calc_sysclk_divider() / 256);
// the goal is to transfer around 125 DMA chunks per second // the goal is to transfer around 125 DMA chunks per second
// for slow sampling rates // for slow sampling rates
sump.chunk_size = 1; sump.chunk_size = 1;
while (clk_hz > 125 && sump.chunk_size < SUMP_MAX_CHUNK_SIZE) { while (clk_hz > 125 && sump.chunk_size < SUMP_MAX_CHUNK_SIZE) {
sump.chunk_size *= 2; sump.chunk_size *= 2;
clk_hz /= 2; clk_hz /= 2;
} }
picoprobe_debug("%s(): 0x%04x\n", __func__, sump.chunk_size); picoprobe_debug("%s(): 0x%04x\n", __func__, sump.chunk_size);
} }
/* hardware handling ======================================================= */ /* hardware handling ======================================================= */
void sump_dma_program(uint ch, uint32_t pos) // TODO static void sump_dma_done(void)
{ {
dma_channel_config cfg = dma_channel_get_default_config(SUMP_DMA_CH_FIRST + ch);
channel_config_set_read_increment(&cfg, false);
channel_config_set_write_increment(&cfg, true);
channel_config_set_dreq(&cfg, pio_get_dreq(SAMPLING_PIO, SAMPLING_PIO_SM, false));
channel_config_set_chain_to(&cfg, SUMP_DMA_CH_FIRST + ((ch + 1) % SUMP_DMA_CHANNELS));
channel_config_set_transfer_data_size(&cfg, sump.width == 1 ? DMA_SIZE_8 : DMA_SIZE_16);
dma_channel_configure(SUMP_DMA_CH_FIRST + ch, &cfg,
sump.buffer + pos,
&SAMPLING_PIO->rxf[SAMPLING_PIO_SM],
sump.chunk_size / sump.width,
false);
picoprobe_debug("%s() %u: w=0x%08x r=0x%08x t=0x%08x -> %u\n", __func__,
SUMP_DMA_CH_FIRST + ch,
sump.buffer + pos,
&SAMPLING_PIO->rxf[SAMPLING_PIO_SM],
sump.chunk_size / sump.width,
SUMP_DMA_CH_FIRST + ((ch + 1) % SUMP_DMA_CHANNELS));
}
static void sump_dma_done(void) // TODO
{
uint64_t us;
sump_hw_xfer_stop(); sump_hw_xfer_stop();
us = time_us_64() - sump.timestamp_start; /*uint64_t us = time_us_64() - sump.timestamp_start;
picoprobe_debug("%s(): sampling time = %llu.%llu\n", __func__, us / 1000000ull, us % 1000000ull); picoprobe_debug("%s(): sampling time = %llu.%llu\n", __func__, us / 1000000ull, us % 1000000ull);*/
sump.state = SUMP_STATE_DUMP; sump.state = SUMP_STATE_DUMP;
} }
static int sump_dma_next(uint32_t pos) // TODO: lots! static int sump_dma_next(uint32_t pos)
{ {
uint32_t tmp, delay_bytes;
uint8_t *ptr;
if (sump.state != SUMP_STATE_TRIGGER) { if (sump.state != SUMP_STATE_TRIGGER) {
sump_dma_done(); sump_dma_done();
return 0; return 0;
} }
// waiting for the trigger samples // waiting for the trigger samples
ptr = sump_analyze_trigger(sump.buffer + pos, sump.chunk_size); uint8_t *ptr = sump_analyze_trigger(sump.buffer + pos, sump.chunk_size);
if (ptr == NULL) { if (ptr == NULL) {
// call this routine again right after next chunk // call this routine again right after next chunk
return sump.chunk_size; return sump.chunk_size;
@ -243,13 +275,13 @@ static int sump_dma_next(uint32_t pos) // TODO: lots!
sump.state = SUMP_STATE_SAMPLING; sump.state = SUMP_STATE_SAMPLING;
// calculate read start // calculate read start
uint32_t tmp = (sump.read_count - sump.delay_count) * sump.width;
pos = ptr - sump.buffer; pos = ptr - sump.buffer;
tmp = (sump.read_count - sump.delay_count) * sump.width;
sump.read_start = (pos - tmp) % SUMP_MEMORY_SIZE; sump.read_start = (pos - tmp) % SUMP_MEMORY_SIZE;
// calculate the samples after trigger // calculate the samples after trigger
uint32_t delay_bytes = sump.delay_count * sump.width;
tmp = sump.chunk_size - (pos % sump.chunk_size); tmp = sump.chunk_size - (pos % sump.chunk_size);
delay_bytes = sump.delay_count * sump.width;
if (tmp >= delay_bytes) { if (tmp >= delay_bytes) {
sump_dma_done(); sump_dma_done();
return 0; return 0;
@ -257,99 +289,56 @@ static int sump_dma_next(uint32_t pos) // TODO: lots!
return delay_bytes - tmp; return delay_bytes - tmp;
} }
static void sump_dma_chain_to_self(uint ch) uint8_t *sump_dma_get_next_dest(uint32_t numch)
{ {
dma_channel_config cfg; return sump.buffer + (sump.dma_pos + numch * sump.chunk_size) % SUMP_MEMORY_SIZE;
ch += SUMP_DMA_CH_FIRST;
cfg = dma_get_channel_config(ch);
channel_config_set_chain_to(&cfg, ch);
dma_channel_set_config(ch, &cfg, false);
} }
void __isr sump_dma_irq_handler(void) // TODO: lots! void sump_dma_irq_callback_cancelstuff(void)
{ {
uint32_t ch, mask, loop = 0; sump_dma_done();
sump.state = SUMP_STATE_ERROR;
__retry: }
ch = SUMP_DMA_CH_FIRST + sump.dma_curr_idx;
mask = 1u << ch;
if ((sump_dma_ints & mask) == 0)
return;
// acknowledge interrupt
sump_dma_ints = mask;
void sump_dma_irq_callback(uint32_t ch, uint32_t numch)
{
// reprogram the current DMA channel to the tail // reprogram the current DMA channel to the tail
mask = SUMP_DMA_CHANNELS * sump.chunk_size;
dma_channel_set_write_addr(ch, sump.buffer + (sump.dma_pos + mask) % SUMP_MEMORY_SIZE, false);
sump_irq_debug("%s(): %u: w=0x%08x, state=%u\n", __func__, ch, sump.buffer + (sump.dma_pos + mask) % SUMP_MEMORY_SIZE, sump.state);
if (sump.next_count <= sump.chunk_size) { if (sump.next_count <= sump.chunk_size) {
sump.next_count = sump_dma_next(sump.dma_pos); sump.next_count = sump_dma_next(sump.dma_pos);
if (sump.state == SUMP_STATE_DUMP) if (sump.state == SUMP_STATE_DUMP) return;
return;
} else { } else {
sump.next_count -= sump.chunk_size; sump.next_count -= sump.chunk_size;
} }
sump_irq_debug("%s(): next=0x%x\n", __func__, sump.next_count); //sump_irq_debug("%s(): next=0x%x\n", __func__, sump.next_count);
sump.dma_curr_idx = (sump.dma_curr_idx + 1) % SUMP_DMA_CHANNELS;
sump.dma_pos += sump.chunk_size; sump.dma_pos += sump.chunk_size;
sump.dma_pos %= SUMP_MEMORY_SIZE; sump.dma_pos %= SUMP_MEMORY_SIZE;
if (sump.state == SUMP_STATE_SAMPLING && if (sump.state == SUMP_STATE_SAMPLING &&
sump.next_count >= sump.chunk_size && sump.next_count >= sump.chunk_size &&
sump.next_count < SUMP_DMA_CHANNELS * sump.chunk_size) { sump.next_count < numch * sump.chunk_size) {
// set the last DMA segment to correct size to avoid overwrites // set the last DMA segment to correct size to avoid overwrites
mask = sump.next_count / sump.chunk_size; uint32_t mask = sump.next_count / sump.chunk_size;
if ((sump.next_count % sump.chunk_size) == 0) {
ch = (mask + sump.dma_curr_idx - 1) % SUMP_DMA_CHANNELS;
sump_dma_chain_to_self(ch);
ch = (ch + 1) % SUMP_DMA_CHANNELS;
} else {
ch = (mask + sump.dma_curr_idx) % SUMP_DMA_CHANNELS;
dma_channel_set_trans_count(ch + SUMP_DMA_CH_FIRST, (sump.next_count % sump.chunk_size) / sump.width, false);
}
sump_irq_debug("%s(): %u: t=0x%08x\n", __func__, ch + SUMP_DMA_CH_FIRST, (sump.next_count % sump.chunk_size) / sump.width);
// break chain, reset unused DMA chunks
// clear all chains for high-speed DMAs
mask = SUMP_DMA_CHANNELS - ((sump.next_count + sump.chunk_size - 1) / sump.chunk_size);
while (mask > 0) {
sump_dma_chain_to_self(ch);
sump_irq_debug("%s(): %u -> %u\n", __func__, ch + SUMP_DMA_CH_FIRST, ch + SUMP_DMA_CH_FIRST);
ch = (ch + 1) % SUMP_DMA_CHANNELS;
mask--;
}
}
// are we slow? sump_hw_dma_setup_next(ch, mask, sump.chunk_size, sump.next_count, sump.width);
if (++loop == SUMP_DMA_CHANNELS) {
sump_dma_done();
sump.state = SUMP_STATE_ERROR;
return;
} }
goto __retry;
} }
/* --- */ /* --- */
static void sump_xfer_start(uint8_t state) static void sump_xfer_start(uint8_t state)
{ {
uint32_t count, dma_transfer_size, pwm_mask = 0, irq_state;
uint8_t *dma_start;
sump.dma_start = 0; sump.dma_start = 0;
sump.dma_pos = 0; sump.dma_pos = 0;
sump.dma_curr_idx = 0;
picoprobe_debug("%s(): read=0x%08x delay=0x%08x divider=%u\n", __func__, picoprobe_debug("%s(): read=0x%08x delay=0x%08x divider=%u\n", __func__,
sump.read_count, sump.delay_count, sump.divider); sump.read_count, sump.delay_count, sump.divider);
count = sump.read_count; uint32_t count = sump.read_count;
if (count > SUMP_MEMORY_SIZE) if (count > SUMP_MEMORY_SIZE)
count = SUMP_MEMORY_SIZE; count = SUMP_MEMORY_SIZE;
sump.dma_count = count; sump.dma_count = count;
if (sump.read_count <= sump.delay_count) if (sump.read_count <= sump.delay_count)
sump.next_count = sump.read_count; sump.next_count = sump.read_count;
else else
@ -360,7 +349,11 @@ static void sump_xfer_start(uint8_t state)
picoprobe_debug("%s(): buffer = 0x%08x, dma_count=0x%08x next_count=0x%08x\n", __func__, picoprobe_debug("%s(): buffer = 0x%08x, dma_count=0x%08x next_count=0x%08x\n", __func__,
sump.buffer, sump.dma_count, sump.next_count); sump.buffer, sump.dma_count, sump.next_count);
sump.timestamp_start = sump_hw_xfer_start(sump.width, sump.flags); // limit chunk size for slow sampling
sump_set_chunk_size();
/*sump.timestamp_start =*/ sump_hw_xfer_start(sump.width, sump.flags,
sump.chunk_size, sump.buffer);
sump.state = state; sump.state = state;
} }
@ -371,9 +364,8 @@ static void sump_do_meta(void)
{ {
char cpu[32]; char cpu[32];
uint8_t buf[128], *ptr = buf, *wptr = buf; uint8_t buf[128], *ptr = buf, *wptr = buf;
uint32_t sysclk;
sysclk = sump_hw_get_sysclk() / SAMPLING_DIVIDER; uint32_t sysclk = sump_hw_get_sysclk() / SAMPLING_DIVIDER;
sprintf(cpu, "RP2040 %uMhz", sysclk / ONE_MHZ); sprintf(cpu, "RP2040 %uMhz", sysclk / ONE_MHZ);
ptr = sump_add_metas(ptr, SUMP_META_NAME, "Picoprobe Logic Analyzer v1"); ptr = sump_add_metas(ptr, SUMP_META_NAME, "Picoprobe Logic Analyzer v1");
ptr = sump_add_metas(ptr, SUMP_META_FPGA_VERSION, "No FPGA :-( PIO+DMA!"); ptr = sump_add_metas(ptr, SUMP_META_FPGA_VERSION, "No FPGA :-( PIO+DMA!");
@ -397,7 +389,7 @@ static void sump_do_id(void)
static void sump_do_run(void) static void sump_do_run(void)
{ {
uint8_t state; uint8_t state;
uint32_t i, tmask = 0; uint32_t tmask = 0;
bool tstart = false; bool tstart = false;
if (sump.width == 0) { if (sump.width == 0) {
@ -406,10 +398,11 @@ static void sump_do_run(void)
return; return;
} }
for (i = 0; i < count_of(sump.trigger); i++) { for (uint32_t i = 0; i < count_of(sump.trigger); i++) {
tstart |= sump.trigger[i].start; tstart |= sump.trigger[i].start;
tmask |= sump.trigger[i].mask; tmask |= sump.trigger[i].mask;
} }
if (tstart && tmask) { if (tstart && tmask) {
state = SUMP_STATE_TRIGGER; state = SUMP_STATE_TRIGGER;
sump.trigger_index = 0; sump.trigger_index = 0;
@ -424,15 +417,14 @@ static void sump_do_finish(void)
{ {
if (sump.state == SUMP_STATE_TRIGGER || sump.state == SUMP_STATE_SAMPLING) { if (sump.state == SUMP_STATE_TRIGGER || sump.state == SUMP_STATE_SAMPLING) {
sump.state = SUMP_STATE_DUMP; sump.state = SUMP_STATE_DUMP;
sump_dma_done(); // TODO sump_dma_done();
return; return;
} }
} }
static void sump_do_stop(void) static void sump_do_stop(void)
{ {
if (sump.state == SUMP_STATE_INIT) if (sump.state == SUMP_STATE_INIT) return;
return;
sump_hw_stop(); sump_hw_stop();
@ -448,20 +440,17 @@ static void sump_do_reset(void)
static void sump_set_flags(uint32_t flags) static void sump_set_flags(uint32_t flags)
{ {
uint8_t width; uint32_t width = 2;
sump.flags = flags; sump.flags = flags;
width = 2;
if (flags & SUMP_FLAG1_GR0_DISABLE) if (flags & SUMP_FLAG1_GR0_DISABLE) width--;
width--; if (flags & SUMP_FLAG1_GR1_DISABLE) width--;
if (flags & SUMP_FLAG1_GR1_DISABLE)
width--;
// we don't support 24-bit or 32-bit capture - sorry // we don't support 24-bit or 32-bit capture - sorry
if ((flags & SUMP_FLAG1_GR2_DISABLE) == 0) if ((flags & SUMP_FLAG1_GR2_DISABLE) == 0) width = 0;
width = 0; if ((flags & SUMP_FLAG1_GR3_DISABLE) == 0) width = 0;
if ((flags & SUMP_FLAG1_GR3_DISABLE) == 0)
width = 0;
picoprobe_debug("%s(): sample %u bytes\n", __func__, width); picoprobe_debug("%s(): sample %u bytes\n", __func__, width);
sump.width = width; sump.width = width;
} }
@ -480,29 +469,34 @@ static void sump_update_counts(uint32_t val)
* (read_count - delay_count) of samples from before * (read_count - delay_count) of samples from before
* the trigger fired. * the trigger fired.
*/ */
uint32_t read_count = ((val & 0xffff) + 1) * 4; uint32_t read_count = ((val & 0xffff) + 1) * 4;
uint32_t delay_count = ((val >> 16) + 1) * 4; uint32_t delay_count = ((val >> 16) + 1) * 4;
if (delay_count > read_count) if (delay_count > read_count)
read_count = delay_count; read_count = delay_count;
sump.read_count = read_count; sump.read_count = read_count;
sump.delay_count = delay_count; sump.delay_count = delay_count;
} }
static void sump_set_trigger_mask(uint trig, uint32_t val) static void sump_set_trigger_mask(uint32_t trig, uint32_t val)
{ {
struct _trigger *t = &sump.trigger[trig]; struct _trigger *t = &sump.trigger[trig];
t->mask = val; t->mask = val;
picoprobe_debug("%s(): idx=%u val=0x%08x\n", __func__, trig, val); picoprobe_debug("%s(): idx=%u val=0x%08x\n", __func__, trig, val);
} }
static void sump_set_trigger_value(uint trig, uint32_t val) static void sump_set_trigger_value(uint32_t trig, uint32_t val)
{ {
struct _trigger *t = &sump.trigger[trig]; struct _trigger *t = &sump.trigger[trig];
t->value = val; t->value = val;
picoprobe_debug("%s(): idx=%u val=0x%08x\n", __func__, trig, val); picoprobe_debug("%s(): idx=%u val=0x%08x\n", __func__, trig, val);
} }
static void sump_set_trigger_config(uint trig, uint32_t val) static void sump_set_trigger_config(uint32_t trig, uint32_t val)
{ {
struct _trigger *t = &sump.trigger[trig]; struct _trigger *t = &sump.trigger[trig];
t->start = (val & 0x08000000) != 0; t->start = (val & 0x08000000) != 0;
@ -510,6 +504,7 @@ static void sump_set_trigger_config(uint trig, uint32_t val)
t->channel = ((val >> 20) & 0x0f) | ((val >> (24 - 4)) & 0x10); t->channel = ((val >> 20) & 0x0f) | ((val >> (24 - 4)) & 0x10);
t->level = (val >> 16) & 3; t->level = (val >> 16) & 3;
t->delay = val & 0xffff; t->delay = val & 0xffff;
picoprobe_debug("%s(): idx=%u val=0x%08x (start=%u serial=%u channel=%u level=%u delay=%u)\n", picoprobe_debug("%s(): idx=%u val=0x%08x (start=%u serial=%u channel=%u level=%u delay=%u)\n",
__func__, trig, val, t->start, t->serial, t->channel, t->level, t->delay); __func__, trig, val, t->start, t->serial, t->channel, t->level, t->delay);
} }
@ -519,6 +514,7 @@ static void sump_set_trigger_config(uint trig, uint32_t val)
static void sump_rx_short(uint8_t cmd) static void sump_rx_short(uint8_t cmd)
{ {
picoprobe_debug("%s(): 0x%02x\n", __func__, cmd); picoprobe_debug("%s(): 0x%02x\n", __func__, cmd);
switch (cmd) { switch (cmd) {
case SUMP_CMD_RESET: case SUMP_CMD_RESET:
sump_do_reset(); sump_do_reset();
@ -547,10 +543,10 @@ static void sump_rx_short(uint8_t cmd)
static void sump_rx_long(uint8_t * cmd) static void sump_rx_long(uint8_t * cmd)
{ {
uint32_t val; uint32_t val = cmd[1] | (cmd[2] << 8) | (cmd[3] << 16) | (cmd[4] << 24);
val = cmd[1] | (cmd[2] << 8) | (cmd[3] << 16) | (cmd[4] << 24);
picoprobe_debug("%s(): [0x%02x] 0x%08x\n", __func__, cmd[0], val); picoprobe_debug("%s(): [0x%02x] 0x%08x\n", __func__, cmd[0], val);
switch (cmd[0]) { switch (cmd[0]) {
case SUMP_CMD_SET_SAMPLE_RATE: case SUMP_CMD_SET_SAMPLE_RATE:
sump_do_stop(); sump_do_stop();
@ -593,7 +589,7 @@ static void sump_rx_long(uint8_t * cmd)
} }
} }
void sump_rx(uint8_t *buf, uint count) static void sump_rx(uint8_t *buf, uint32_t count)
{ {
if (count == 0) if (count == 0)
return; return;
@ -602,8 +598,10 @@ void sump_rx(uint8_t *buf, uint count)
picoprobe_debug_hexa(buf, count); picoprobe_debug_hexa(buf, count);
picoprobe_debug("\n"); picoprobe_debug("\n");
#endif #endif
while (count-- > 0) { while (count-- > 0) {
sump.cmd[sump.cmd_pos++] = *buf++; sump.cmd[sump.cmd_pos++] = *buf++;
if (SUMP_CMD_IS_SHORT(sump.cmd[0])) { if (SUMP_CMD_IS_SHORT(sump.cmd[0])) {
sump_rx_short(sump.cmd[0]); sump_rx_short(sump.cmd[0]);
sump.cmd_pos = 0; sump.cmd_pos = 0;
@ -614,14 +612,14 @@ void sump_rx(uint8_t *buf, uint count)
} }
} }
static uint sump_tx_empty(uint8_t *buf, uint len) static uint32_t sump_tx_empty(uint8_t *buf, uint32_t len)
{ {
uint32_t i, count; uint32_t i;
uint8_t a, b;
count = sump.read_count; uint32_t count = sump.read_count;
//picoprobe_debug("%s: count=%u\n", __func__, count); //picoprobe_debug("%s: count=%u\n", __func__, count);
a = 0x55; uint8_t a = 0x55;
if (sump.flags & SUMP_FLAG1_ENABLE_RLE) { if (sump.flags & SUMP_FLAG1_ENABLE_RLE) {
count += count & 1; // align up count += count & 1; // align up
if (sump.width == 1) { if (sump.width == 1) {
@ -642,6 +640,7 @@ static uint sump_tx_empty(uint8_t *buf, uint len)
*buf++ = a; *buf++ = a;
a ^= 0xff; a ^= 0xff;
} }
if (i / 2 > sump.read_count) if (i / 2 > sump.read_count)
sump.read_count = 0; sump.read_count = 0;
else else
@ -655,6 +654,7 @@ static uint sump_tx_empty(uint8_t *buf, uint len)
*buf++ = a; *buf++ = a;
a ^= 0xff; a ^= 0xff;
} }
sump.read_count -= i; sump.read_count -= i;
} else if (sump.width == 2) { } else if (sump.width == 2) {
for (i = 0; i < len && count > 0; count--, i += 2) { for (i = 0; i < len && count > 0; count--, i += 2) {
@ -662,29 +662,33 @@ static uint sump_tx_empty(uint8_t *buf, uint len)
*buf++ = a; *buf++ = a;
a ^= 0xff; a ^= 0xff;
} }
sump.read_count -= i / 2; sump.read_count -= i / 2;
} else { } else {
return 0; return 0;
} }
} }
//picoprobe_debug("%s: ret=%u\n", __func__, i); //picoprobe_debug("%s: ret=%u\n", __func__, i);
return i; return i;
} }
static uint sump_tx8(uint8_t *buf, uint len) static uint32_t sump_tx8(uint8_t *buf, uint32_t len)
{ {
uint32_t i, count; uint32_t i;
uint8_t *ptr; uint32_t count = sump.read_count;
count = sump.read_count;
//picoprobe_debug("%s: count=%u, start=%u\n", __func__, count); //picoprobe_debug("%s: count=%u, start=%u\n", __func__, count);
ptr = sump.buffer + (sump.read_start + count) % SUMP_MEMORY_SIZE; uint8_t *ptr = sump.buffer + (sump.read_start + count) % SUMP_MEMORY_SIZE;
if (sump.flags & SUMP_FLAG1_ENABLE_RLE) { if (sump.flags & SUMP_FLAG1_ENABLE_RLE) {
uint8_t b, rle_last = 0x80, rle_count = 0; uint8_t b, rle_last = 0x80, rle_count = 0;
for (i = 0; i + 1 < len && count > 0; count--) { for (i = 0; i + 1 < len && count > 0; count--) {
if (ptr == sump.buffer) if (ptr == sump.buffer)
ptr = sump.buffer + SUMP_MEMORY_SIZE; ptr = sump.buffer + SUMP_MEMORY_SIZE;
b = *(--ptr) & 0x7f; b = *(--ptr) & 0x7f;
if (b != rle_last) { if (b != rle_last) {
if (rle_count > 0) { if (rle_count > 0) {
*((uint16_t *)buf) = (rle_count - 1) | 0x80 | ((uint16_t)rle_last << 8); *((uint16_t *)buf) = (rle_count - 1) | 0x80 | ((uint16_t)rle_last << 8);
@ -692,6 +696,7 @@ static uint sump_tx8(uint8_t *buf, uint len)
i += 2; i += 2;
sump.read_count -= rle_count; sump.read_count -= rle_count;
} }
rle_last = b; rle_last = b;
rle_count = 1; rle_count = 1;
continue; continue;
@ -708,29 +713,35 @@ static uint sump_tx8(uint8_t *buf, uint len)
for (i = 0; i < len && count > 0; i++, count--) { for (i = 0; i < len && count > 0; i++, count--) {
if (ptr == sump.buffer) if (ptr == sump.buffer)
ptr = sump.buffer + SUMP_MEMORY_SIZE; ptr = sump.buffer + SUMP_MEMORY_SIZE;
*buf++ = *(--ptr); *buf++ = *(--ptr);
} }
sump.read_count -= i; sump.read_count -= i;
} }
//picoprobe_debug("%s: ret=%u\n", __func__, i); //picoprobe_debug("%s: ret=%u\n", __func__, i);
return i; return i;
} }
static uint sump_tx16(uint8_t *buf, uint len) static uint32_t sump_tx16(uint8_t *buf, uint32_t len)
{ {
uint32_t i, count; uint32_t i;
volatile uint8_t *ptr; uint32_t count = sump.read_count;
count = sump.read_count;
//picoprobe_debug("%s: count=%u, start=%u\n", __func__, count, sump.read_count); //picoprobe_debug("%s: count=%u, start=%u\n", __func__, count, sump.read_count);
ptr = sump.buffer + (sump.read_start + count * 2) % SUMP_MEMORY_SIZE; volatile uint8_t *ptr = sump.buffer + (sump.read_start + count * 2) % SUMP_MEMORY_SIZE;
if (sump.flags & SUMP_FLAG1_ENABLE_RLE) { if (sump.flags & SUMP_FLAG1_ENABLE_RLE) {
uint16_t b, rle_last = 0x8000, rle_count = 0; uint16_t rle_last = 0x8000, rle_count = 0;
for (i = 0; i + 3 < len && count > 0; count--) { for (i = 0; i + 3 < len && count > 0; count--) {
if (ptr == sump.buffer) if (ptr == sump.buffer)
ptr = sump.buffer + SUMP_MEMORY_SIZE; ptr = sump.buffer + SUMP_MEMORY_SIZE;
ptr -= 2; ptr -= 2;
b = *((uint16_t *)ptr) & 0x7fff;
uint32_t b = *((uint16_t *)ptr) & 0x7fff;
if (b != rle_last) { if (b != rle_last) {
if (rle_count > 0) { if (rle_count > 0) {
*((uint32_t *)buf) = (rle_count - 1) | 0x8000 | ((uint32_t)rle_last << 16); *((uint32_t *)buf) = (rle_count - 1) | 0x8000 | ((uint32_t)rle_last << 16);
@ -738,6 +749,7 @@ static uint sump_tx16(uint8_t *buf, uint len)
i += 4; i += 4;
sump.read_count -= rle_count; sump.read_count -= rle_count;
} }
rle_last = b; rle_last = b;
rle_count = 1; rle_count = 1;
continue; continue;
@ -754,25 +766,29 @@ static uint sump_tx16(uint8_t *buf, uint len)
for (i = 0; i + 1 < len && count > 0; i += 2, count--) { for (i = 0; i + 1 < len && count > 0; i += 2, count--) {
if (ptr == sump.buffer) if (ptr == sump.buffer)
ptr = sump.buffer + SUMP_MEMORY_SIZE; ptr = sump.buffer + SUMP_MEMORY_SIZE;
ptr -= 2; ptr -= 2;
*((uint16_t *)buf) = *((uint16_t *)ptr); *((uint16_t *)buf) = *((uint16_t *)ptr);
buf += 2; buf += 2;
} }
sump.read_count -= i / 2; sump.read_count -= i / 2;
} }
//picoprobe_debug("%s: ret=%u\n", __func__, i); //picoprobe_debug("%s: ret=%u\n", __func__, i);
return i; return i;
} }
static uint sump_fill_tx(uint8_t *buf, uint len) static uint32_t sump_fill_tx(uint8_t *buf, uint32_t len)
{ {
uint ret; uint32_t ret;
assert((len & 3) == 0); assert((len & 3) == 0);
if (sump.read_count == 0) { if (sump.read_count == 0) {
sump.state = SUMP_STATE_CONFIG; sump.state = SUMP_STATE_CONFIG;
return 0; return 0;
} }
if (sump.state == SUMP_STATE_DUMP) { if (sump.state == SUMP_STATE_DUMP) {
if (sump.width == 1) { if (sump.width == 1) {
ret = sump_tx8(buf, len); ret = sump_tx8(buf, len);
@ -786,33 +802,34 @@ static uint sump_fill_tx(uint8_t *buf, uint len)
// invalid or error // invalid or error
ret = sump_tx_empty(buf, len); ret = sump_tx_empty(buf, len);
} }
if (ret == 0)
sump.state = SUMP_STATE_CONFIG; if (ret == 0) sump.state = SUMP_STATE_CONFIG;
return ret; return ret;
} }
static void cdc_sump_init_connect(void) static void sump_init_connect(void)
{ {
uint32_t pio_off;
pio_off = sump.pio_prog_offset;
memset(&sump, 0, sizeof(sump)); memset(&sump, 0, sizeof(sump));
sump.pio_prog_offset = pio_off;
sump.width = 1; sump.width = 1;
sump.divider = 1000; // a safe value sump.divider = 1000; // a safe value
sump.read_count = 256; sump.read_count = 256;
sump.delay_count = 256; sump.delay_count = 256;
picoprobe_debug("%s(): memory buffer %u bytes\n", __func__, SUMP_MEMORY_SIZE);
} }
void cdc_sump_init(void) void cdc_sump_init(void)
{ {
sump_hw_init(); sump_hw_init();
cdc_sump_init_connect(); sump_init_connect();
picoprobe_debug("%s()\n", __func__); picoprobe_debug("%s(): memory buffer %u bytes\n", __func__, SUMP_MEMORY_SIZE);
}
void cdc_sump_deinit(void)
{
sump_hw_deinit();
memset(&sump, 0, sizeof(sump));
} }
#define MAX_UART_PKT 64 #define MAX_UART_PKT 64
@ -822,18 +839,19 @@ void cdc_sump_task(void)
if (tud_cdc_n_connected(CDC_INTF)) { if (tud_cdc_n_connected(CDC_INTF)) {
if (!sump.cdc_connected) { if (!sump.cdc_connected) {
cdc_sump_init_connect(); sump_init_connect();
sump.cdc_connected = true; sump.cdc_connected = true;
} }
if (sump.state == SUMP_STATE_DUMP || sump.state == SUMP_STATE_ERROR) { if (sump.state == SUMP_STATE_DUMP || sump.state == SUMP_STATE_ERROR) {
if (tud_cdc_n_write_available(CDC_INTF) >= sizeof(buf)) { if (tud_cdc_n_write_available(CDC_INTF) >= sizeof(buf)) {
uint tx_len = sump_fill_tx(buf, sizeof(buf)); uint32_t tx_len = sump_fill_tx(buf, sizeof(buf));
tud_cdc_n_write(CDC_INTF, buf, tx_len); tud_cdc_n_write(CDC_INTF, buf, tx_len);
tud_cdc_n_write_flush(CDC_INTF); tud_cdc_n_write_flush(CDC_INTF);
} }
} }
if (tud_cdc_n_available(CDC_INTF)) { if (tud_cdc_n_available(CDC_INTF)) {
uint cmd_len = tud_cdc_n_read(CDC_INTF, buf, sizeof(buf)); uint32_t cmd_len = tud_cdc_n_read(CDC_INTF, buf, sizeof(buf));
sump_rx(buf, cmd_len); sump_rx(buf, cmd_len);
} }
if (sump.state == SUMP_STATE_TRIGGER || sump.state == SUMP_STATE_SAMPLING) if (sump.state == SUMP_STATE_TRIGGER || sump.state == SUMP_STATE_SAMPLING)

120
src/cdc_sump.h
View File

@ -55,122 +55,32 @@ inline static int SUMP_CMD_IS_SHORT(int cmd) {
/* **** */ /* **** */
#if 0
#define sump_irq_debug(format,args...) picoprobe_debug(format, ## args)
#else
#define sump_irq_debug(format,...) ((void)0)
#endif
#define CDC_INTF 1 #define CDC_INTF 1
#define SAMPLING_DIVIDER 4 // minimal sysclk sampling divider
#define SAMPLING_GPIO_FIRST 6
#define SAMPLING_GPIO_LAST 21
#define SAMPLING_BITS (SAMPLING_GPIO_LAST-SAMPLING_GPIO_FIRST+1)
#define SAMPLING_BYTES ((SAMPLING_BITS+7)/8)
#define SAMPLING_GPIO_MASK (((1 << SAMPLING_BITS) - 1) << SAMPLING_GPIO_FIRST)
#define SAMPLING_GPIO_TEST 22
#if SAMPLING_BITS != 8 && SAMPLING_BITS != 16
#error "Correct sampling width (8 or 16 bits)"
#endif
#define SAMPLING_PIO pio1
#define SAMPLING_PIO_SM 0u
#define SAMPLING_DMA_IRQ DMA_IRQ_1
#define sump_dma_set_irq_channel_mask_enabled dma_set_irq1_channel_mask_enabled
#define sump_dma_ints (dma_hw->ints1)
#define SUMP_SAMPLE_MASK ((1<<SAMPLING_BITS)-1)
#define SUMP_BYTE0_OR ((~SUMP_SAMPLE_MASK) & 0xff)
#define SUMP_BYTE1_OR ((~SUMP_SAMPLE_MASK >> 8) & 0xff)
#define SUMP_DMA_CH_FIRST 0
#define SUMP_DMA_CH_LAST 7
#define SUMP_DMA_CHANNELS (SUMP_DMA_CH_LAST-SUMP_DMA_CH_FIRST+1)
#define SUMP_DMA_MASK (((1<<SUMP_DMA_CHANNELS)-1) << SUMP_DMA_CH_FIRST)
#if PICO_NO_FLASH
#define SUMP_MEMORY_SIZE 102400 // 100kB
#else
#define SUMP_MEMORY_SIZE 204800 // 200kB
#endif
#define SUMP_MAX_CHUNK_SIZE 4096
#if (SUMP_MEMORY_SIZE % SUMP_MAX_CHUNK_SIZE) != 0
#error "Invalid maximal chunk size!"
#endif
#if (SUMP_MEMORY_SIZE / SUMP_MAX_CHUNK_SIZE) < SUMP_DMA_CHANNELS
#error "DMA buffer and DMA channels out of sync!"
#endif
#define SUMP_STATE_CONFIG 0
#define SUMP_STATE_INIT 1
#define SUMP_STATE_TRIGGER 2
#define SUMP_STATE_SAMPLING 3
#define SUMP_STATE_DUMP 4
#define SUMP_STATE_ERROR 5
#define ONE_MHZ 1000000u #define ONE_MHZ 1000000u
/* **** */ /* **** */
void sump_set_chunk_size(void);
uint32_t sump_calc_sysclk_divider(); uint32_t sump_calc_sysclk_divider();
void sump_rx(uint8_t *buf, uint count);
uint8_t *sump_dma_get_next_dest(uint32_t numch);
void sump_dma_irq_callback_cancelstuff(void);
void sump_dma_irq_callback(uint32_t ch, uint32_t numch);
void cdc_sump_init(void); void cdc_sump_init(void);
void cdc_sump_deinit(void);
void cdc_sump_task(void); void cdc_sump_task(void);
void sump_hw_init(void); /* --- */
void sump_hw_stop(void);
uint32_t sump_hw_get_sysclk(void); uint32_t sump_hw_get_sysclk(void);
uint64_t sump_hw_xfer_start(uint8_t width, int flags);
void sump_hw_init(void);
void sump_hw_deinit(void);
void sump_hw_dma_setup_next(uint32_t ch, uint32_t mask, uint32_t chunk_size, uint32_t next_count, uint8_t width);
void sump_hw_xfer_start(uint8_t width, int flags, uint32_t chunk_size, uint8_t *destbuf);
void sump_hw_xfer_stop(void); void sump_hw_xfer_stop(void);
void __isr sump_dma_irq_handler(void); void sump_hw_stop(void);
struct _trigger {
uint32_t mask;
uint32_t value;
uint16_t delay;
uint8_t channel;
uint8_t level;
bool serial;
bool start;
};
struct _sump {
/* internal states */
bool cdc_connected;
uint8_t cmd[5]; // command
uint8_t cmd_pos; // command buffer position
uint8_t state; // SUMP_STATE_*
uint8_t width; // in bytes, 1 = 8 bits, 2 = 16 bits
uint8_t trigger_index;
uint32_t pio_prog_offset;
uint32_t read_start;
uint64_t timestamp_start;
/* protocol config */
uint32_t divider; // clock divider
uint32_t read_count;
uint32_t delay_count;
uint32_t flags;
struct _trigger trigger[4];
/* DMA buffer */
uint32_t chunk_size; // in bytes
uint32_t dma_start;
uint32_t dma_count;
uint32_t dma_curr_idx; // current DMA channel (index)
uint32_t dma_pos;
uint32_t next_count;
uint8_t buffer[SUMP_MEMORY_SIZE];
};
extern struct _sump sump;
#endif #endif

211
src/cdc_sump_pico.c
View File

@ -9,9 +9,45 @@
#include <hardware/structs/bus_ctrl.h> #include <hardware/structs/bus_ctrl.h>
#include "picoprobe_config.h" #include "picoprobe_config.h"
#include "cdc_sump_pico.h"
#include "cdc_sump.h" #include "cdc_sump.h"
uint32_t pio_prog_offset; #define SAMPLING_GPIO_MASK (((1 << SAMPLING_BITS) - 1) << SAMPLING_GPIO_FIRST)
#define SAMPLING_GPIO_TEST 22
#define SAMPLING_PIO pio1
#define SAMPLING_PIO_SM 0u
#define SAMPLING_DMA_IRQ DMA_IRQ_1
#define sump_dma_set_irq_channel_mask_enabled dma_set_irq1_channel_mask_enabled
#define sump_dma_ints (dma_hw->ints1)
#define SUMP_SAMPLE_MASK ((1<<SAMPLING_BITS)-1)
#define SUMP_BYTE0_OR ((~SUMP_SAMPLE_MASK) & 0xff)
#define SUMP_BYTE1_OR ((~SUMP_SAMPLE_MASK >> 8) & 0xff)
#define SUMP_DMA_CH_FIRST 0
#define SUMP_DMA_CH_LAST 7
#define SUMP_DMA_CHANNELS (SUMP_DMA_CH_LAST-SUMP_DMA_CH_FIRST+1)
#define SUMP_DMA_MASK (((1<<SUMP_DMA_CHANNELS)-1) << SUMP_DMA_CH_FIRST)
#if 0
#define sump_irq_debug(format,args...) picoprobe_debug(format, ## args)
#else
#define sump_irq_debug(format,...) ((void)0)
#endif
static uint16_t prog[2];
static const struct pio_program program = {
.instructions = prog,
.length = count_of(prog),
.origin = -1
};
static uint32_t pio_prog_offset;
static uint32_t dma_curr_idx = 0;
static uint32_t oldprio;
uint32_t sump_hw_get_sysclk(void) uint32_t sump_hw_get_sysclk(void)
{ {
@ -20,22 +56,23 @@ uint32_t sump_hw_get_sysclk(void)
static void sump_pio_init(uint8_t width, bool nogr0) static void sump_pio_init(uint8_t width, bool nogr0)
{ {
pio_sm_config c; uint32_t gpio = SAMPLING_GPIO_FIRST;
uint off, gpio = SAMPLING_GPIO_FIRST, divider;
#if SAMPLING_BITS > 8 #if SAMPLING_BITS > 8
if (width == 1 && nogr0) if (width == 1 && nogr0)
gpio += 8; gpio += 8;
#endif #endif
// loop the IN instruction forewer (8-bit and 16-bit version) // loop the IN instruction forewer (8-bit and 16-bit version)
c = pio_get_default_sm_config(); pio_sm_config c = pio_get_default_sm_config();
sm_config_set_in_pins(&c, gpio); sm_config_set_in_pins(&c, gpio);
off = pio_prog_offset + (width - 1); uint32_t off = pio_prog_offset + (width - 1);
sm_config_set_wrap(&c, off, off); sm_config_set_wrap(&c, off, off);
divider = sump_calc_sysclk_divider();
uint32_t divider = sump_calc_sysclk_divider();
sm_config_set_clkdiv_int_frac(&c, divider >> 8, divider & 0xff); sm_config_set_clkdiv_int_frac(&c, divider >> 8, divider & 0xff);
sm_config_set_in_shift(&c, true, true, 32); sm_config_set_in_shift(&c, true, true, 32);
sm_config_set_fifo_join(&c, PIO_FIFO_JOIN_RX); sm_config_set_fifo_join(&c, PIO_FIFO_JOIN_RX);
pio_sm_init(SAMPLING_PIO, SAMPLING_PIO_SM, off, &c); pio_sm_init(SAMPLING_PIO, SAMPLING_PIO_SM, off, &c);
picoprobe_debug("%s(): pc=0x%02x [0x%02x], gpio=%u\n", __func__, picoprobe_debug("%s(): pc=0x%02x [0x%02x], gpio=%u\n", __func__,
off, pio_prog_offset, gpio); off, pio_prog_offset, gpio);
@ -43,22 +80,16 @@ static void sump_pio_init(uint8_t width, bool nogr0)
static void sump_pio_program(void) static void sump_pio_program(void)
{ {
uint16_t prog[] = { prog[0] = pio_encode_in(pio_pins, 8);
pio_encode_in(pio_pins, 8), prog[1] = pio_encode_in(pio_pins, 16);
pio_encode_in(pio_pins, 16)
};
struct pio_program program = {
.instructions = prog,
.length = count_of(prog),
.origin = -1
};
picoprobe_debug("%s(): 0x%04x 0x%04x len=%u\n", __func__, prog[0], prog[1], program.length); picoprobe_debug("%s(): 0x%04x 0x%04x len=%u\n", __func__, prog[0], prog[1], program.length);
pio_prog_offset = pio_add_program(SAMPLING_PIO, &program); // TODO pio_prog_offset = pio_add_program(SAMPLING_PIO, &program);
} }
static uint32_t sump_pwm_slice_init(uint gpio, uint clock, bool swap_levels) static uint32_t sump_pwm_slice_init(uint32_t gpio, uint32_t clock, bool swap_levels)
{ {
uint32_t clksys = sump_hw_get_sysclk(), clkdiv, slice, tmp; uint32_t clksys = sump_hw_get_sysclk();
uint16_t top = 5, level_a = 1, level_b = 4; uint16_t top = 5, level_a = 1, level_b = 4;
// correction for low speed PWM // correction for low speed PWM
@ -67,25 +98,30 @@ static uint32_t sump_pwm_slice_init(uint gpio, uint clock, bool swap_levels)
level_a *= 1000; level_a *= 1000;
level_b *= 1000; level_b *= 1000;
} }
clkdiv = clksys / clock / top;
uint32_t clkdiv = clksys / clock / top;
// pwm setup // pwm setup
slice = pwm_gpio_to_slice_num(gpio); uint32_t slice = pwm_gpio_to_slice_num(gpio);
gpio_set_function(gpio, GPIO_FUNC_PWM); gpio_set_function(gpio, GPIO_FUNC_PWM);
gpio_set_function(gpio + 1, GPIO_FUNC_PWM); gpio_set_function(gpio + 1, GPIO_FUNC_PWM);
pwm_config c = pwm_get_default_config(); pwm_config c = pwm_get_default_config();
pwm_config_set_wrap(&c, top - 1); pwm_config_set_wrap(&c, top - 1);
pwm_config_set_clkdiv_int(&c, clkdiv); pwm_config_set_clkdiv_int(&c, clkdiv);
pwm_init(slice, &c, false); pwm_init(slice, &c, false);
if (swap_levels) { if (swap_levels) {
uint16_t tmp = level_a; uint16_t tmp = level_a;
level_a = level_b; level_a = level_b;
level_b = tmp; level_b = tmp;
} }
pwm_set_both_levels(slice, level_a, level_b); pwm_set_both_levels(slice, level_a, level_b);
picoprobe_debug("%s(): gpio=%u clkdiv=%u top=%u level=%u/%u freq=%.4fMhz (req %.4fMhz)\n", picoprobe_debug("%s(): gpio=%u clkdiv=%u top=%u level=%u/%u freq=%.4fMhz (req %.4fMhz)\n",
__func__, gpio, clkdiv, top, level_a, level_b, __func__, gpio, clkdiv, top, level_a, level_b,
(float)clksys / (float)clkdiv / (float)top / 1000000.0, (float)clksys / (float)clkdiv / (float)top / 1000000.0,
(float)clock / 1000000.0); (float)clock / 1000000.0);
return 1u << slice; return 1u << slice;
} }
@ -144,32 +180,111 @@ static void sump_test_done(void)
#if SAMPLING_BITS > 8 #if SAMPLING_BITS > 8
pwm_set_enabled(pwm_gpio_to_slice_num(gpio + 8), false); pwm_set_enabled(pwm_gpio_to_slice_num(gpio + 8), false);
#endif #endif
for (i = SAMPLING_GPIO_FIRST; i <= SAMPLING_GPIO_LAST; i++) for (uint32_t i = SAMPLING_GPIO_FIRST; i <= SAMPLING_GPIO_LAST; i++)
gpio_set_function(i, GPIO_FUNC_NULL); gpio_set_function(i, GPIO_FUNC_NULL);
// test pin // test pin
pwm_set_enabled(SAMPLING_GPIO_TEST, false); pwm_set_enabled(SAMPLING_GPIO_TEST, false);
} }
uint64_t sump_hw_xfer_start(uint8_t width, int flags) static void sump_dma_chain_to_self(uint32_t ch)
{
dma_channel_config cfg;
ch += SUMP_DMA_CH_FIRST;
cfg = dma_get_channel_config(ch);
channel_config_set_chain_to(&cfg, ch);
dma_channel_set_config(ch, &cfg, false);
}
void sump_hw_dma_setup_next(uint32_t ch, uint32_t mask, uint32_t chunk_size, uint32_t next_count, uint8_t width)
{
if ((next_count % chunk_size) == 0) {
ch = (mask + dma_curr_idx - 1) % SUMP_DMA_CHANNELS;
sump_dma_chain_to_self(ch);
ch = (ch + 1) % SUMP_DMA_CHANNELS;
} else {
ch = (mask + dma_curr_idx) % SUMP_DMA_CHANNELS;
dma_channel_set_trans_count(ch + SUMP_DMA_CH_FIRST, (next_count % chunk_size) / width, false);
}
sump_irq_debug("%s(): %u: t=0x%08x\n", __func__, ch + SUMP_DMA_CH_FIRST, (next_count % chunk_size) / width);
// break chain, reset unused DMA chunks
// clear all chains for high-speed DMAs
mask = SUMP_DMA_CHANNELS - ((next_count + chunk_size - 1) / chunk_size);
while (mask > 0) {
sump_dma_chain_to_self(ch);
sump_irq_debug("%s(): %u -> %u\n", __func__, ch + SUMP_DMA_CH_FIRST, ch + SUMP_DMA_CH_FIRST);
ch = (ch + 1) % SUMP_DMA_CHANNELS;
mask--;
}
}
static void __isr sump_hw_dma_irq_handler(void)
{
uint32_t loop = 0;
while (1) {
uint32_t ch = SUMP_DMA_CH_FIRST + dma_curr_idx;
uint32_t mask = 1u << ch;
if ((sump_dma_ints & mask) == 0) break;
// acknowledge interrupt
sump_dma_ints = mask;
dma_curr_idx = (dma_curr_idx + 1) % SUMP_DMA_CHANNELS;
dma_channel_set_write_addr(ch, sump_dma_get_next_dest(SUMP_DMA_CHANNELS), false);
//sump_irq_debug("%s(): %u: w=0x%08x, state=%u\n", __func__, ch, sump_dma_get_next_dest(), sump.state);
sump_dma_irq_callback(ch, SUMP_DMA_CHANNELS);
// are we slow?
if (++loop == SUMP_DMA_CHANNELS) {
sump_dma_irq_callback_cancelstuff();
break;
}
}
}
static void sump_dma_program(uint32_t ch, uint32_t pos, uint8_t width, uint32_t chunk_size, uint8_t *destbuf)
{
dma_channel_config cfg = dma_channel_get_default_config(SUMP_DMA_CH_FIRST + ch);
channel_config_set_read_increment(&cfg, false);
channel_config_set_write_increment(&cfg, true);
channel_config_set_dreq(&cfg, pio_get_dreq(SAMPLING_PIO, SAMPLING_PIO_SM, false));
channel_config_set_chain_to(&cfg, SUMP_DMA_CH_FIRST + ((ch + 1) % SUMP_DMA_CHANNELS));
channel_config_set_transfer_data_size(&cfg, width == 1 ? DMA_SIZE_8 : DMA_SIZE_16);
dma_channel_configure(SUMP_DMA_CH_FIRST + ch, &cfg,
destbuf + pos,
&SAMPLING_PIO->rxf[SAMPLING_PIO_SM],
chunk_size / width,
false);
picoprobe_debug("%s() %u: w=0x%08x r=0x%08x t=0x%08x -> %u\n", __func__,
SUMP_DMA_CH_FIRST + ch,
destbuf + pos,
&SAMPLING_PIO->rxf[SAMPLING_PIO_SM],
chunk_size / width,
SUMP_DMA_CH_FIRST + ((ch + 1) % SUMP_DMA_CHANNELS));
}
/*uint64_t*/void sump_hw_xfer_start(uint8_t width, int flags, uint32_t chunk_size, uint8_t *destbuf)
{ {
uint32_t pwm_mask = 0, irq_state, i;
sump_pio_init(width, flags & SUMP_FLAG1_GR0_DISABLE); sump_pio_init(width, flags & SUMP_FLAG1_GR0_DISABLE);
pwm_mask = sump_calib_init(); dma_curr_idx = 0;
uint32_t pwm_mask = sump_calib_init();
if (flags & SUMP_FLAG1_EXT_TEST) { if (flags & SUMP_FLAG1_EXT_TEST) {
pwm_mask |= sump_test_init(); pwm_mask |= sump_test_init();
} else { } else {
sump_test_done(); sump_test_done();
} }
// limit chunk size for slow sampling for (uint32_t i = 0; i < SUMP_DMA_CHANNELS; i++)
sump_set_chunk_size(); sump_dma_program(i, i * chunk_size, width, chunk_size, destbuf);
for (i = 0; i < SUMP_DMA_CHANNELS; i++)
sump_dma_program(i, i * sump.chunk_size);
// let's go // let's go
irq_state = save_and_disable_interrupts(); uint32_t irq_state = save_and_disable_interrupts();
pio_sm_set_enabled(SAMPLING_PIO, SAMPLING_PIO_SM, true); pio_sm_set_enabled(SAMPLING_PIO, SAMPLING_PIO_SM, true);
if (pwm_mask) if (pwm_mask)
pwm_set_mask_enabled(pwm_mask); pwm_set_mask_enabled(pwm_mask);
@ -177,7 +292,7 @@ uint64_t sump_hw_xfer_start(uint8_t width, int flags)
irq_set_enabled(SAMPLING_DMA_IRQ, true); irq_set_enabled(SAMPLING_DMA_IRQ, true);
restore_interrupts(irq_state); restore_interrupts(irq_state);
return time_us_64(); //return time_us_64();
} }
void sump_hw_xfer_stop(void) void sump_hw_xfer_stop(void)
{ {
@ -187,8 +302,6 @@ void sump_hw_xfer_stop(void)
void sump_hw_init(void) void sump_hw_init(void)
{ {
uint i;
// claim DMA channels // claim DMA channels
dma_claim_mask(SUMP_DMA_MASK); dma_claim_mask(SUMP_DMA_MASK);
@ -197,12 +310,13 @@ void sump_hw_init(void)
sump_pio_program(); sump_pio_program();
// high bus priority to the DMA // high bus priority to the DMA
oldprio = bus_ctrl_hw->priority;
bus_ctrl_hw->priority = BUSCTRL_BUS_PRIORITY_DMA_W_BITS | BUSCTRL_BUS_PRIORITY_DMA_R_BITS; bus_ctrl_hw->priority = BUSCTRL_BUS_PRIORITY_DMA_W_BITS | BUSCTRL_BUS_PRIORITY_DMA_R_BITS;
// GPIO init // GPIO init
gpio_set_dir_in_masked(SAMPLING_GPIO_MASK); gpio_set_dir_in_masked(SAMPLING_GPIO_MASK);
gpio_put_masked(SAMPLING_GPIO_MASK, 0); gpio_put_masked(SAMPLING_GPIO_MASK, 0);
for (i = SAMPLING_GPIO_FIRST; i <= SAMPLING_GPIO_LAST; i++) { for (uint32_t i = SAMPLING_GPIO_FIRST; i <= SAMPLING_GPIO_LAST; i++) {
gpio_set_function(i, GPIO_FUNC_NULL); gpio_set_function(i, GPIO_FUNC_NULL);
gpio_set_pulls(i, false, false); gpio_set_pulls(i, false, false);
} }
@ -214,25 +328,46 @@ void sump_hw_init(void)
// set exclusive interrupt handler // set exclusive interrupt handler
irq_set_enabled(SAMPLING_DMA_IRQ, false); irq_set_enabled(SAMPLING_DMA_IRQ, false);
irq_set_exclusive_handler(SAMPLING_DMA_IRQ, sump_dma_irq_handler); irq_set_exclusive_handler(SAMPLING_DMA_IRQ, sump_hw_dma_irq_handler);
sump_dma_set_irq_channel_mask_enabled(SUMP_DMA_MASK, true); sump_dma_set_irq_channel_mask_enabled(SUMP_DMA_MASK, true);
} }
void sump_hw_stop(void) void sump_hw_stop(void)
{ {
uint32_t i;
// IRQ and PIO fast stop // IRQ and PIO fast stop
irq_set_enabled(SAMPLING_DMA_IRQ, false); irq_set_enabled(SAMPLING_DMA_IRQ, false);
pio_sm_set_enabled(SAMPLING_PIO, SAMPLING_PIO_SM, false); pio_sm_set_enabled(SAMPLING_PIO, SAMPLING_PIO_SM, false);
// DMA abort // DMA abort
for (i = SUMP_DMA_CH_FIRST; i <= SUMP_DMA_CH_LAST; i++) for (uint32_t i = SUMP_DMA_CH_FIRST; i <= SUMP_DMA_CH_LAST; i++)
dma_channel_abort(i); dma_channel_abort(i);
// IRQ status cleanup // IRQ status cleanup
sump_dma_ints = SUMP_DMA_MASK; sump_dma_ints = SUMP_DMA_MASK;
// PIO cleanup // PIO cleanup
pio_sm_clear_fifos(SAMPLING_PIO, SAMPLING_PIO_SM); pio_sm_clear_fifos(SAMPLING_PIO, SAMPLING_PIO_SM);
pio_sm_restart(SAMPLING_PIO, SAMPLING_PIO_SM); pio_sm_restart(SAMPLING_PIO, SAMPLING_PIO_SM);
// test // test
sump_test_done(); sump_test_done();
} }
void sump_hw_deinit(void)
{
sump_hw_stop();
sump_dma_set_irq_channel_mask_enabled(SUMP_DMA_MASK, false);
gpio_set_dir(SAMPLING_GPIO_TEST, false);
gpio_set_function(SAMPLING_GPIO_TEST, GPIO_FUNC_NULL);
bus_ctrl_hw->priority = oldprio;
pio_remove_program(SAMPLING_PIO, &program, pio_prog_offset);
pio_sm_unclaim(SAMPLING_PIO, SAMPLING_PIO_SM);
for (uint32_t i = SUMP_DMA_CH_FIRST; i <= SUMP_DMA_CH_LAST; ++i)
dma_channel_unclaim(i);
}

19
src/cdc_sump_pico.h Normal file
View File

@ -0,0 +1,19 @@
#ifndef CDC_SUMP_PICO_H
#define CDC_SUMP_PICO_H
#define SAMPLING_DIVIDER 4 // minimal sysclk sampling divider
#define SAMPLING_GPIO_FIRST 6
#define SAMPLING_GPIO_LAST 21
#define SAMPLING_BITS (SAMPLING_GPIO_LAST-SAMPLING_GPIO_FIRST+1)
#define SAMPLING_BYTES ((SAMPLING_BITS+7)/8)
#if PICO_NO_FLASH
#define SUMP_MEMORY_SIZE 102400 // 100kB
#else
#define SUMP_MEMORY_SIZE 204800 // 200kB
#endif
#define SUMP_MAX_CHUNK_SIZE 4096
#endif

8
src/picoprobe_config.h
View File

@ -26,26 +26,26 @@
#ifndef PICOPROBE_H_ #ifndef PICOPROBE_H_
#define PICOPROBE_H_ #define PICOPROBE_H_
#if false #if 0
#define picoprobe_info(format,args...) printf(format, ## args) #define picoprobe_info(format,args...) printf(format, ## args)
#else #else
#define picoprobe_info(format,...) ((void)0) #define picoprobe_info(format,...) ((void)0)
#endif #endif
#if false #if 0
#define picoprobe_debug(format,args...) printf(format, ## args) #define picoprobe_debug(format,args...) printf(format, ## args)
#else #else
#define picoprobe_debug(format,...) ((void)0) #define picoprobe_debug(format,...) ((void)0)
#endif #endif
#if false #if 0
#define picoprobe_dump(format,args...) printf(format, ## args) #define picoprobe_dump(format,args...) printf(format, ## args)
#else #else
#define picoprobe_dump(format,...) ((void)0) #define picoprobe_dump(format,...) ((void)0)
#endif #endif
#if false #if 0
#define TURBO_200MHZ 1 #define TURBO_200MHZ 1
#endif #endif