Browse Source

usb_serial: Renamed usbuart_run() -> debug_uart_run()

fix/newlib-file-io-hooks
dragonmux 2 years ago
parent
commit
e7bd8135b9
No known key found for this signature in database GPG Key ID: 64861EA89B35507A
  1. 4
      src/platforms/common/usb_serial.c
  2. 2
      src/platforms/common/usbuart.h
  3. 6
      src/platforms/stm32/usbuart.c

4
src/platforms/common/usb_serial.c

@ -207,11 +207,11 @@ size_t debug_uart_write(const char *buf, const size_t len)
usb_dbg_in %= RX_FIFO_SIZE; usb_dbg_in %= RX_FIFO_SIZE;
} }
usbuart_run(); debug_uart_run();
return len; return len;
} }
void usbuart_run(void) void debug_uart_run(void)
{ {
nvic_disable_irq(USB_IRQ); nvic_disable_irq(USB_IRQ);

2
src/platforms/common/usbuart.h

@ -29,7 +29,7 @@ void usbuart_usb_in_cb(usbd_device *dev, uint8_t ep);
void usbuart_set_led_state(uint8_t ledn, bool state); void usbuart_set_led_state(uint8_t ledn, bool state);
void usbuart_send_rx_packet(void); void usbuart_send_rx_packet(void);
void usbuart_run(void); void debug_uart_run(void);
#define TX_LED_ACT (1 << 0) #define TX_LED_ACT (1 << 0)
#define RX_LED_ACT (1 << 1) #define RX_LED_ACT (1 << 1)

6
src/platforms/stm32/usbuart.c

@ -332,7 +332,7 @@ void usbuart_usb_in_cb(usbd_device *dev, uint8_t ep)
/* If line is now idle, then transmit a packet */ \ /* If line is now idle, then transmit a packet */ \
if (isIdle) { \ if (isIdle) { \
USART_ICR(USART) = USART_ICR_IDLECF; \ USART_ICR(USART) = USART_ICR_IDLECF; \
usbuart_run(); \ debug_uart_run(); \
} \ } \
\ \
nvic_enable_irq(DMA_IRQ); \ nvic_enable_irq(DMA_IRQ); \
@ -350,7 +350,7 @@ void usbuart_usb_in_cb(usbd_device *dev, uint8_t ep)
/* On the older uarts, the sequence "read flags", */ \ /* On the older uarts, the sequence "read flags", */ \
/* "read DR" clears the flags */ \ /* "read DR" clears the flags */ \
\ \
usbuart_run(); \ debug_uart_run(); \
} \ } \
\ \
nvic_enable_irq(DMA_IRQ); \ nvic_enable_irq(DMA_IRQ); \
@ -441,7 +441,7 @@ void USBUSART2_DMA_TX_ISR(void)
/* Clear flags */ \ /* Clear flags */ \
dma_clear_interrupt_flags(USBUSART_DMA_BUS, DMA_RX_CHAN, DMA_CGIF); \ dma_clear_interrupt_flags(USBUSART_DMA_BUS, DMA_RX_CHAN, DMA_CGIF); \
/* Transmit a packet */ \ /* Transmit a packet */ \
usbuart_run(); \ debug_uart_run(); \
\ \
nvic_enable_irq(USART_IRQ); \ nvic_enable_irq(USART_IRQ); \
} while(0) } while(0)

Loading…
Cancel
Save