Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
宁楠萍
rt-thread
提交
9b7d2023
R
rt-thread
项目概览
宁楠萍
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9b7d2023
编写于
5月 24, 2017
作者:
armink_ztl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[BSP] Fix a bug on stm32f10x uart rx DMA driver when first receive data filled the FIFO.
上级
99911a4c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
23 deletion
+7
-23
bsp/stm32f10x/drivers/usart.c
bsp/stm32f10x/drivers/usart.c
+7
-23
未找到文件。
bsp/stm32f10x/drivers/usart.c
浏览文件 @
9b7d2023
...
...
@@ -199,15 +199,7 @@ static void dma_uart_rx_idle_isr(struct rt_serial_device *serial) {
level
=
rt_hw_interrupt_disable
();
recv_total_index
=
uart
->
dma
.
setting_recv_len
-
DMA_GetCurrDataCounter
(
uart
->
dma
.
rx_ch
);
if
(
recv_total_index
>=
uart
->
dma
.
last_recv_index
)
{
recv_len
=
recv_total_index
-
uart
->
dma
.
last_recv_index
;
}
else
{
recv_len
=
uart
->
dma
.
setting_recv_len
-
uart
->
dma
.
last_recv_index
+
recv_total_index
;
}
recv_len
=
recv_total_index
-
uart
->
dma
.
last_recv_index
;
uart
->
dma
.
last_recv_index
=
recv_total_index
;
/* enable interrupt */
rt_hw_interrupt_enable
(
level
);
...
...
@@ -226,23 +218,15 @@ static void dma_uart_rx_idle_isr(struct rt_serial_device *serial) {
*/
static
void
dma_rx_done_isr
(
struct
rt_serial_device
*
serial
)
{
struct
stm32_uart
*
uart
=
(
struct
stm32_uart
*
)
serial
->
parent
.
user_data
;
rt_size_t
recv_
total_index
,
recv_
len
;
rt_size_t
recv_len
;
rt_base_t
level
;
/* disable interrupt */
level
=
rt_hw_interrupt_disable
();
recv_total_index
=
uart
->
dma
.
setting_recv_len
-
DMA_GetCurrDataCounter
(
uart
->
dma
.
rx_ch
);
if
(
recv_total_index
>=
uart
->
dma
.
last_recv_index
)
{
recv_len
=
recv_total_index
-
uart
->
dma
.
last_recv_index
;
}
else
{
recv_len
=
uart
->
dma
.
setting_recv_len
-
uart
->
dma
.
last_recv_index
+
recv_total_index
;
}
uart
->
dma
.
last_recv_index
=
recv_total_index
;
recv_len
=
uart
->
dma
.
setting_recv_len
-
uart
->
dma
.
last_recv_index
;
/* reset last recv index */
uart
->
dma
.
last_recv_index
=
0
;
/* enable interrupt */
rt_hw_interrupt_enable
(
level
);
...
...
@@ -535,7 +519,7 @@ static void NVIC_Configuration(struct stm32_uart* uart)
/* Enable the USART1 Interrupt */
NVIC_InitStructure
.
NVIC_IRQChannel
=
uart
->
irq
;
NVIC_InitStructure
.
NVIC_IRQChannelPreemptionPriority
=
0
;
NVIC_InitStructure
.
NVIC_IRQChannelSubPriority
=
0
;
NVIC_InitStructure
.
NVIC_IRQChannelSubPriority
=
1
;
NVIC_InitStructure
.
NVIC_IRQChannelCmd
=
ENABLE
;
NVIC_Init
(
&
NVIC_InitStructure
);
}
...
...
@@ -577,7 +561,7 @@ static void DMA_Configuration(struct rt_serial_device *serial) {
/* rx dma interrupt config */
NVIC_InitStructure
.
NVIC_IRQChannel
=
uart
->
dma
.
rx_irq_ch
;
NVIC_InitStructure
.
NVIC_IRQChannelPreemptionPriority
=
0
;
NVIC_InitStructure
.
NVIC_IRQChannelSubPriority
=
1
;
NVIC_InitStructure
.
NVIC_IRQChannelSubPriority
=
0
;
NVIC_InitStructure
.
NVIC_IRQChannelCmd
=
ENABLE
;
NVIC_Init
(
&
NVIC_InitStructure
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录