diff options
| author | Bernard Xiong <[email protected]> | 2018-10-26 17:51:00 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-10-26 17:51:00 +0800 |
| commit | d0cc930eec2b0b753ec3d4eb718b8af993c064dc (patch) | |
| tree | 21188fd1a75266fd32a8a9d15775f3207fd4894d | |
| parent | 8641d3b6d1a528be652bf4cdcd3738706181c1c5 (diff) | |
| parent | 9392c9ea49a450544389174c5b88dcfa60e60829 (diff) | |
Merge pull request #1924 from balanceTWK/master
【bsp】【stm32f10x-HAL】 update drv_usart.c
| -rw-r--r-- | bsp/stm32f10x-HAL/drivers/drv_usart.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/bsp/stm32f10x-HAL/drivers/drv_usart.c b/bsp/stm32f10x-HAL/drivers/drv_usart.c index 09fcef32b4..2650469921 100644 --- a/bsp/stm32f10x-HAL/drivers/drv_usart.c +++ b/bsp/stm32f10x-HAL/drivers/drv_usart.c @@ -217,8 +217,6 @@ void USART3_IRQHandler(void) } #endif /* RT_USING_UART2 */ -static void MX_USART_UART_Init(UART_HandleTypeDef *uartHandle); - int rt_hw_usart_init(void) { struct stm32_uart *uart; @@ -228,7 +226,6 @@ int rt_hw_usart_init(void) config.baud_rate = BAUD_RATE_115200; serial1.ops = &stm32_uart_ops; serial1.config = config; - MX_USART_UART_Init(&uart->huart); /* register UART1 device */ rt_hw_serial_register(&serial1, "uart1", RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX, @@ -240,7 +237,6 @@ int rt_hw_usart_init(void) config.baud_rate = BAUD_RATE_115200; serial2.ops = &stm32_uart_ops; serial2.config = config; - MX_USART_UART_Init(&uart->huart); /* register UART1 device */ rt_hw_serial_register(&serial2, "uart2", RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX, @@ -252,7 +248,6 @@ int rt_hw_usart_init(void) config.baud_rate = BAUD_RATE_115200; serial3.ops = &stm32_uart_ops; serial3.config = config; - MX_USART_UART_Init(&uart->huart); /* register UART1 device */ rt_hw_serial_register(&serial3, "uart3", RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX, @@ -262,22 +257,6 @@ int rt_hw_usart_init(void) } INIT_BOARD_EXPORT(rt_hw_usart_init); -static void MX_USART_UART_Init(UART_HandleTypeDef *uartHandle) -{ - rt_err_t result; - uartHandle->Init.BaudRate = 115200; - uartHandle->Init.WordLength = UART_WORDLENGTH_8B; - uartHandle->Init.StopBits = UART_STOPBITS_1; - uartHandle->Init.Parity = UART_PARITY_NONE; - uartHandle->Init.Mode = UART_MODE_TX_RX; - uartHandle->Init.HwFlowCtl = UART_HWCONTROL_NONE; - uartHandle->Init.OverSampling = UART_OVERSAMPLING_16; - result = HAL_UART_Init(uartHandle); - RT_ASSERT(result == HAL_OK); - -} -/* USART2 init function */ - void HAL_UART_MspInit(UART_HandleTypeDef *uartHandle) { GPIO_InitTypeDef GPIO_InitStruct; |