sys64738
/
DragonProbe
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Wiki Activity

headache

This commit is contained in:
Triss 2021-09-17 03:25:23 +02:00
parent 3b76c6fb4a
commit 0c10da762a
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -127,6 +127,7 @@ target_include_directories(${PROJECT} PUBLIC
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror=implicit-function-declaration -Werror=return-type -Werror=maybe-uninitialized") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror=implicit-function-declaration -Werror=return-type -Werror=maybe-uninitialized")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--cref")
add_custom_target(fix_db ALL WORKING_DIRECTORY ${OUTPUT_DIR} add_custom_target(fix_db ALL WORKING_DIRECTORY ${OUTPUT_DIR}
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/scripts/fix_clang_db.py") COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/scripts/fix_clang_db.py")

40
bsp/rp2040/m_ftdi/uart.c
View File

@ -60,6 +60,46 @@ static void deinit_sm(PIO pio, struct chdat* d, const pio_program_t* prg) {
pio_remove_program(pio, prg, d->off); pio_remove_program(pio, prg, d->off);
} }
static void setup_dmach(struct ftdi_interface* itf, struct chdat* d) {
// set up PIO->dma_in_buf DMA:
// * src=pio dst=buf 8bit 256words pacing=pio
// * IRQ: set overrun bit
// * start it
// * SETUP AT MODE ENTER, STOP AT MODE EXIT
//
// set up dma_out_buf->PIO DMA:
// * src=buf dst=pio 8bit <num>words pacing=pio
// * ~~no IRQ I think?~~ IRQ: next ringbuffer part (see below)
// * DO NOT start it on mode enter!
// * STOP AT MODE EXIT
//
// read routine:
// * abort DMA
// * copy data from dma_in_buf (read xfer len? == remaining of 256 bytes)
// * resetup & start DMA:
//
// write routine:
// * if DMA running: set overrun bit, bail out?
// * should use ringbuffer-like structure
// * pointers: dma start, dma end, data end (after dma, contiguous)
// * dma end can be calculated from DMA MMIO, but, race conditions so no
// * use DMA IRQ for next block (and wraparound: dma cannot do wraparound manually)
// * do not start next block if data end == dma start
// * can we set DMA xfer len while in-flight? datasheet p92 2.5.1: nope. sad
// * only bail out when data end == dma start - 1
// * copy data to dma_out_buf
// * set up & start DMA
//
// * what with buffers larger than 256 bytes?
// * what is the actual FTDI buffer size??
// * which bits get set on errors?
// * do TCIFLUSH/TCOFLUSH influence these buffers, or only the USB proto
// handling buffers?
}
static void stop_dmach(struct chdat* d) {
}
void ftdi_if_uart_init(struct ftdi_interface* itf) { void ftdi_if_uart_init(struct ftdi_interface* itf) {
if (STATEOF(itf).enabled) return; // shrug if (STATEOF(itf).enabled) return; // shrug

4
src/m_ftdi/ftdi.h
View File

@ -252,12 +252,16 @@ struct ftdi_interface {
uint16_t mcu_addr_latch; uint16_t mcu_addr_latch;
// these are for USB bulk cmds etc.
// "write" means write to hardware output pins // "write" means write to hardware output pins
// "read" means read from hardware input pins // "read" means read from hardware input pins
uint8_t writebuf[CFG_TUD_VENDOR_RX_BUFSIZE]; uint8_t writebuf[CFG_TUD_VENDOR_RX_BUFSIZE];
uint8_t readbuf [CFG_TUD_VENDOR_TX_BUFSIZE]; uint8_t readbuf [CFG_TUD_VENDOR_TX_BUFSIZE];
uint8_t bufbuf [CFG_TUD_VENDOR_RX_BUFSIZE]; // for buffered IO uint8_t bufbuf [CFG_TUD_VENDOR_RX_BUFSIZE]; // for buffered IO
uint32_t rxavail, rxpos; uint32_t rxavail, rxpos;
uint8_t dma_in_buf[CFG_TUD_VENDOR_TX_BUFSIZE];
uint8_t dma_out_buf[CFG_TUD_VENDOR_RX_BUFSIZE];
}; };
extern struct ftdi_interface ftdi_ifa, ftdi_ifb; extern struct ftdi_interface ftdi_ifa, ftdi_ifb;