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

native: Added blocks to the ISR templates.

This commit is contained in:
Piotr Esden-Tempski 2022-01-09 16:10:00 -08:00
parent bb761e4b38
commit 06f24d3269
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/platforms/stm32/usbuart.c
View File

@ -407,7 +407,7 @@ static void usbuart_run(void)
} }
#if defined(USART_ICR) #if defined(USART_ICR)
#define USBUSART_ISR_TEMPLATE(USART, DMA_IRQ) \ #define USBUSART_ISR_TEMPLATE(USART, DMA_IRQ) do { \
nvic_disable_irq(DMA_IRQ); \ nvic_disable_irq(DMA_IRQ); \
\ \
/* Get IDLE flag and reset interrupt flags */ \ /* Get IDLE flag and reset interrupt flags */ \
@ -420,9 +420,10 @@ static void usbuart_run(void)
usbuart_run(); \ usbuart_run(); \
} \ } \
\ \
nvic_enable_irq(DMA_IRQ); nvic_enable_irq(DMA_IRQ); \
} while(0)
#else #else
#define USBUSART_ISR_TEMPLATE(USART, DMA_IRQ) \ #define USBUSART_ISR_TEMPLATE(USART, DMA_IRQ) do { \
nvic_disable_irq(DMA_IRQ); \ nvic_disable_irq(DMA_IRQ); \
\ \
/* Get IDLE flag and reset interrupt flags */ \ /* Get IDLE flag and reset interrupt flags */ \
@ -437,7 +438,8 @@ static void usbuart_run(void)
usbuart_run(); \ usbuart_run(); \
} \ } \
\ \
nvic_enable_irq(DMA_IRQ) nvic_enable_irq(DMA_IRQ); \
} while(0)
#endif #endif
#if defined(USBUSART_ISR) #if defined(USBUSART_ISR)
@ -473,7 +475,7 @@ void USBUSART2_ISR(void)
} }
#endif #endif
#define USBUSART_DMA_TX_ISR_TEMPLATE(DMA_TX_CHAN) \ #define USBUSART_DMA_TX_ISR_TEMPLATE(DMA_TX_CHAN) do { \
nvic_disable_irq(USB_IRQ); \ nvic_disable_irq(USB_IRQ); \
\ \
/* Stop DMA */ \ /* Stop DMA */ \
@ -494,7 +496,8 @@ void USBUSART2_ISR(void)
tx_trfr_cplt = true; \ tx_trfr_cplt = true; \
} \ } \
\ \
nvic_enable_irq(USB_IRQ) nvic_enable_irq(USB_IRQ); \
} while(0)
#if defined(USBUSART_DMA_TX_ISR) #if defined(USBUSART_DMA_TX_ISR)
void USBUSART_DMA_TX_ISR(void) void USBUSART_DMA_TX_ISR(void)
@ -524,7 +527,7 @@ void USBUSART_DMA_TX_ISR(void)
} }
#endif #endif
#define USBUSART_DMA_RX_ISR_TEMPLATE(USART_IRQ, DMA_RX_CHAN) \ #define USBUSART_DMA_RX_ISR_TEMPLATE(USART_IRQ, DMA_RX_CHAN) do { \
nvic_disable_irq(USART_IRQ); \ nvic_disable_irq(USART_IRQ); \
\ \
/* Clear flags */ \ /* Clear flags */ \
@ -532,7 +535,8 @@ void USBUSART_DMA_TX_ISR(void)
/* Transmit a packet */ \ /* Transmit a packet */ \
usbuart_run(); \ usbuart_run(); \
\ \
nvic_enable_irq(USART_IRQ) nvic_enable_irq(USART_IRQ); \
} while(0)
#if defined(USBUSART_DMA_RX_ISR) #if defined(USBUSART_DMA_RX_ISR)
void USBUSART_DMA_RX_ISR(void) void USBUSART_DMA_RX_ISR(void)