Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Mr_Pangza
rt-thread
提交
47fa1d92
R
rt-thread
项目概览
Mr_Pangza
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
2
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
47fa1d92
编写于
9月 21, 2019
作者:
B
Bernard Xiong
提交者:
GitHub
9月 21, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3095 from armink/fix_serial
Fix serial
上级
32baa8e9
5c68b748
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
28 deletion
+16
-28
bsp/imxrt/libraries/drivers/drv_uart.c
bsp/imxrt/libraries/drivers/drv_uart.c
+6
-10
bsp/stm32/libraries/HAL_Drivers/drv_usart.c
bsp/stm32/libraries/HAL_Drivers/drv_usart.c
+10
-18
未找到文件。
bsp/imxrt/libraries/drivers/drv_uart.c
浏览文件 @
47fa1d92
...
...
@@ -582,8 +582,7 @@ static rt_err_t imxrt_configure(struct rt_serial_device *serial, struct serial_c
RT_ASSERT
(
serial
!=
RT_NULL
);
RT_ASSERT
(
cfg
!=
RT_NULL
);
uart
=
(
struct
imxrt_uart
*
)
serial
->
parent
.
user_data
;
RT_ASSERT
(
uart
!=
RT_NULL
);
uart
=
rt_container_of
(
serial
,
struct
imxrt_uart
,
serial
);
LPUART_GetDefaultConfig
(
&
config
);
config
.
baudRate_Bps
=
cfg
->
baud_rate
;
...
...
@@ -635,8 +634,7 @@ static rt_err_t imxrt_control(struct rt_serial_device *serial, int cmd, void *ar
struct
imxrt_uart
*
uart
;
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
imxrt_uart
*
)
serial
->
parent
.
user_data
;
RT_ASSERT
(
uart
!=
RT_NULL
);
uart
=
rt_container_of
(
serial
,
struct
imxrt_uart
,
serial
);
#if defined(RT_SERIAL_USING_DMA) && defined(BSP_USING_DMA)
rt_ubase_t
ctrl_arg
=
(
rt_ubase_t
)
arg
;
...
...
@@ -677,8 +675,7 @@ static int imxrt_putc(struct rt_serial_device *serial, char ch)
struct
imxrt_uart
*
uart
;
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
imxrt_uart
*
)
serial
->
parent
.
user_data
;
RT_ASSERT
(
uart
!=
RT_NULL
);
uart
=
rt_container_of
(
serial
,
struct
imxrt_uart
,
serial
);
LPUART_WriteByte
(
uart
->
uart_base
,
ch
);
while
(
!
(
LPUART_GetStatusFlags
(
uart
->
uart_base
)
&
kLPUART_TxDataRegEmptyFlag
));
...
...
@@ -692,8 +689,7 @@ static int imxrt_getc(struct rt_serial_device *serial)
struct
imxrt_uart
*
uart
;
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
imxrt_uart
*
)
serial
->
parent
.
user_data
;
RT_ASSERT
(
uart
!=
RT_NULL
);
uart
=
rt_container_of
(
serial
,
struct
imxrt_uart
,
serial
);
ch
=
-
1
;
if
(
LPUART_GetStatusFlags
(
uart
->
uart_base
)
&
kLPUART_RxDataRegFullFlag
)
...
...
@@ -712,7 +708,7 @@ rt_size_t dma_tx_xfer(struct rt_serial_device *serial, rt_uint8_t *buf, rt_size_
rt_size_t
xfer_size
=
0
;
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
imxrt_uart
*
)
serial
->
parent
.
user_data
;
uart
=
rt_container_of
(
serial
,
struct
imxrt_uart
,
serial
)
;
if
(
0
!=
size
)
{
...
...
@@ -760,7 +756,7 @@ int rt_hw_uart_init(void)
uarts
[
i
].
serial
.
ops
=
&
imxrt_uart_ops
;
uarts
[
i
].
serial
.
config
=
config
;
ret
=
rt_hw_serial_register
(
&
uarts
[
i
].
serial
,
uarts
[
i
].
name
,
flag
|
uarts
[
i
].
dma_flag
,
(
void
*
)
&
uarts
[
i
]
);
ret
=
rt_hw_serial_register
(
&
uarts
[
i
].
serial
,
uarts
[
i
].
name
,
flag
|
uarts
[
i
].
dma_flag
,
NULL
);
}
return
ret
;
...
...
bsp/stm32/libraries/HAL_Drivers/drv_usart.c
浏览文件 @
47fa1d92
...
...
@@ -98,8 +98,8 @@ static rt_err_t stm32_configure(struct rt_serial_device *serial, struct serial_c
struct
stm32_uart
*
uart
;
RT_ASSERT
(
serial
!=
RT_NULL
);
RT_ASSERT
(
cfg
!=
RT_NULL
);
uart
=
(
struct
stm32_uart
*
)
serial
->
parent
.
user_data
;
RT_ASSERT
(
uart
!=
RT_NULL
);
uart
=
rt_container_of
(
serial
,
struct
stm32_uart
,
serial
);
uart
->
handle
.
Instance
=
uart
->
config
->
Instance
;
uart
->
handle
.
Init
.
BaudRate
=
cfg
->
baud_rate
;
...
...
@@ -162,8 +162,7 @@ static rt_err_t stm32_control(struct rt_serial_device *serial, int cmd, void *ar
#endif
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
stm32_uart
*
)
serial
->
parent
.
user_data
;
RT_ASSERT
(
uart
!=
RT_NULL
);
uart
=
rt_container_of
(
serial
,
struct
stm32_uart
,
serial
);
switch
(
cmd
)
{
...
...
@@ -196,7 +195,7 @@ static int stm32_putc(struct rt_serial_device *serial, char c)
struct
stm32_uart
*
uart
;
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
stm32_uart
*
)
serial
->
parent
.
user_data
;
uart
=
rt_container_of
(
serial
,
struct
stm32_uart
,
serial
)
;
UART_INSTANCE_CLEAR_FUNCTION
(
&
(
uart
->
handle
),
UART_FLAG_TC
);
#if defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32F0) \
|| defined(SOC_SERIES_STM32L0) || defined(SOC_SERIES_STM32G0) || defined(SOC_SERIES_STM32H7)
...
...
@@ -213,8 +212,7 @@ static int stm32_getc(struct rt_serial_device *serial)
int
ch
;
struct
stm32_uart
*
uart
;
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
stm32_uart
*
)
serial
->
parent
.
user_data
;
RT_ASSERT
(
uart
!=
RT_NULL
);
uart
=
rt_container_of
(
serial
,
struct
stm32_uart
,
serial
);
ch
=
-
1
;
if
(
__HAL_UART_GET_FLAG
(
&
(
uart
->
handle
),
UART_FLAG_RXNE
)
!=
RESET
)
...
...
@@ -233,8 +231,7 @@ static rt_size_t stm32_dma_transmit(struct rt_serial_device *serial, rt_uint8_t
{
struct
stm32_uart
*
uart
;
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
stm32_uart
*
)(
serial
->
parent
.
user_data
);
RT_ASSERT
(
uart
!=
RT_NULL
);
uart
=
rt_container_of
(
serial
,
struct
stm32_uart
,
serial
);
if
(
size
==
0
)
{
...
...
@@ -278,9 +275,7 @@ static void uart_isr(struct rt_serial_device *serial)
#endif
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
stm32_uart
*
)
serial
->
parent
.
user_data
;
RT_ASSERT
(
uart
!=
RT_NULL
);
uart
=
rt_container_of
(
serial
,
struct
stm32_uart
,
serial
);
/* UART in mode Receiver -------------------------------------------------*/
if
((
__HAL_UART_GET_FLAG
(
&
(
uart
->
handle
),
UART_FLAG_RXNE
)
!=
RESET
)
&&
...
...
@@ -368,9 +363,7 @@ static void dma_isr(struct rt_serial_device *serial)
rt_base_t
level
;
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
stm32_uart
*
)
serial
->
parent
.
user_data
;
RT_ASSERT
(
uart
!=
RT_NULL
);
uart
=
rt_container_of
(
serial
,
struct
stm32_uart
,
serial
);
if
((
__HAL_DMA_GET_IT_SOURCE
(
&
(
uart
->
dma_rx
.
handle
),
DMA_IT_TC
)
!=
RESET
)
||
(
__HAL_DMA_GET_IT_SOURCE
(
&
(
uart
->
dma_rx
.
handle
),
DMA_IT_HT
)
!=
RESET
))
...
...
@@ -727,8 +720,7 @@ static void stm32_dma_config(struct rt_serial_device *serial, rt_ubase_t flag)
struct
stm32_uart
*
uart
;
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
stm32_uart
*
)
serial
->
parent
.
user_data
;
RT_ASSERT
(
uart
!=
RT_NULL
);
uart
=
rt_container_of
(
serial
,
struct
stm32_uart
,
serial
);
if
(
RT_DEVICE_FLAG_DMA_RX
==
flag
)
{
...
...
@@ -989,7 +981,7 @@ int rt_hw_usart_init(void)
|
RT_DEVICE_FLAG_INT_RX
|
RT_DEVICE_FLAG_INT_TX
|
uart_obj
[
i
].
uart_dma_flag
,
&
uart_obj
[
i
]
);
,
NULL
);
RT_ASSERT
(
result
==
RT_EOK
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录