避免警告，变量可能未初始化就使用 (#5544)

diskwu · Guozhanxin · web-flow · commit 03f46c669405 · 2022-01-21T11:06:37.000+08:00
* 避免警告，变量可能未初始化就使用

* 避免警告，变量可能未初始化就使用

* 避免警告，变化可能未初始化就使用。

* Update bsp/stm32/libraries/HAL_Drivers/drv_usart.c

Co-authored-by: guo &lt;guozhanxin@rt-thread.com&gt;

* Update bsp/stm32/libraries/HAL_Drivers/drv_usart_v2.c

Co-authored-by: guo &lt;guozhanxin@rt-thread.com&gt;

Co-authored-by: guo &lt;guozhanxin@rt-thread.com&gt;
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_usart.c b/bsp/stm32/libraries/HAL_Drivers/drv_usart.c
@@ -918,14 +918,15 @@ static void stm32_dma_config(struct rt_serial_device *serial, rt_ubase_t flag)
     struct stm32_uart *uart;
 
     RT_ASSERT(serial != RT_NULL);
+    RT_ASSERT(flag == RT_DEVICE_FLAG_DMA_TX || flag == RT_DEVICE_FLAG_DMA_RX);
     uart = rt_container_of(serial, struct stm32_uart, serial);
 
     if (RT_DEVICE_FLAG_DMA_RX == flag)
     {
         DMA_Handle = &uart->dma_rx.handle;
         dma_config = uart->config->dma_rx;
     }
-    else if (RT_DEVICE_FLAG_DMA_TX == flag)
+    else /* RT_DEVICE_FLAG_DMA_TX == flag */
     {
         DMA_Handle = &uart->dma_tx.handle;
         dma_config = uart->config->dma_tx;
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_usart_v2.c b/bsp/stm32/libraries/HAL_Drivers/drv_usart_v2.c
@@ -959,14 +959,15 @@ static void stm32_dma_config(struct rt_serial_device *serial, rt_ubase_t flag)
     struct stm32_uart *uart;
 
     RT_ASSERT(serial != RT_NULL);
+    RT_ASSERT(flag == RT_DEVICE_FLAG_DMA_TX || flag == RT_DEVICE_FLAG_DMA_RX);
     uart = rt_container_of(serial, struct stm32_uart, serial);
 
     if (RT_DEVICE_FLAG_DMA_RX == flag)
     {
         DMA_Handle = &uart->dma_rx.handle;
         dma_config = uart->config->dma_rx;
     }
-    else if (RT_DEVICE_FLAG_DMA_TX == flag)
+    else /* RT_DEVICE_FLAG_DMA_TX == flag */
     {
         DMA_Handle = &uart->dma_tx.handle;
         dma_config = uart->config->dma_tx;

Original file line number	Diff line number	Diff line change
`@@ -918,14 +918,15 @@ static void stm32_dma_config(struct rt_serial_device *serial, rt_ubase_t flag)`
`918`	`918`	`struct stm32_uart *uart;`
`919`	`919`
`920`	`920`	`RT_ASSERT(serial != RT_NULL);`
	`921`	`+ RT_ASSERT(flag == RT_DEVICE_FLAG_DMA_TX \|\| flag == RT_DEVICE_FLAG_DMA_RX);`
`921`	`922`	`uart = rt_container_of(serial, struct stm32_uart, serial);`
`922`	`923`
`923`	`924`	`if (RT_DEVICE_FLAG_DMA_RX == flag)`
`924`	`925`	`{`
`925`	`926`	`DMA_Handle = &uart->dma_rx.handle;`
`926`	`927`	`dma_config = uart->config->dma_rx;`
`927`	`928`	`}`
`928`		`- else if (RT_DEVICE_FLAG_DMA_TX == flag)`
	`929`	`+ else /* RT_DEVICE_FLAG_DMA_TX == flag */`
`929`	`930`	`{`
`930`	`931`	`DMA_Handle = &uart->dma_tx.handle;`
`931`	`932`	`dma_config = uart->config->dma_tx;`
Original file line number	Diff line number	Diff line change
`@@ -959,14 +959,15 @@ static void stm32_dma_config(struct rt_serial_device *serial, rt_ubase_t flag)`
`959`	`959`	`struct stm32_uart *uart;`
`960`	`960`
`961`	`961`	`RT_ASSERT(serial != RT_NULL);`
	`962`	`+ RT_ASSERT(flag == RT_DEVICE_FLAG_DMA_TX \|\| flag == RT_DEVICE_FLAG_DMA_RX);`
`962`	`963`	`uart = rt_container_of(serial, struct stm32_uart, serial);`
`963`	`964`
`964`	`965`	`if (RT_DEVICE_FLAG_DMA_RX == flag)`
`965`	`966`	`{`
`966`	`967`	`DMA_Handle = &uart->dma_rx.handle;`
`967`	`968`	`dma_config = uart->config->dma_rx;`
`968`	`969`	`}`
`969`		`- else if (RT_DEVICE_FLAG_DMA_TX == flag)`
	`970`	`+ else /* RT_DEVICE_FLAG_DMA_TX == flag */`
`970`	`971`	`{`
`971`	`972`	`DMA_Handle = &uart->dma_tx.handle;`
`972`	`973`	`dma_config = uart->config->dma_tx;`