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

[H7] Enable EXTI (#8192)

Browse source 
[H7] Enable EXTI
This commit is contained in:
Michael Keller 2019-05-10 09:26:29 +12:00 • committed by GitHub
commit cbe83e4865
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/main/drivers/exti.c
View file

@ -36,13 +36,13 @@ typedef struct {
extiChannelRec_t extiChannelRecs[16]; extiChannelRec_t extiChannelRecs[16];
// IRQ gouping, same on 103, 303, 40x and 7xx. // IRQ gouping, same on F103, F303, F40x, F7xx and H7xx.
#define EXTI_IRQ_GROUPS 7 #define EXTI_IRQ_GROUPS 7
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
static const uint8_t extiGroups[16] = { 0, 1, 2, 3, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6 }; static const uint8_t extiGroups[16] = { 0, 1, 2, 3, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6 };
static uint8_t extiGroupPriority[EXTI_IRQ_GROUPS]; static uint8_t extiGroupPriority[EXTI_IRQ_GROUPS];
#if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) #if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
static const uint8_t extiGroupIRQn[EXTI_IRQ_GROUPS] = { static const uint8_t extiGroupIRQn[EXTI_IRQ_GROUPS] = {
EXTI0_IRQn, EXTI0_IRQn,
EXTI1_IRQn, EXTI1_IRQn,
@ -67,7 +67,7 @@ static const uint8_t extiGroupIRQn[EXTI_IRQ_GROUPS] = {
#endif #endif
static uint32_t triggerLookupTable[] = { static uint32_t triggerLookupTable[] = {
#if defined(STM32F7) #if defined(STM32F7) || defined(STM32H7)
[EXTI_TRIGGER_RISING] = GPIO_MODE_IT_RISING, [EXTI_TRIGGER_RISING] = GPIO_MODE_IT_RISING,
[EXTI_TRIGGER_FALLING] = GPIO_MODE_IT_FALLING, [EXTI_TRIGGER_FALLING] = GPIO_MODE_IT_FALLING,
[EXTI_TRIGGER_BOTH] = GPIO_MODE_IT_RISING_FALLING [EXTI_TRIGGER_BOTH] = GPIO_MODE_IT_RISING_FALLING
@ -80,6 +80,15 @@ static uint32_t triggerLookupTable[] = {
#endif #endif
}; };
// Absorb the difference in IMR and PR assignments to registers
#if defined(STM32H7)
#define EXTI_REG_IMR (EXTI_D1->IMR1)
#define EXTI_REG_PR (EXTI_D1->PR1)
#else
#define EXTI_REG_IMR (EXTI->IMR)
#define EXTI_REG_PR (EXTI->PR)
#endif
void EXTIInit(void) void EXTIInit(void)
{ {
@ -119,7 +128,7 @@ void EXTIConfig(IO_t io, extiCallbackRec_t *cb, int irqPriority, ioConfig_t conf
extiChannelRec_t *rec = &extiChannelRecs[chIdx]; extiChannelRec_t *rec = &extiChannelRecs[chIdx];
rec->handler = cb; rec->handler = cb;
#if defined(STM32F7) #if defined(STM32F7) || defined(STM32H7)
GPIO_InitTypeDef init = { GPIO_InitTypeDef init = {
.Pin = IO_Pin(io), .Pin = IO_Pin(io),
.Mode = GPIO_MODE_INPUT | IO_CONFIG_GET_MODE(config) | triggerLookupTable[trigger], .Mode = GPIO_MODE_INPUT | IO_CONFIG_GET_MODE(config) | triggerLookupTable[trigger],
@ -176,33 +185,45 @@ void EXTIRelease(IO_t io)
// don't forget to match cleanup with config // don't forget to match cleanup with config
EXTIEnable(io, false); EXTIEnable(io, false);
int chIdx; const int chIdx = IO_GPIOPinIdx(io);
chIdx = IO_GPIOPinIdx(io);
if (chIdx < 0) if (chIdx < 0) {
return; return;
}
extiChannelRec_t *rec = &extiChannelRecs[chIdx]; extiChannelRec_t *rec = &extiChannelRecs[chIdx];
rec->handler = NULL; rec->handler = NULL;
} }
void EXTIEnable(IO_t io, bool enable) void EXTIEnable(IO_t io, bool enable)
{ {
#if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) #if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
uint32_t extiLine = IO_EXTI_Line(io); uint32_t extiLine = IO_EXTI_Line(io);
if (!extiLine)
if (!extiLine) {
return; return;
if (enable) }
EXTI->IMR |= extiLine;
else if (enable) {
EXTI->IMR &= ~extiLine; EXTI_REG_IMR |= extiLine;
} else {
EXTI_REG_IMR &= ~extiLine;
}
#elif defined(STM32F303xC) #elif defined(STM32F303xC)
int extiLine = IO_EXTI_Line(io); int extiLine = IO_EXTI_Line(io);
if (extiLine < 0)
if (extiLine < 0) {
return; return;
}
// assume extiLine < 32 (valid for all EXTI pins) // assume extiLine < 32 (valid for all EXTI pins)
if (enable)
EXTI->IMR |= 1 << extiLine; if (enable) {
else EXTI_REG_IMR |= 1 << extiLine;
EXTI->IMR &= ~(1 << extiLine); } else {
EXTI_REG_IMR &= ~(1 << extiLine);
}
#else #else
# error "Unknown CPU" # error "Unknown CPU"
#endif #endif
@ -210,13 +231,13 @@ void EXTIEnable(IO_t io, bool enable)
void EXTI_IRQHandler(void) void EXTI_IRQHandler(void)
{ {
uint32_t exti_active = EXTI->IMR & EXTI->PR; uint32_t exti_active = EXTI_REG_IMR & EXTI_REG_PR;
while (exti_active) { while (exti_active) {
unsigned idx = 31 - __builtin_clz(exti_active); unsigned idx = 31 - __builtin_clz(exti_active);
uint32_t mask = 1 << idx; uint32_t mask = 1 << idx;
extiChannelRecs[idx].handler->fn(extiChannelRecs[idx].handler); extiChannelRecs[idx].handler->fn(extiChannelRecs[idx].handler);
EXTI->PR = mask; // clear pending mask (by writing 1) EXTI_REG_PR = mask; // clear pending mask (by writing 1)
exti_active &= ~mask; exti_active &= ~mask;
} }
} }
@ -231,7 +252,7 @@ void EXTI_IRQHandler(void)
_EXTI_IRQ_HANDLER(EXTI0_IRQHandler); _EXTI_IRQ_HANDLER(EXTI0_IRQHandler);
_EXTI_IRQ_HANDLER(EXTI1_IRQHandler); _EXTI_IRQ_HANDLER(EXTI1_IRQHandler);
#if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) #if defined(STM32F1) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
_EXTI_IRQ_HANDLER(EXTI2_IRQHandler); _EXTI_IRQ_HANDLER(EXTI2_IRQHandler);
#elif defined(STM32F3) #elif defined(STM32F3)
_EXTI_IRQ_HANDLER(EXTI2_TS_IRQHandler); _EXTI_IRQ_HANDLER(EXTI2_TS_IRQHandler);

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

@ -116,7 +116,7 @@
# warning "Unknown TARGET" # warning "Unknown TARGET"
#endif #endif
#if defined(STM32F7) #if defined(STM32F7) || defined(STM32H7)
// Expose these for EXTIConfig // Expose these for EXTIConfig
#define IO_CONFIG_GET_MODE(cfg) (((cfg) >> 0) & 0x03) #define IO_CONFIG_GET_MODE(cfg) (((cfg) >> 0) & 0x03)
#define IO_CONFIG_GET_SPEED(cfg) (((cfg) >> 2) & 0x03) #define IO_CONFIG_GET_SPEED(cfg) (((cfg) >> 2) & 0x03)