mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2026-11-17 07:05:31 +08:00
完善串口 V2 框架 (#5720)
* [stm32] fix h7 uart V2 driver unused code. * [DeviceDriver][serialv2] fix the serialv2 when using for console device on DMA mode. * [stm32][art-pi] using serial v2 by default
This commit is contained in:
1 parent
961fe7de0b
commit
bae1be0f45
5 files changed
+69
-88
No files matched your search
@@ -123,11 +123,6 @@ static rt_err_t stm32_configure(struct rt_serial_device *serial, struct serial_c
|
||||
uart->handle.Init.Mode = UART_MODE_TX_RX;
|
||||
uart->handle.Init.OverSampling = UART_OVERSAMPLING_16;
|
||||
|
||||
if(uart->handle.Instance == USART3)
|
||||
{
|
||||
uart->handle.Init.HwFlowCtl = UART_HWCONTROL_RTS_CTS;
|
||||
}
|
||||
|
||||
switch (cfg->data_bits)
|
||||
{
|
||||
case DATA_BITS_8:
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -65,6 +65,12 @@ extern "C" {
|
||||
* such as #define BSP_UART1_RX_USING_DMA
|
||||
*
|
||||
*/
|
||||
|
||||
#define BSP_UART3_RX_BUFSIZE 256
|
||||
#define BSP_UART3_TX_BUFSIZE 256
|
||||
#define BSP_UART4_RX_BUFSIZE 256
|
||||
#define BSP_UART4_TX_BUFSIZE 256
|
||||
|
||||
#define STM32_FLASH_START_ADRESS ROM_START
|
||||
#define STM32_FLASH_SIZE ROM_SIZE
|
||||
#define STM32_FLASH_END_ADDRESS ROM_END
|
||||
|
||||
@@ -55,14 +55,8 @@
|
||||
#define RT_USING_USER_MAIN
|
||||
#define RT_MAIN_THREAD_STACK_SIZE 2048
|
||||
#define RT_MAIN_THREAD_PRIORITY 10
|
||||
|
||||
/* C++ features */
|
||||
|
||||
|
||||
/* Command shell */
|
||||
|
||||
#define RT_USING_FINSH
|
||||
#define RT_USING_MSH
|
||||
#define RT_USING_FINSH
|
||||
#define FINSH_USING_MSH
|
||||
#define FINSH_THREAD_NAME "tshell"
|
||||
#define FINSH_THREAD_PRIORITY 20
|
||||
@@ -75,16 +69,12 @@
|
||||
#define FINSH_USING_DESCRIPTION
|
||||
#define FINSH_ARG_MAX 10
|
||||
|
||||
/* Device virtual file system */
|
||||
|
||||
|
||||
/* Device Drivers */
|
||||
|
||||
#define RT_USING_DEVICE_IPC
|
||||
#define RT_USING_SERIAL
|
||||
#define RT_USING_SERIAL_V1
|
||||
#define RT_USING_SERIAL_V2
|
||||
#define RT_SERIAL_USING_DMA
|
||||
#define RT_SERIAL_RB_BUFSZ 64
|
||||
#define RT_USING_I2C
|
||||
#define RT_USING_I2C_BITOPS
|
||||
#define RT_USING_PIN
|
||||
@@ -94,7 +84,7 @@
|
||||
/* Using USB */
|
||||
|
||||
|
||||
/* POSIX layer and C standard library */
|
||||
/* C/C++ and POSIX layer */
|
||||
|
||||
#define RT_LIBC_DEFAULT_TIMEZONE 8
|
||||
|
||||
@@ -106,22 +96,9 @@
|
||||
|
||||
/* Socket is in the 'Network' category */
|
||||
|
||||
|
||||
/* Network */
|
||||
|
||||
/* Socket abstraction layer */
|
||||
|
||||
|
||||
/* Network interface device */
|
||||
|
||||
|
||||
/* light weight TCP/IP stack */
|
||||
|
||||
|
||||
/* AT commands */
|
||||
|
||||
|
||||
/* VBUS(Virtual Software BUS) */
|
||||
|
||||
|
||||
/* Utilities */
|
||||
|
||||
@@ -150,6 +127,11 @@
|
||||
|
||||
/* language packages */
|
||||
|
||||
/* JSON: JavaScript Object Notation, a lightweight data-interchange format */
|
||||
|
||||
|
||||
/* XML: Extensible Markup Language */
|
||||
|
||||
|
||||
/* multimedia packages */
|
||||
|
||||
@@ -190,6 +172,8 @@
|
||||
|
||||
/* miscellaneous packages */
|
||||
|
||||
/* project laboratory */
|
||||
|
||||
/* samples: kernel and components samples */
|
||||
|
||||
|
||||
@@ -201,6 +185,7 @@
|
||||
/* Hardware Drivers Config */
|
||||
|
||||
#define SOC_STM32H750XB
|
||||
#define BOARD_STM32H750_ARTPI
|
||||
|
||||
/* Board extended module */
|
||||
|
||||
|
||||
@@ -484,21 +484,27 @@ static rt_size_t _serial_fifo_tx_blocking_buf(struct rt_device *dev,
|
||||
{
|
||||
struct rt_serial_device *serial;
|
||||
struct rt_serial_tx_fifo *tx_fifo = RT_NULL;
|
||||
rt_size_t length = size;
|
||||
rt_size_t offset = 0;
|
||||
|
||||
RT_ASSERT(dev != RT_NULL);
|
||||
if (size == 0) return 0;
|
||||
|
||||
RT_ASSERT(dev != RT_NULL);
|
||||
serial = (struct rt_serial_device *)dev;
|
||||
RT_ASSERT((serial != RT_NULL) && (buffer != RT_NULL));
|
||||
|
||||
tx_fifo = (struct rt_serial_tx_fifo *) serial->serial_tx;
|
||||
RT_ASSERT(tx_fifo != RT_NULL);
|
||||
|
||||
if (rt_thread_self() == RT_NULL || (serial->parent.open_flag & RT_DEVICE_FLAG_STREAM))
|
||||
{
|
||||
/* using poll tx when the scheduler not startup or in stream mode */
|
||||
return _serial_poll_tx(dev, pos, buffer, size);
|
||||
}
|
||||
/* When serial transmit in tx_blocking mode,
|
||||
* if the activated mode is RT_TRUE, it will return directly */
|
||||
if (tx_fifo->activated == RT_TRUE) return 0;
|
||||
|
||||
tx_fifo->activated = RT_TRUE;
|
||||
rt_size_t length = size;
|
||||
rt_size_t offset = 0;
|
||||
|
||||
while (size)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user