RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

cpu/esp32/stdio_usb_serial_jtag: port to new interface

Browse Source
This commit is contained in:
Benjamin Valentin 2023-06-14 18:04:56 +02:00
parent 8bec71331c
commit 35ef7ca389
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cpu/esp32/stdio_usb_serial_jtag/usb_serial_jtag.c
View File

@ -22,8 +22,7 @@
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include "isrpipe.h" #include "stdio_base.h"
#include "tsrb.h"
#include "irq_arch.h" #include "irq_arch.h"
#include "esp_attr.h" #include "esp_attr.h"
@ -33,16 +32,13 @@
#include "soc/periph_defs.h" #include "soc/periph_defs.h"
#include "rom/ets_sys.h" #include "rom/ets_sys.h"
static uint8_t _rx_buf_mem[USB_SERIAL_JTAG_PACKET_SZ_BYTES];
static isrpipe_t stdio_serial_isrpipe = ISRPIPE_INIT(_rx_buf_mem);
static tsrb_t serial_tx_rb; static tsrb_t serial_tx_rb;
static uint8_t serial_tx_rb_buf[USB_SERIAL_JTAG_PACKET_SZ_BYTES]; static uint8_t serial_tx_rb_buf[USB_SERIAL_JTAG_PACKET_SZ_BYTES];
#define IRQ_MASK (USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY | \ #define IRQ_MASK (USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY | \
(IS_USED(MODULE_STDIO_USB_SERIAL_JTAG_RX) * USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT)) (IS_USED(MODULE_STDIO_USB_SERIAL_JTAG_RX) * USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT))
ssize_t stdio_write(const void *buffer, size_t len) static ssize_t _write(const void *buffer, size_t len)
{ {
tsrb_add(&serial_tx_rb, buffer, len); tsrb_add(&serial_tx_rb, buffer, len);
USB_SERIAL_JTAG.int_ena.val = IRQ_MASK; USB_SERIAL_JTAG.int_ena.val = IRQ_MASK;
@ -50,24 +46,6 @@ ssize_t stdio_write(const void *buffer, size_t len)
return len; return len;
} }
ssize_t stdio_read(void* buffer, size_t count)
{
if (IS_USED(MODULE_STDIO_USB_SERIAL_JTAG_RX)) {
return (ssize_t)isrpipe_read(&stdio_serial_isrpipe, buffer, count);
}
return -ENOTSUP;
}
int stdio_available(void)
{
if (IS_USED(MODULE_STDIO_AVAILABLE)) {
return tsrb_avail(&stdio_serial_isrpipe.tsrb);
}
return -ENOTSUP;
}
IRAM_ATTR IRAM_ATTR
static void _serial_intr_handler(void *arg) static void _serial_intr_handler(void *arg)
{ {
@ -80,7 +58,7 @@ static void _serial_intr_handler(void *arg)
/* read data if available */ /* read data if available */
while (IS_USED(MODULE_STDIO_USB_SERIAL_JTAG_RX) && while (IS_USED(MODULE_STDIO_USB_SERIAL_JTAG_RX) &&
usb_serial_jtag_ll_rxfifo_data_available()) { usb_serial_jtag_ll_rxfifo_data_available()) {
isrpipe_write_one(&stdio_serial_isrpipe, USB_SERIAL_JTAG.ep1.rdwr_byte); isrpipe_write_one(&stdin_isrpipe, USB_SERIAL_JTAG.ep1.rdwr_byte);
} }
/* write data if there is a free stop */ /* write data if there is a free stop */
@ -104,7 +82,7 @@ static void _serial_intr_handler(void *arg)
irq_isr_exit(); irq_isr_exit();
} }
void stdio_init(void) static void _init(void)
{ {
tsrb_init(&serial_tx_rb, serial_tx_rb_buf, sizeof(serial_tx_rb_buf)); tsrb_init(&serial_tx_rb, serial_tx_rb_buf, sizeof(serial_tx_rb_buf));
@ -128,4 +106,11 @@ void stdio_init(void)
intr_cntrl_ll_set_int_level(CPU_INUM_SERIAL_JTAG, 1); intr_cntrl_ll_set_int_level(CPU_INUM_SERIAL_JTAG, 1);
#endif #endif
} }
static void _detach(void)
{
intr_cntrl_ll_disable_interrupts(BIT(CPU_INUM_SERIAL_JTAG));
}
STDIO_PROVIDER(STDIO_ESP32_SERIAL_JTAG, _init, _detach, _write)
/**@}*/ /**@}*/