Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
luozhenger
rt-thread
提交
bbcac311
R
rt-thread
项目概览
luozhenger
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
bbcac311
编写于
1月 19, 2017
作者:
B
Bernard Xiong
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/RT-Thread/rt-thread
上级
de3cf419
ad02d293
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
46 addition
and
17 deletion
+46
-17
bsp/stm32f10x/drivers/usart.c
bsp/stm32f10x/drivers/usart.c
+29
-6
components/drivers/serial/serial.c
components/drivers/serial/serial.c
+17
-11
未找到文件。
bsp/stm32f10x/drivers/usart.c
浏览文件 @
bbcac311
...
...
@@ -14,6 +14,7 @@
* 2013-05-13 aozima update for kehong-lingtai.
* 2015-01-31 armink make sure the serial transmit complete in putc()
* 2016-05-13 armink add DMA Rx mode
* 2017-01-19 aubr.cool add interrupt Tx mode
*/
#include "stm32f10x.h"
...
...
@@ -144,8 +145,21 @@ static int stm32_putc(struct rt_serial_device *serial, char c)
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
stm32_uart
*
)
serial
->
parent
.
user_data
;
uart
->
uart_device
->
DR
=
c
;
while
(
!
(
uart
->
uart_device
->
SR
&
USART_FLAG_TC
));
if
(
serial
->
parent
.
open_flag
&
RT_DEVICE_FLAG_INT_TX
)
{
if
(
!
(
uart
->
uart_device
->
SR
&
USART_FLAG_TXE
))
{
USART_ITConfig
(
uart
->
uart_device
,
USART_IT_TC
,
ENABLE
);
return
-
1
;
}
uart
->
uart_device
->
DR
=
c
;
USART_ITConfig
(
uart
->
uart_device
,
USART_IT_TC
,
ENABLE
);
}
else
{
uart
->
uart_device
->
DR
=
c
;
while
(
!
(
uart
->
uart_device
->
SR
&
USART_FLAG_TC
));
}
return
1
;
}
...
...
@@ -244,6 +258,11 @@ static void uart_isr(struct rt_serial_device *serial) {
if
(
USART_GetITStatus
(
uart
->
uart_device
,
USART_IT_TC
)
!=
RESET
)
{
/* clear interrupt */
if
(
serial
->
parent
.
open_flag
&
RT_DEVICE_FLAG_INT_TX
)
{
rt_hw_serial_isr
(
serial
,
RT_SERIAL_EVENT_TX_DONE
);
}
USART_ITConfig
(
uart
->
uart_device
,
USART_IT_RXNE
,
DISABLE
);
USART_ClearITPendingBit
(
uart
->
uart_device
,
USART_IT_TC
);
}
if
(
USART_GetFlagStatus
(
uart
->
uart_device
,
USART_FLAG_ORE
)
==
SET
)
...
...
@@ -561,7 +580,8 @@ void rt_hw_usart_init(void)
/* register UART1 device */
rt_hw_serial_register
(
&
serial1
,
"uart1"
,
RT_DEVICE_FLAG_RDWR
|
RT_DEVICE_FLAG_INT_RX
|
RT_DEVICE_FLAG_DMA_RX
,
RT_DEVICE_FLAG_RDWR
|
RT_DEVICE_FLAG_INT_RX
|
RT_DEVICE_FLAG_INT_TX
|
RT_DEVICE_FLAG_DMA_RX
,
uart
);
#endif
/* RT_USING_UART1 */
...
...
@@ -576,7 +596,8 @@ void rt_hw_usart_init(void)
/* register UART2 device */
rt_hw_serial_register
(
&
serial2
,
"uart2"
,
RT_DEVICE_FLAG_RDWR
|
RT_DEVICE_FLAG_INT_RX
|
RT_DEVICE_FLAG_DMA_RX
,
RT_DEVICE_FLAG_RDWR
|
RT_DEVICE_FLAG_INT_RX
|
RT_DEVICE_FLAG_INT_TX
|
RT_DEVICE_FLAG_DMA_RX
,
uart
);
#endif
/* RT_USING_UART2 */
...
...
@@ -592,7 +613,8 @@ void rt_hw_usart_init(void)
/* register UART3 device */
rt_hw_serial_register
(
&
serial3
,
"uart3"
,
RT_DEVICE_FLAG_RDWR
|
RT_DEVICE_FLAG_INT_RX
|
RT_DEVICE_FLAG_DMA_RX
,
RT_DEVICE_FLAG_RDWR
|
RT_DEVICE_FLAG_INT_RX
|
RT_DEVICE_FLAG_INT_TX
|
RT_DEVICE_FLAG_DMA_RX
,
uart
);
#endif
/* RT_USING_UART3 */
...
...
@@ -608,7 +630,8 @@ void rt_hw_usart_init(void)
/* register UART4 device */
rt_hw_serial_register
(
&
serial4
,
"uart4"
,
RT_DEVICE_FLAG_RDWR
|
RT_DEVICE_FLAG_INT_RX
|
RT_DEVICE_FLAG_DMA_RX
,
RT_DEVICE_FLAG_RDWR
|
RT_DEVICE_FLAG_INT_RX
|
RT_DEVICE_FLAG_INT_TX
|
RT_DEVICE_FLAG_DMA_RX
,
uart
);
#endif
/* RT_USING_UART4 */
}
components/drivers/serial/serial.c
浏览文件 @
bbcac311
...
...
@@ -31,6 +31,7 @@
* in open function.
* 2015-11-10 bernard fix the poll rx issue when there is no data.
* 2016-05-10 armink add fifo mode to DMA rx when serial->config.bufsz != 0.
* 2017-01-19 aubr.cool prevent change serial rx bufsz when serial is opened.
*/
#include <rthw.h>
...
...
@@ -603,17 +604,22 @@ static rt_err_t rt_serial_control(struct rt_device *dev,
break
;
case
RT_DEVICE_CTRL_CONFIG
:
if
(
args
)
{
/* set serial configure */
serial
->
config
=
*
(
struct
serial_configure
*
)
args
;
if
(
dev
->
ref_count
)
{
/* serial device has been opened, to configure it */
serial
->
ops
->
configure
(
serial
,
(
struct
serial_configure
*
)
args
);
}
}
if
(
args
)
{
struct
serial_configure
*
pconfig
=
(
struct
serial_configure
*
)
args
;
if
(
pconfig
->
bufsz
!=
serial
->
config
.
bufsz
&&
serial
->
parent
.
ref_count
)
{
/*can not change buffer size*/
return
RT_EBUSY
;
}
/* set serial configure */
serial
->
config
=
*
pconfig
;
if
(
serial
->
parent
.
ref_count
)
{
/* serial device has been opened, to configure it */
serial
->
ops
->
configure
(
serial
,
(
struct
serial_configure
*
)
args
);
}
}
break
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录