Skip to content

R
rt-thread

Mozi / rt-thread
与 Fork 源项目一致

Fork自 RT-Thread / rt-thread

通知 0
Star 0
Fork 0
R
rt-thread

体验新版 GitCode，发现更多精彩内容 >>

提交 3c5ed4b1 编写于 作者: M mazhiyuan
浏览文件
操作

修复stm32g系列不同芯片串口中断不匹配

上级 634e5341
隐藏空白更改
内联 并排
Showing with 80 addition and 9 deletion
bsp/stm32/libraries/HAL_Drivers/config/g0/uart_config.h
浏览文件 @ 3c5ed4b1
...@@ -13,6 +13,10 @@ ...@@ -13,6 +13,10 @@
#include <rtthread.h> #include <rtthread.h>
#ifdef __cplusplus
extern "C" {
#endif
#if defined(BSP_USING_LPUART1) #if defined(BSP_USING_LPUART1)
#ifndef LPUART1_CONFIG #ifndef LPUART1_CONFIG
#define LPUART1_CONFIG \ #define LPUART1_CONFIG \
...@@ -61,12 +65,21 @@ ...@@ -61,12 +65,21 @@
#if defined(BSP_USING_UART2) #if defined(BSP_USING_UART2)
#ifndef UART2_CONFIG #ifndef UART2_CONFIG
#if defined(STM32G0B1xx) || defined(STM32G0C1xx)
#define UART2_CONFIG \
{ \
.name = "uart2", \
.Instance = USART2, \
.irq_type = USART2_LPUART2_IRQn , \
}
#else
#define UART2_CONFIG \ #define UART2_CONFIG \
{ \ { \
.name = "uart2", \ .name = "uart2", \
.Instance = USART2, \ .Instance = USART2, \
.irq_type = USART2_IRQn, \ .irq_type = USART2_IRQn, \
} }
#endif /* defined(STM32G0B1xx) || defined(STM32G0C1xx) */
#endif /* UART2_CONFIG */ #endif /* UART2_CONFIG */
#endif /* BSP_USING_UART2 */ #endif /* BSP_USING_UART2 */
...@@ -84,21 +97,42 @@ ...@@ -84,21 +97,42 @@
#if defined(BSP_USING_UART3) #if defined(BSP_USING_UART3)
#ifndef UART3_CONFIG #ifndef UART3_CONFIG
#ifndef SOC_SERIES_STM32G0 #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
#define UART3_CONFIG \ #define UART3_CONFIG \
{ \ { \
.name = "uart3", \ .name = "uart3", \
.Instance = USART3, \ .Instance = USART3, \
.irq_type = USART3_IRQn, \ .irq_type = USART3_4_5_6_LPUART1_IRQn, \
} }
#else #elif defined(STM32G070xx)
#define UART3_CONFIG \
{ \
.name = "uart3", \
.Instance = USART3, \
.irq_type = USART3_4_IRQn, \
}
#elif defined(STM32G071xx) || defined(STM32G081xx)
#define UART3_CONFIG \ #define UART3_CONFIG \
{ \ { \
.name = "uart3", \ .name = "uart3", \
.Instance = USART3, \ .Instance = USART3, \
.irq_type = USART3_4_LPUART1_IRQn, \ .irq_type = USART3_4_LPUART1_IRQn, \
} }
#endif /* SOC_SERIES_STM32G0 */ #elif defined(STM32G0B0xx)
#define UART3_CONFIG \
{ \
.name = "uart3", \
.Instance = USART3, \
.irq_type = USART3_4_5_6_IRQn, \
}
#else
#define UART3_CONFIG \
{ \
.name = "uart3", \
.Instance = USART3, \
.irq_type = USART3_IRQn, \
}
#endif /* defined(STM32G0B1xx) || defined(STM32G0C1xx) */
#endif /* UART3_CONFIG */ #endif /* UART3_CONFIG */
#endif /* BSP_USING_UART3 */ #endif /* BSP_USING_UART3 */
...@@ -116,22 +150,43 @@ ...@@ -116,22 +150,43 @@
#if defined(BSP_USING_UART4) #if defined(BSP_USING_UART4)
#ifndef UART4_CONFIG #ifndef UART4_CONFIG
#ifndef SOC_SERIES_STM32G0 #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
#define UART4_CONFIG \ #define UART4_CONFIG \
{ \ { \
.name = "uart4", \ .name = "uart4", \
.Instance = UART4, \ .Instance = USART4, \
.irq_type = UART4_IRQn, \ .irq_type = USART3_4_5_6_LPUART1_IRQn, \
} }
#else #elif defined(STM32G070xx)
#define UART4_CONFIG \
{ \
.name = "uart4", \
.Instance = USART4, \
.irq_type = USART3_4_IRQn, \
}
#elif defined(STM32G071xx) || defined(STM32G081xx)
#define UART4_CONFIG \ #define UART4_CONFIG \
{ \ { \
.name = "uart4", \ .name = "uart4", \
.Instance = USART4, \ .Instance = USART4, \
.irq_type = USART3_4_LPUART1_IRQn, \ .irq_type = USART3_4_LPUART1_IRQn, \
} }
#elif defined(STM32G0B0xx)
#define UART4_CONFIG \
{ \
.name = "uart4", \
.Instance = USART4, \
.irq_type = USART3_4_5_6_IRQn, \
}
#else
#define UART4_CONFIG \
{ \
.name = "uart4", \
.Instance = USART4, \
.irq_type = USART4_IRQn, \
}
#endif /* defined(STM32G0B1xx) || defined(STM32G0C1xx) */
#endif /* UART4_CONFIG */ #endif /* UART4_CONFIG */
#endif /* SOC_SERIES_STM32G0 */
#endif /* BSP_USING_UART4 */ #endif /* BSP_USING_UART4 */
#if defined(BSP_UART4_RX_USING_DMA) #if defined(BSP_UART4_RX_USING_DMA)
...@@ -148,12 +203,28 @@ ...@@ -148,12 +203,28 @@
#if defined(BSP_USING_UART5) #if defined(BSP_USING_UART5)
#ifndef UART5_CONFIG #ifndef UART5_CONFIG
#if defined(STM32G0B1xx) || defined(STM32G0C1xx)
#define UART5_CONFIG \
{ \
.name = "uart5", \
.Instance = UART5, \
.irq_type = USART3_4_5_6_LPUART1_IRQn, \
}
#elif defined(STM32G0B0xx)
#define UART5_CONFIG \
{ \
.name = "uart5", \
.Instance = UART5, \
.irq_type = USART3_4_5_6_IRQn, \
}
#else
#define UART5_CONFIG \ #define UART5_CONFIG \
{ \ { \
.name = "uart5", \ .name = "uart5", \
.Instance = UART5, \ .Instance = UART5, \
.irq_type = UART5_IRQn, \ .irq_type = UART5_IRQn, \
} }
#endif /* defined(STM32G0B1xx) || defined(STM32G0C1xx) */
#endif /* UART5_CONFIG */ #endif /* UART5_CONFIG */
#endif /* BSP_USING_UART5 */ #endif /* BSP_USING_UART5 */
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或