summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2019-01-12 13:38:16 +0800
committerGitHub <[email protected]>2019-01-12 13:38:16 +0800
commit83b67ec3e29099bce9bdb6fc6a50becc03072d29 (patch)
tree98b1b608d401dcb48d45734dcafc74e290f82c05
parent45c86a54ba05028c901f1fdfad0d5c73d4bfe5fc (diff)
parente7f6952d15696921dfbce7ca22699e2916dd2f35 (diff)
Merge pull request #2190 from zhouchuanfu/master
[bsp][stm32f10x]fix bug with dma setting
-rw-r--r--bsp/stm32f10x/drivers/usart.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/bsp/stm32f10x/drivers/usart.c b/bsp/stm32f10x/drivers/usart.c
index 1c61b184a6..4164e8785a 100644
--- a/bsp/stm32f10x/drivers/usart.c
+++ b/bsp/stm32f10x/drivers/usart.c
@@ -293,8 +293,8 @@ static const struct rt_uart_ops stm32_uart_ops =
struct stm32_uart uart1 =
{
USART1,
-#ifdef RT_SERIAL_USING_DMA
USART1_IRQn,
+#ifdef RT_SERIAL_USING_DMA
{
DMA1_Channel5,
DMA1_FLAG_GL5,
@@ -334,9 +334,9 @@ void DMA1_Channel5_IRQHandler(void) {
/* UART2 device driver structure */
struct stm32_uart uart2 =
{
- USART2,
-#ifdef RT_SERIAL_USING_DMA
+ USART2,
USART2_IRQn,
+#ifdef RT_SERIAL_USING_DMA
{
DMA1_Channel6,
DMA1_FLAG_GL6,
@@ -377,8 +377,8 @@ void DMA1_Channel6_IRQHandler(void) {
struct stm32_uart uart3 =
{
USART3,
-#ifdef RT_SERIAL_USING_DMA
USART3_IRQn,
+#ifdef RT_SERIAL_USING_DMA
{
DMA1_Channel3,
DMA1_FLAG_GL3,
@@ -419,8 +419,8 @@ void DMA1_Channel3_IRQHandler(void) {
struct stm32_uart uart4 =
{
UART4,
-#ifdef RT_SERIAL_USING_DMA
UART4_IRQn,
+#ifdef RT_SERIAL_USING_DMA
{
DMA2_Channel3,
DMA2_FLAG_GL3,