Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
宁楠萍
rt-thread
提交
82930906
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,体验更适合开发者的 AI 搜索 >>
提交
82930906
编写于
3月 17, 2017
作者:
armink_ztl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[BSP] Enhanced stm32f10x serial DMA rx driver reliability.
上级
cebbee79
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
54 addition
and
37 deletion
+54
-37
bsp/stm32f10x/drivers/usart.c
bsp/stm32f10x/drivers/usart.c
+54
-37
未找到文件。
bsp/stm32f10x/drivers/usart.c
浏览文件 @
82930906
...
...
@@ -48,15 +48,18 @@ struct stm32_uart
{
USART_TypeDef
*
uart_device
;
IRQn_Type
irq
;
struct
stm32_uart_dma
{
struct
stm32_uart_dma
{
/* dma channel */
DMA_Channel_TypeDef
*
rx_ch
;
/* dma global flag */
uint32_t
rx_gl_flag
;
/* dma irq channel */
uint8_t
rx_irq_ch
;
/* setting receive len */
rt_size_t
setting_recv_len
;
/* last receive index */
rt_size_t
last_recv_
len
;
rt_size_t
last_recv_
index
;
}
dma
;
};
...
...
@@ -145,15 +148,15 @@ static int stm32_putc(struct rt_serial_device *serial, char c)
RT_ASSERT
(
serial
!=
RT_NULL
);
uart
=
(
struct
stm32_uart
*
)
serial
->
parent
.
user_data
;
if
(
serial
->
parent
.
open_flag
&
RT_DEVICE_FLAG_INT_TX
)
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
);
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
{
...
...
@@ -188,24 +191,31 @@ static int stm32_getc(struct rt_serial_device *serial)
*/
static
void
dma_uart_rx_idle_isr
(
struct
rt_serial_device
*
serial
)
{
struct
stm32_uart
*
uart
=
(
struct
stm32_uart
*
)
serial
->
parent
.
user_data
;
rt_size_t
recv_total_len
,
recv_len
;
/* disable dma, stop receive data */
DMA_Cmd
(
uart
->
dma
.
rx_ch
,
DISABLE
);
recv_total_len
=
serial
->
config
.
bufsz
-
DMA_GetCurrDataCounter
(
uart
->
dma
.
rx_ch
);
if
(
recv_total_len
>
uart
->
dma
.
last_recv_len
)
{
recv_len
=
recv_total_len
-
uart
->
dma
.
last_recv_len
;
}
else
{
recv_len
=
recv_total_len
;
rt_size_t
recv_total_index
,
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_len
=
recv_total_len
;
rt_hw_serial_isr
(
serial
,
RT_SERIAL_EVENT_RX_DMADONE
|
(
recv_len
<<
8
));
uart
->
dma
.
last_recv_index
=
recv_total_index
;
/* enable interrupt */
rt_hw_interrupt_enable
(
level
);
if
(
recv_len
)
rt_hw_serial_isr
(
serial
,
RT_SERIAL_EVENT_RX_DMADONE
|
(
recv_len
<<
8
));
/* read a data for clear receive idle interrupt flag */
USART_ReceiveData
(
uart
->
uart_device
);
DMA_ClearFlag
(
uart
->
dma
.
rx_gl_flag
);
DMA_Cmd
(
uart
->
dma
.
rx_ch
,
ENABLE
);
}
/**
...
...
@@ -215,24 +225,29 @@ 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_len
,
recv_len
;
/* disable dma, stop receive data */
DMA_Cmd
(
uart
->
dma
.
rx_ch
,
DISABLE
);
recv_total_len
=
serial
->
config
.
bufsz
-
DMA_GetCurrDataCounter
(
uart
->
dma
.
rx_ch
);
if
(
recv_total_len
>
uart
->
dma
.
last_recv_len
)
{
recv_len
=
recv_total_len
-
uart
->
dma
.
last_recv_len
;
}
else
{
recv_len
=
recv_total_len
;
rt_size_t
recv_total_index
,
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_len
=
recv_total_len
;
rt_hw_serial_isr
(
serial
,
RT_SERIAL_EVENT_RX_DMADONE
|
(
recv_len
<<
8
));
uart
->
dma
.
last_recv_index
=
recv_total_index
;
/* enable interrupt */
rt_hw_interrupt_enable
(
level
);
if
(
recv_len
)
rt_hw_serial_isr
(
serial
,
RT_SERIAL_EVENT_RX_DMADONE
|
(
recv_len
<<
8
));
DMA_ClearFlag
(
uart
->
dma
.
rx_gl_flag
);
/* reload */
DMA_SetCurrDataCounter
(
uart
->
dma
.
rx_ch
,
serial
->
config
.
bufsz
);
DMA_Cmd
(
uart
->
dma
.
rx_ch
,
ENABLE
);
}
/**
...
...
@@ -527,6 +542,8 @@ static void DMA_Configuration(struct rt_serial_device *serial) {
DMA_InitTypeDef
DMA_InitStructure
;
NVIC_InitTypeDef
NVIC_InitStructure
;
uart
->
dma
.
setting_recv_len
=
serial
->
config
.
bufsz
;
/* enable transmit idle interrupt */
USART_ITConfig
(
uart
->
uart_device
,
USART_IT_IDLE
,
ENABLE
);
...
...
@@ -544,7 +561,7 @@ static void DMA_Configuration(struct rt_serial_device *serial) {
DMA_InitStructure
.
DMA_MemoryInc
=
DMA_MemoryInc_Enable
;
DMA_InitStructure
.
DMA_PeripheralDataSize
=
DMA_PeripheralDataSize_Byte
;
DMA_InitStructure
.
DMA_MemoryDataSize
=
DMA_MemoryDataSize_Byte
;
DMA_InitStructure
.
DMA_Mode
=
DMA_Mode_
Normal
;
DMA_InitStructure
.
DMA_Mode
=
DMA_Mode_
Circular
;
DMA_InitStructure
.
DMA_Priority
=
DMA_Priority_High
;
DMA_InitStructure
.
DMA_M2M
=
DMA_M2M_Disable
;
DMA_Init
(
uart
->
dma
.
rx_ch
,
&
DMA_InitStructure
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录