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

usb_serial: Refactored out some of the debug buffer logic

This commit is contained in:
dragonmux 2022-08-21 15:09:39 +01:00 committed by Piotr Esden-Tempski
parent 3d3d8c9adb
commit 30bfb00414
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/platforms/common/usb_serial.c
View File

@ -197,6 +197,13 @@ void debug_uart_send_stdout(const uint8_t *const data, const size_t len)
} }
#ifdef ENABLE_DEBUG #ifdef ENABLE_DEBUG
static void debug_serial_append_char(const char c)
{
usb_dbg_buf[usb_dbg_in] = c;
++usb_dbg_in;
usb_dbg_in %= AUX_UART_BUFFER_SIZE;
}
size_t debug_uart_write(const char *buf, const size_t len) size_t debug_uart_write(const char *buf, const size_t len)
{ {
if (nvic_get_active_irq(USB_IRQ) || nvic_get_active_irq(USBUSART_IRQ) || nvic_get_active_irq(USBUSART_DMA_RX_IRQ)) if (nvic_get_active_irq(USB_IRQ) || nvic_get_active_irq(USBUSART_IRQ) || nvic_get_active_irq(USBUSART_DMA_RX_IRQ))
@ -206,14 +213,12 @@ size_t debug_uart_write(const char *buf, const size_t len)
for (size_t i = 0; i < len && (usb_dbg_in + 1) % AUX_UART_BUFFER_SIZE != usb_dbg_out; ++i) { for (size_t i = 0; i < len && (usb_dbg_in + 1) % AUX_UART_BUFFER_SIZE != usb_dbg_out; ++i) {
if (buf[i] == '\n') { if (buf[i] == '\n') {
usb_dbg_buf[usb_dbg_in++] = '\r'; debug_serial_append_char('\r');
usb_dbg_in %= AUX_UART_BUFFER_SIZE;
if ((usb_dbg_in + 1) % AUX_UART_BUFFER_SIZE == usb_dbg_out) if ((usb_dbg_in + 1) % AUX_UART_BUFFER_SIZE == usb_dbg_out)
break; break;
} }
usb_dbg_buf[usb_dbg_in++] = buf[i]; debug_serial_append_char(buf[i]);
usb_dbg_in %= AUX_UART_BUFFER_SIZE;
} }
debug_uart_run(); debug_uart_run();