ADD: better usart interrupts handling, TXA delay < 1 us

r2axz · Dec 1, 2020 · ad768fc · ad768fc
1 parent e142c45
commit ad768fc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/system_interrupts.c b/system_interrupts.c
@@ -2,13 +2,6 @@
 #include <stm32f1xx.h>
 #include "system_interrupts.h"
 
-#define SYSTEM_INTERRUPTS_COUNT             68
-#define SYSTEM_INTERRUPTS_TABLE_ALIGNMENT   0x200
-
-static volatile void *_sram_interrupt_table[SYSTEM_INTERRUPTS_COUNT] __attribute__ ((aligned(SYSTEM_INTERRUPTS_TABLE_ALIGNMENT)));
-
 void system_interrupts_init() {
-    memcpy(_sram_interrupt_table, (const void *)SCB->VTOR, sizeof(_sram_interrupt_table));
-    SCB->VTOR = (uint32_t)_sram_interrupt_table;
     NVIC_SetPriorityGrouping(SYSTEM_INTERRUPTS_PRIORITY_GROUPING);
 }
diff --git a/usb_cdc.c b/usb_cdc.c
@@ -47,6 +47,7 @@ typedef struct {
     uint8_t                 rts_active;
     uint8_t                 dtr_active;
     uint8_t                 txa_active;
+    gpio_pin_t              *txa_pin;
 } usb_cdc_state_t;
 
 static usb_cdc_state_t usb_cdc_states[USB_CDC_NUM_PORTS];
@@ -528,11 +529,11 @@ void DMA1_Channel2_IRQHandler() {
 
 /* USART Interrupt Handlers */
 
-__attribute__((always_inline)) inline static void usb_cdc_usart_irq_handler(int port, USART_TypeDef * const usart) {
+__attribute__((always_inline)) inline static void usb_cdc_usart_irq_handler(int port, USART_TypeDef * usart, gpio_pin_t *txa_pin) {
     uint32_t wait_rxne = 0;
     uint32_t status = usart->SR;
     if (status & USART_SR_TC) {
-        usb_cdc_set_port_txa(port, 0);
+        gpio_pin_set(txa_pin, 0);
         usart->CR1 &= ~(USART_CR1_TCIE);
     }
     if (status & USART_SR_PE) {
@@ -551,17 +552,17 @@ __attribute__((always_inline)) inline static void usb_cdc_usart_irq_handler(int
 
 void USART1_IRQHandler() {
     (void)USART1_IRQHandler;
-    usb_cdc_usart_irq_handler(0, usb_cdc_port_usarts[0]);
+    usb_cdc_usart_irq_handler(0, usb_cdc_port_usarts[0], usb_cdc_states[0].txa_pin);
 }
 
 void USART2_IRQHandler() {
     (void)USART2_IRQHandler;
-    usb_cdc_usart_irq_handler(1, usb_cdc_port_usarts[1]);
+    usb_cdc_usart_irq_handler(1, usb_cdc_port_usarts[1], usb_cdc_states[1].txa_pin);
 }
 
 void USART3_IRQHandler() {
     (void)USART3_IRQHandler;
-    usb_cdc_usart_irq_handler(2, usb_cdc_port_usarts[2]);
+    usb_cdc_usart_irq_handler(2, usb_cdc_port_usarts[2], usb_cdc_states[2].txa_pin);
 }
 
 /* Port Configuration & Control Lines Functions */
@@ -650,6 +651,7 @@ void usb_cdc_reset() {
         dma_rx_ch->CNDTR = USB_CDC_BUF_SIZE;
         dma_tx_ch->CCR |= DMA_CCR_MINC | DMA_CCR_DIR | DMA_CCR_TCIE;
         dma_tx_ch->CPAR = (uint32_t)&usart->DR;
+        usb_cdc_states[port].txa_pin = &device_config_get()->cdc_config.port_config[port].pins[cdc_pin_txa];
     }
     NVIC_SetPriority(USART1_IRQn, SYSTEM_INTERRUTPS_PRIORITY_CRITICAL);
     NVIC_EnableIRQ(USART1_IRQn);