Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Keyboard Man_俊
rt-thread
提交
224c171d
R
rt-thread
项目概览
Keyboard Man_俊
/
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,发现更多精彩内容 >>
提交
224c171d
编写于
1月 18, 2019
作者:
S
SummerGift
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'remotes/origin/master' into add_stm32_new_framework
上级
1a761aa9
0ea42fe7
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
37 addition
and
37 deletion
+37
-37
bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h
bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h
+12
-12
bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h
bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h
+4
-4
bsp/stm32/libraries/HAL_Drivers/config/f7/dma_config.h
bsp/stm32/libraries/HAL_Drivers/config/f7/dma_config.h
+12
-12
bsp/stm32/libraries/HAL_Drivers/config/f7/uart_config.h
bsp/stm32/libraries/HAL_Drivers/config/f7/uart_config.h
+4
-4
bsp/stm32/libraries/HAL_Drivers/drv_usart.c
bsp/stm32/libraries/HAL_Drivers/drv_usart.c
+5
-5
未找到文件。
bsp/stm32/libraries/HAL_Drivers/config/f4/dma_config.h
浏览文件 @
224c171d
...
...
@@ -132,12 +132,12 @@ extern "C" {
#define SPI1_RX_DMA_INSTANCE DMA2_Stream2
#define SPI1_RX_DMA_CHANNEL DMA_CHANNEL_3
#define SPI1_RX_DMA_IRQ DMA2_Stream2_IRQn
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(U
S
ART1_RX_DMA_INSTANCE)
#define U
S
ART1_DMA_RX_IRQHandler DMA2_Stream2_IRQHandler
#define U
S
ART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
#define U
S
ART1_RX_DMA_INSTANCE DMA2_Stream2
#define U
S
ART1_RX_DMA_CHANNEL DMA_CHANNEL_4
#define U
S
ART1_RX_DMA_IRQ DMA2_Stream2_IRQn
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA_INSTANCE)
#define UART1_DMA_RX_IRQHandler DMA2_Stream2_IRQHandler
#define UART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
#define UART1_RX_DMA_INSTANCE DMA2_Stream2
#define UART1_RX_DMA_CHANNEL DMA_CHANNEL_4
#define UART1_RX_DMA_IRQ DMA2_Stream2_IRQn
#endif
/* DMA2 stream3 */
...
...
@@ -184,12 +184,12 @@ extern "C" {
#define SPI1_TX_DMA_INSTANCE DMA2_Stream5
#define SPI1_TX_DMA_CHANNEL DMA_CHANNEL_3
#define SPI1_TX_DMA_IRQ DMA2_Stream5_IRQn
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(U
S
ART1_RX_DMA_INSTANCE)
#define U
S
ART1_DMA_RX_IRQHandler DMA2_Stream5_IRQHandler
#define U
S
ART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
#define U
S
ART1_RX_DMA_INSTANCE DMA2_Stream5
#define U
S
ART1_RX_DMA_CHANNEL DMA_CHANNEL_4
#define U
S
ART1_RX_DMA_IRQ DMA2_Stream5_IRQn
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA_INSTANCE)
#define UART1_DMA_RX_IRQHandler DMA2_Stream5_IRQHandler
#define UART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
#define UART1_RX_DMA_INSTANCE DMA2_Stream5
#define UART1_RX_DMA_CHANNEL DMA_CHANNEL_4
#define UART1_RX_DMA_IRQ DMA2_Stream5_IRQn
#elif defined(BSP_SPI5_RX_USING_DMA) && !defined(SPI5_RX_DMA_INSTANCE)
#define SPI5_DMA_RX_IRQHandler DMA2_Stream5_IRQHandler
#define SPI5_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
...
...
bsp/stm32/libraries/HAL_Drivers/config/f4/uart_config.h
浏览文件 @
224c171d
...
...
@@ -33,10 +33,10 @@ extern "C" {
#ifndef UART1_DMA_CONFIG
#define UART1_DMA_CONFIG \
{ \
.Instance = U
S
ART1_RX_DMA_INSTANCE, \
.channel = U
S
ART1_RX_DMA_CHANNEL, \
.dma_rcc = U
S
ART1_RX_DMA_RCC, \
.dma_irq = U
S
ART1_RX_DMA_IRQ, \
.Instance = UART1_RX_DMA_INSTANCE, \
.channel = UART1_RX_DMA_CHANNEL, \
.dma_rcc = UART1_RX_DMA_RCC, \
.dma_irq = UART1_RX_DMA_IRQ, \
}
#endif
/* UART1_DMA_CONFIG */
#endif
/* BSP_UART1_RX_USING_DMA */
...
...
bsp/stm32/libraries/HAL_Drivers/config/f7/dma_config.h
浏览文件 @
224c171d
...
...
@@ -133,12 +133,12 @@ extern "C" {
#define SPI1_RX_DMA_INSTANCE DMA2_Stream2
#define SPI1_RX_DMA_CHANNEL DMA_CHANNEL_3
#define SPI1_RX_DMA_IRQ DMA2_Stream2_IRQn
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(U
S
ART1_RX_DMA_INSTANCE)
#define U
S
ART1_DMA_RX_IRQHandler DMA2_Stream2_IRQHandler
#define U
S
ART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
#define U
S
ART1_RX_DMA_INSTANCE DMA2_Stream2
#define U
S
ART1_RX_DMA_CHANNEL DMA_CHANNEL_4
#define U
S
ART1_RX_DMA_IRQ DMA2_Stream2_IRQn
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA_INSTANCE)
#define UART1_DMA_RX_IRQHandler DMA2_Stream2_IRQHandler
#define UART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
#define UART1_RX_DMA_INSTANCE DMA2_Stream2
#define UART1_RX_DMA_CHANNEL DMA_CHANNEL_4
#define UART1_RX_DMA_IRQ DMA2_Stream2_IRQn
#elif defined(BSP_QSPI_USING_DMA) && !defined(QSPI_DMA_INSTANCE)
#define QSPI_DMA_IRQHandler DMA2_Stream2_IRQHandler
#define QSPI_DMA_RCC RCC_AHB1ENR_DMA2EN
...
...
@@ -190,12 +190,12 @@ extern "C" {
#define SPI1_TX_DMA_INSTANCE DMA2_Stream5
#define SPI1_TX_DMA_CHANNEL DMA_CHANNEL_3
#define SPI1_TX_DMA_IRQ DMA2_Stream5_IRQn
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(U
S
ART1_RX_DMA_INSTANCE)
#define U
S
ART1_DMA_RX_IRQHandler DMA2_Stream5_IRQHandler
#define U
S
ART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
#define U
S
ART1_RX_DMA_INSTANCE DMA2_Stream5
#define U
S
ART1_RX_DMA_CHANNEL DMA_CHANNEL_4
#define U
S
ART1_RX_DMA_IRQ DMA2_Stream5_IRQn
#elif defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA_INSTANCE)
#define UART1_DMA_RX_IRQHandler DMA2_Stream5_IRQHandler
#define UART1_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
#define UART1_RX_DMA_INSTANCE DMA2_Stream5
#define UART1_RX_DMA_CHANNEL DMA_CHANNEL_4
#define UART1_RX_DMA_IRQ DMA2_Stream5_IRQn
#elif defined(BSP_SPI5_RX_USING_DMA) && !defined(SPI5_RX_DMA_INSTANCE)
#define SPI5_DMA_RX_IRQHandler DMA2_Stream5_IRQHandler
#define SPI5_RX_DMA_RCC RCC_AHB1ENR_DMA2EN
...
...
bsp/stm32/libraries/HAL_Drivers/config/f7/uart_config.h
浏览文件 @
224c171d
...
...
@@ -33,10 +33,10 @@ extern "C" {
#ifndef UART1_DMA_CONFIG
#define UART1_DMA_CONFIG \
{ \
.Instance = U
S
ART1_RX_DMA_INSTANCE, \
.channel = U
S
ART1_RX_DMA_CHANNEL, \
.dma_rcc = U
S
ART1_RX_DMA_RCC, \
.dma_irq = U
S
ART1_RX_DMA_IRQ, \
.Instance = UART1_RX_DMA_INSTANCE, \
.channel = UART1_RX_DMA_CHANNEL, \
.dma_rcc = UART1_RX_DMA_RCC, \
.dma_irq = UART1_RX_DMA_IRQ, \
}
#endif
/* UART1_DMA_CONFIG */
#endif
/* BSP_UART1_RX_USING_DMA */
...
...
bsp/stm32/libraries/HAL_Drivers/drv_usart.c
浏览文件 @
224c171d
...
...
@@ -308,7 +308,7 @@ void USART1_IRQHandler(void)
rt_interrupt_leave
();
}
#if defined(RT_SERIAL_USING_DMA) && defined(BSP_UART1_RX_USING_DMA)
void
U
S
ART1_DMA_RX_IRQHandler
(
void
)
void
UART1_DMA_RX_IRQHandler
(
void
)
{
/* enter interrupt */
rt_interrupt_enter
();
...
...
@@ -333,7 +333,7 @@ void USART2_IRQHandler(void)
rt_interrupt_leave
();
}
#if defined(RT_SERIAL_USING_DMA) && defined(BSP_UART2_RX_USING_DMA)
void
U
S
ART2_DMA_RX_IRQHandler
(
void
)
void
UART2_DMA_RX_IRQHandler
(
void
)
{
/* enter interrupt */
rt_interrupt_enter
();
...
...
@@ -358,7 +358,7 @@ void USART3_IRQHandler(void)
rt_interrupt_leave
();
}
#if defined(RT_SERIAL_USING_DMA) && defined(BSP_UART3_RX_USING_DMA)
void
U
S
ART3_DMA_RX_IRQHandler
(
void
)
void
UART3_DMA_RX_IRQHandler
(
void
)
{
/* enter interrupt */
rt_interrupt_enter
();
...
...
@@ -383,7 +383,7 @@ void UART4_IRQHandler(void)
rt_interrupt_leave
();
}
#if defined(RT_SERIAL_USING_DMA) && defined(BSP_UART4_RX_USING_DMA)
void
U
S
ART4_DMA_RX_IRQHandler
(
void
)
void
UART4_DMA_RX_IRQHandler
(
void
)
{
/* enter interrupt */
rt_interrupt_enter
();
...
...
@@ -408,7 +408,7 @@ void UART5_IRQHandler(void)
rt_interrupt_leave
();
}
#if defined(RT_SERIAL_USING_DMA) && defined(BSP_UART5_RX_USING_DMA)
void
U
S
ART5_DMA_RX_IRQHandler
(
void
)
void
UART5_DMA_RX_IRQHandler
(
void
)
{
/* enter interrupt */
rt_interrupt_enter
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录