-
Notifications
You must be signed in to change notification settings - Fork 5.2k
[bsp][stm32][libraries]add stm32h5 dma & modify drv_uart_v2 #9307
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Macro-ZJ
wants to merge
5
commits into
RT-Thread:master
Choose a base branch
from
Macro-ZJ:stm32h5
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
98c6e77
[bsp][stm32][libraries]add stm32h5
Macro-ZJ 69c4d0d
[bsp][stm32][stm32h503-st-nucleo]add dma config
Macro-ZJ 8660fb2
Merge branch 'RT-Thread:master' into stm32h5
Macro-ZJ 359cea2
🌈 style(uart_v2&Kconfig): 修改格式缩进
Macro-ZJ 79beb59
Merge branch 'stm32h5' of https://github.com/Macro-ZJ/rt-thread into …
Macro-ZJ File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
103 changes: 103 additions & 0 deletions
103
bsp/stm32/libraries/HAL_Drivers/drivers/config/h5/dma_config.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
/* | ||
* Copyright (c) 2006-2023, RT-Thread Development Team | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Change Logs: | ||
* Date Author Notes | ||
* 2024-08-14 Macro first version | ||
*/ | ||
|
||
#ifndef __DMA_CONFIG_H__ | ||
#define __DMA_CONFIG_H__ | ||
|
||
#include <rtthread.h> | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
#endif | ||
|
||
/* DMA1 channel0 */ | ||
#if defined(BSP_UART3_RX_USING_DMA) && !defined(UART3_RX_DMA_INSTANCE) | ||
#define UART3_DMA_RX_IRQHandler GPDMA1_Channel0_IRQHandler | ||
#define UART3_RX_DMA_RCC RCC_AHB1ENR_GPDMA1EN | ||
#define UART3_RX_DMA_INSTANCE GPDMA1_Channel0 | ||
#define UART3_RX_DMA_REQUEST GPDMA1_REQUEST_USART3_RX | ||
#define UART3_RX_DMA_IRQ GPDMA1_Channel0_IRQn | ||
#elif defined(BSP_UART1_TX_USING_DMA) && !defined(UART1_TX_DMA_INSTANCE) | ||
#define UART1_DMA_TX_IRQHandler GPDMA1_Channel0_IRQHandler | ||
#define UART1_TX_DMA_RCC RCC_AHB1ENR_GPDMA1EN | ||
#define UART1_TX_DMA_INSTANCE GPDMA1_Channel0 | ||
#define UART1_TX_DMA_REQUEST GPDMA1_REQUEST_USART1_TX | ||
#define UART1_TX_DMA_IRQ GPDMA1_Channel0_IRQn | ||
#endif | ||
|
||
/* DMA1 channel1 */ | ||
#if defined(BSP_UART1_RX_USING_DMA) && !defined(UART1_RX_DMA_INSTANCE) | ||
#define UART1_DMA_RX_IRQHandler GPDMA1_Channel1_IRQHandler | ||
#define UART1_RX_DMA_RCC RCC_AHB1ENR_GPDMA1EN | ||
#define UART1_RX_DMA_INSTANCE GPDMA1_Channel1 | ||
#define UART1_RX_DMA_REQUEST GPDMA1_REQUEST_USART1_RX | ||
#define UART1_RX_DMA_IRQ GPDMA1_Channel1_IRQn | ||
|
||
#endif | ||
|
||
/* DMA1 channel2 */ | ||
#if defined(BSP_SPI1_TX_USING_DMA) && !defined(SPI1_TX_DMA_INSTANCE) | ||
#define SPI1_DMA_TX_IRQHandler GPDMA1_Channel2_IRQHandler | ||
#define SPI1_TX_DMA_RCC RCC_AHB1ENR_GPDMA1EN | ||
#define SPI1_TX_DMA_INSTANCE GPDMA1_Channel2 | ||
#define SPI1_TX_DMA_REQUEST GPDMA1_REQUEST_SPI1_TX | ||
#define SPI1_TX_DMA_IRQ GPDMA1_Channel2_IRQn | ||
#endif | ||
|
||
/* DMA1 channel3 */ | ||
#if defined(BSP_SPI1_RX_USING_DMA) && !defined(SPI1_RX_DMA_INSTANCE) | ||
#define SPI1_DMA_RX_IRQHandler GPDMA1_Channel3_IRQHandler | ||
#define SPI1_RX_DMA_RCC RCC_AHB1ENR_GPDMA1EN | ||
#define SPI1_RX_DMA_INSTANCE GPDMA1_Channel3 | ||
#define SPI1_RX_DMA_REQUEST GPDMA1_REQUEST_SPI1_RX | ||
#define SPI1_RX_DMA_IRQ GPDMA1_Channel3_IRQn | ||
#endif | ||
|
||
|
||
/* DMA1 channel4 */ | ||
|
||
|
||
/* DMA1 channel5 */ | ||
|
||
|
||
/* DMA1 channel6 */ | ||
|
||
|
||
/* DMA1 channel7 */ | ||
|
||
|
||
/* DMA2 channel0 */ | ||
|
||
|
||
/* DMA2 channel1 */ | ||
|
||
|
||
/* DMA2 channel2 */ | ||
|
||
|
||
/* DMA2 channel3 */ | ||
|
||
|
||
/* DMA2 channel4 */ | ||
|
||
|
||
/* DMA2 channel5 */ | ||
|
||
/* DMA2 channel6 */ | ||
|
||
|
||
/* DMA2 channel7 */ | ||
|
||
|
||
#ifdef __cplusplus | ||
} | ||
#endif | ||
|
||
#endif /* __DMA_CONFIG_H__ */ |
129 changes: 129 additions & 0 deletions
129
bsp/stm32/libraries/HAL_Drivers/drivers/config/h5/spi_config.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,129 @@ | ||
/* | ||
* Copyright (c) 2006-2023, RT-Thread Development Team | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Change Logs: | ||
* Date Author Notes | ||
* 2024-08-14 Macro first version | ||
*/ | ||
|
||
#ifndef __SPI_CONFIG_H__ | ||
#define __SPI_CONFIG_H__ | ||
|
||
#include <rtthread.h> | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
#endif | ||
|
||
#ifdef BSP_USING_SPI1 | ||
#ifndef SPI1_BUS_CONFIG | ||
#define SPI1_BUS_CONFIG \ | ||
{ \ | ||
.Instance = SPI1, \ | ||
.bus_name = "spi1", \ | ||
.irq_type = SPI1_IRQn, \ | ||
} | ||
#endif /* SPI1_BUS_CONFIG */ | ||
#endif /* BSP_USING_SPI1 */ | ||
|
||
#ifdef BSP_SPI1_TX_USING_DMA | ||
#ifndef SPI1_TX_DMA_CONFIG | ||
#define SPI1_TX_DMA_CONFIG \ | ||
{ \ | ||
.dma_rcc = SPI1_TX_DMA_RCC, \ | ||
.Instance = SPI1_TX_DMA_INSTANCE, \ | ||
.request = SPI1_TX_DMA_REQUEST, \ | ||
.dma_irq = SPI1_TX_DMA_IRQ, \ | ||
} | ||
#endif /* SPI1_TX_DMA_CONFIG */ | ||
#endif /* BSP_SPI1_TX_USING_DMA */ | ||
|
||
#ifdef BSP_SPI1_RX_USING_DMA | ||
#ifndef SPI1_RX_DMA_CONFIG | ||
#define SPI1_RX_DMA_CONFIG \ | ||
{ \ | ||
.dma_rcc = SPI1_RX_DMA_RCC, \ | ||
.Instance = SPI1_RX_DMA_INSTANCE, \ | ||
.request = SPI1_RX_DMA_REQUEST, \ | ||
.dma_irq = SPI1_RX_DMA_IRQ, \ | ||
} | ||
#endif /* SPI1_RX_DMA_CONFIG */ | ||
#endif /* BSP_SPI1_RX_USING_DMA */ | ||
|
||
#ifdef BSP_USING_SPI2 | ||
#ifndef SPI2_BUS_CONFIG | ||
#define SPI2_BUS_CONFIG \ | ||
{ \ | ||
.Instance = SPI2, \ | ||
.bus_name = "spi2", \ | ||
.irq_type = SPI2_IRQn, \ | ||
} | ||
#endif /* SPI2_BUS_CONFIG */ | ||
#endif /* BSP_USING_SPI2 */ | ||
|
||
#ifdef BSP_SPI2_TX_USING_DMA | ||
#ifndef SPI2_TX_DMA_CONFIG | ||
#define SPI2_TX_DMA_CONFIG \ | ||
{ \ | ||
.dma_rcc = SPI2_TX_DMA_RCC, \ | ||
.Instance = SPI2_TX_DMA_INSTANCE, \ | ||
.request = SPI2_TX_DMA_REQUEST, \ | ||
.dma_irq = SPI2_TX_DMA_IRQ, \ | ||
} | ||
#endif /* SPI2_TX_DMA_CONFIG */ | ||
#endif /* BSP_SPI2_TX_USING_DMA */ | ||
|
||
#ifdef BSP_SPI2_RX_USING_DMA | ||
#ifndef SPI2_RX_DMA_CONFIG | ||
#define SPI2_RX_DMA_CONFIG \ | ||
{ \ | ||
.dma_rcc = SPI2_RX_DMA_RCC, \ | ||
.Instance = SPI2_RX_DMA_INSTANCE, \ | ||
.request = SPI2_RX_DMA_REQUEST, \ | ||
.dma_irq = SPI2_RX_DMA_IRQ, \ | ||
} | ||
#endif /* SPI2_RX_DMA_CONFIG */ | ||
#endif /* BSP_SPI2_RX_USING_DMA */ | ||
|
||
#ifdef BSP_USING_SPI3 | ||
#ifndef SPI3_BUS_CONFIG | ||
#define SPI3_BUS_CONFIG \ | ||
{ \ | ||
.Instance = SPI3, \ | ||
.bus_name = "spi3", \ | ||
.irq_type = SPI3_IRQn, \ | ||
} | ||
#endif /* SPI3_BUS_CONFIG */ | ||
#endif /* BSP_USING_SPI3 */ | ||
|
||
#ifdef BSP_SPI3_TX_USING_DMA | ||
#ifndef SPI3_TX_DMA_CONFIG | ||
#define SPI3_TX_DMA_CONFIG \ | ||
{ \ | ||
.dma_rcc = SPI3_TX_DMA_RCC, \ | ||
.Instance = SPI3_TX_DMA_INSTANCE, \ | ||
.request = SPI3_TX_DMA_REQUEST, \ | ||
.dma_irq = SPI3_TX_DMA_IRQ, \ | ||
} | ||
#endif /* SPI3_TX_DMA_CONFIG */ | ||
#endif /* BSP_SPI3_TX_USING_DMA */ | ||
|
||
#ifdef BSP_SPI3_RX_USING_DMA | ||
#ifndef SPI3_RX_DMA_CONFIG | ||
#define SPI3_RX_DMA_CONFIG \ | ||
{ \ | ||
.dma_rcc = SPI3_RX_DMA_RCC, \ | ||
.Instance = SPI3_RX_DMA_INSTANCE, \ | ||
.request = SPI3_RX_DMA_REQUEST, \ | ||
.dma_irq = SPI3_RX_DMA_IRQ, \ | ||
} | ||
#endif /* SPI3_RX_DMA_CONFIG */ | ||
#endif /* BSP_SPI3_RX_USING_DMA */ | ||
|
||
#ifdef __cplusplus | ||
} | ||
#endif | ||
|
||
#endif /*__SPI_CONFIG_H__ */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,7 @@ | |
* Change Logs: | ||
* Date Author Notes | ||
* 2021-06-01 KyleChan first version | ||
* 2024-08-15 Macro add stm32h5 | ||
*/ | ||
|
||
#include "board.h" | ||
|
@@ -516,7 +517,7 @@ static void uart_isr(struct rt_serial_device *serial) | |
} | ||
#if !defined(SOC_SERIES_STM32L4) && !defined(SOC_SERIES_STM32WL) && !defined(SOC_SERIES_STM32F7) && !defined(SOC_SERIES_STM32F0) \ | ||
&& !defined(SOC_SERIES_STM32L0) && !defined(SOC_SERIES_STM32G0) && !defined(SOC_SERIES_STM32H7) \ | ||
&& !defined(SOC_SERIES_STM32G4) && !defined(SOC_SERIES_STM32MP1) && !defined(SOC_SERIES_STM32WB) | ||
&& !defined(SOC_SERIES_STM32G4) && !defined(SOC_SERIES_STM32MP1) && !defined(SOC_SERIES_STM32WB) && !defined(SOC_SERIES_STM32H5) | ||
if (__HAL_UART_GET_FLAG(&(uart->handle), UART_FLAG_LBD) != RESET) | ||
{ | ||
UART_INSTANCE_CLEAR_FUNCTION(&(uart->handle), UART_FLAG_LBD); | ||
|
@@ -1130,7 +1131,7 @@ static void stm32_dma_config(struct rt_serial_device *serial, rt_ubase_t flag) | |
SET_BIT(RCC->AHBENR, dma_config->dma_rcc); | ||
tmpreg = READ_BIT(RCC->AHBENR, dma_config->dma_rcc); | ||
#elif defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32WL) \ | ||
|| defined(SOC_SERIES_STM32G4)|| defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32WB) | ||
|| defined(SOC_SERIES_STM32G4)|| defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32WB) || defined(SOC_SERIES_STM32H5) | ||
/* enable DMA clock && Delay after an RCC peripheral clock enabling*/ | ||
SET_BIT(RCC->AHB1ENR, dma_config->dma_rcc); | ||
tmpreg = READ_BIT(RCC->AHB1ENR, dma_config->dma_rcc); | ||
|
@@ -1140,7 +1141,7 @@ static void stm32_dma_config(struct rt_serial_device *serial, rt_ubase_t flag) | |
tmpreg = READ_BIT(RCC->MP_AHB2ENSETR, dma_config->dma_rcc); | ||
#endif | ||
|
||
#if defined(DMAMUX1) && (defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32WL) || defined(SOC_SERIES_STM32G4) || defined(SOC_SERIES_STM32WB)) | ||
#if defined(DMAMUX1) && (defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32WL) || defined(SOC_SERIES_STM32G4) || defined(SOC_SERIES_STM32WB) || defined(SOC_SERIES_STM32H5)) | ||
/* enable DMAMUX clock for L4+ and G4 */ | ||
__HAL_RCC_DMAMUX1_CLK_ENABLE(); | ||
#elif defined(SOC_SERIES_STM32MP1) | ||
|
@@ -1165,27 +1166,49 @@ static void stm32_dma_config(struct rt_serial_device *serial, rt_ubase_t flag) | |
DMA_Handle->Instance = dma_config->Instance; | ||
DMA_Handle->Init.Channel = dma_config->channel; | ||
#elif defined(SOC_SERIES_STM32L4) || defined(SOC_SERIES_STM32WL) || defined(SOC_SERIES_STM32G0) || defined(SOC_SERIES_STM32G4) || defined(SOC_SERIES_STM32WB)\ | ||
|| defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32MP1) | ||
|| defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32MP1) || defined(SOC_SERIES_STM32H5) | ||
DMA_Handle->Instance = dma_config->Instance; | ||
DMA_Handle->Init.Request = dma_config->request; | ||
#endif | ||
#if defined(SOC_SERIES_STM32H5) | ||
DMA_Handle->Init.BlkHWRequest = DMA_BREQ_SINGLE_BURST; | ||
#else | ||
DMA_Handle->Init.PeriphInc = DMA_PINC_DISABLE; | ||
DMA_Handle->Init.MemInc = DMA_MINC_ENABLE; | ||
DMA_Handle->Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE; | ||
DMA_Handle->Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; | ||
|
||
#endif | ||
if (RT_DEVICE_FLAG_DMA_RX == flag) | ||
{ | ||
DMA_Handle->Init.Direction = DMA_PERIPH_TO_MEMORY; | ||
#if defined(SOC_SERIES_STM32H5) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 注意格式缩进 |
||
DMA_Handle->Init.SrcInc = DMA_SINC_FIXED; | ||
DMA_Handle->Init.DestInc = DMA_DINC_INCREMENTED; | ||
DMA_Handle->Init.Mode = DMA_PFCTRL; | ||
#elif | ||
DMA_Handle->Init.Mode = DMA_CIRCULAR; | ||
#endif | ||
} | ||
else if (RT_DEVICE_FLAG_DMA_TX == flag) | ||
{ | ||
DMA_Handle->Init.Direction = DMA_MEMORY_TO_PERIPH; | ||
#if defined(SOC_SERIES_STM32H5) | ||
DMA_Handle->Init.SrcInc = DMA_SINC_INCREMENTED; | ||
DMA_Handle->Init.DestInc = DMA_DINC_FIXED; | ||
#endif | ||
DMA_Handle->Init.Mode = DMA_NORMAL; | ||
} | ||
|
||
#if defined(SOC_SERIES_STM32H5) | ||
DMA_Handle->Init.SrcDataWidth = DMA_SRC_DATAWIDTH_BYTE; | ||
DMA_Handle->Init.DestDataWidth = DMA_DEST_DATAWIDTH_BYTE; | ||
DMA_Handle->Init.SrcBurstLength = 1; | ||
DMA_Handle->Init.DestBurstLength = 1; | ||
DMA_Handle->Init.TransferAllocatedPort = DMA_SRC_ALLOCATED_PORT0|DMA_DEST_ALLOCATED_PORT1; | ||
DMA_Handle->Init.TransferEventMode = DMA_TCEM_BLOCK_TRANSFER; | ||
DMA_Handle->Init.Priority = DMA_LOW_PRIORITY_MID_WEIGHT; | ||
#else | ||
DMA_Handle->Init.Priority = DMA_PRIORITY_MEDIUM; | ||
#endif | ||
#if defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32MP1) | ||
DMA_Handle->Init.FIFOMode = DMA_FIFOMODE_DISABLE; | ||
#endif | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,6 +24,7 @@ | |
/* USER CODE BEGIN Includes */ | ||
#include <drv_common.h> | ||
/* USER CODE END Includes */ | ||
DMA_HandleTypeDef handle_GPDMA1_Channel0; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 定义在这里,使用cubemx生成代码后会被覆盖。 |
||
|
||
/* Private typedef -----------------------------------------------------------*/ | ||
/* USER CODE BEGIN TD */ | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.