Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-12 11:00:02 +03:00
Code Issues Wiki Activity

REFACTOR: Adding DMA_FIRST_HANDLER (#14474)

Browse source 
* REFACTOR: Adding DMA_FIRST_HANDLER

 dmaIdentifier_e could be zero based in the future and align to descriptor array index directly

Also removed unused DMA_INPUT_STRING

* Removed magic number following code rabbit review
This commit is contained in:
Jay Blackman 2025-06-26 07:34:29 +10:00 • committed by GitHub
parent 35dd55f6d7
commit 0d0c00f341
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/cli/cli.c
View file

@ -5323,7 +5323,7 @@ static void showDma(void)
cliPrintLine("Currently active DMA:");
cliRepeat('-', 20);
#endif
for (int i = 1; i <= DMA_LAST_HANDLER; i++) {
for (int i = DMA_FIRST_HANDLER; i <= DMA_LAST_HANDLER; i++) {
const resourceOwner_t *owner = dmaGetOwner(i);
cliPrintf(DMA_OUTPUT_STRING, DMA_DEVICE_NO(i), DMA_DEVICE_INDEX(i));

2
src/main/drivers/dma.h
View file

@ -58,7 +58,7 @@ typedef struct dmaChannelDescriptor_s {
#endif
} dmaChannelDescriptor_t;
#define DMA_IDENTIFIER_TO_INDEX(x) ((x) - 1)
#define DMA_IDENTIFIER_TO_INDEX(x) ((x) - DMA_FIRST_HANDLER)
void dmaMuxEnable(dmaIdentifier_e identifier, uint32_t dmaMuxId);

4
src/platform/APM32/include/platform/dma.h
View file

@ -32,7 +32,8 @@
typedef enum {
DMA_NONE = 0,
DMA1_ST0_HANDLER = 1,
DMA_FIRST_HANDLER = 1,
DMA1_ST0_HANDLER = DMA_FIRST_HANDLER,
DMA1_ST1_HANDLER,
DMA1_ST2_HANDLER,
DMA1_ST3_HANDLER,
@ -55,7 +56,6 @@ typedef enum {
#define DMA_DEVICE_INDEX(x) ((((x)-1) % 8))
#define DMA_OUTPUT_INDEX 0
#define DMA_OUTPUT_STRING "DMA%d Stream %d:"
#define DMA_INPUT_STRING "DMA%d_ST%d"
#define DEFINE_DMA_CHANNEL(d, s, f) { \
.dma = d, \

4
src/platform/AT32/include/platform/dma.h
View file

@ -32,7 +32,8 @@
typedef enum {
DMA_NONE = 0,
DMA1_CH1_HANDLER = 1,
DMA_FIRST_HANDLER = 1,
DMA1_CH1_HANDLER = DMA_FIRST_HANDLER,
DMA1_CH2_HANDLER,
DMA1_CH3_HANDLER,
DMA1_CH4_HANDLER,
@ -56,7 +57,6 @@ uint32_t dmaGetChannel(const uint8_t channel);
#define DMA_OUTPUT_INDEX 0
#define DMA_OUTPUT_STRING "DMA%d Channel %d:"
#define DMA_INPUT_STRING "DMA%d_CH%d"
#define DEFINE_DMA_CHANNEL(d, c, f) { \
.dma = d, \

1
src/platform/SIMULATOR/include/platform/dma.h
View file

@ -23,5 +23,6 @@
typedef enum {
DMA_NONE = 0,
DMA_FIRST_HANDLER = DMA_NONE,
DMA_LAST_HANDLER = DMA_NONE
} dmaIdentifier_e;

11
src/platform/STM32/include/platform/dma.h
View file

@ -40,7 +40,8 @@
typedef enum {
DMA_NONE = 0,
DMA1_ST0_HANDLER = 1,
DMA_FIRST_HANDLER = 1,
DMA1_ST0_HANDLER = DMA_FIRST_HANDLER,
DMA1_ST1_HANDLER,
DMA1_ST2_HANDLER,
DMA1_ST3_HANDLER,
@ -63,7 +64,6 @@ typedef enum {
#define DMA_DEVICE_INDEX(x) ((((x)-1) % 8))
#define DMA_OUTPUT_INDEX 0
#define DMA_OUTPUT_STRING "DMA%d Stream %d:"
#define DMA_INPUT_STRING "DMA%d_ST%d"
#define DEFINE_DMA_CHANNEL(d, s, f) { \
.dma = d, \
@ -101,7 +101,8 @@ void dmaMuxEnable(dmaIdentifier_e identifier, uint32_t dmaMuxId);
typedef enum {
DMA_NONE = 0,
DMA1_CH1_HANDLER = 1,
DMA_FIRST_HANDLER = 1,
DMA1_CH1_HANDLER = DMA_FIRST_HANDLER,
DMA1_CH2_HANDLER,
DMA1_CH3_HANDLER,
DMA1_CH4_HANDLER,
@ -129,7 +130,8 @@ uint32_t dmaGetChannel(const uint8_t channel);
typedef enum {
DMA_NONE = 0,
DMA1_CH1_HANDLER = 1,
DMA_FIRST_HANDLER = 1,
DMA1_CH1_HANDLER = DMA_FIRST_HANDLER,
DMA1_CH2_HANDLER,
DMA1_CH3_HANDLER,
DMA1_CH4_HANDLER,
@ -146,7 +148,6 @@ typedef enum {
#define DMA_OUTPUT_INDEX 0
#define DMA_OUTPUT_STRING "DMA%d Channel %d:"
#define DMA_INPUT_STRING "DMA%d_CH%d"
#define DEFINE_DMA_CHANNEL(d, c, f) { \
.dma = d, \