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

Removed unused EXTI_CALLBACK_HANDLER_COUNT

Browse source
This commit is contained in:
Martin Budden 2016-08-21 08:15:18 +01:00
parent ac4732cd03
commit 4d03791cbc
29 changed files with 68 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main/drivers/system.c
View file

@ -27,25 +27,6 @@
#include "system.h" #include "system.h"
#ifndef EXTI_CALLBACK_HANDLER_COUNT
#define EXTI_CALLBACK_HANDLER_COUNT 1
#endif
extiCallbackHandlerConfig_t extiHandlerConfigs[EXTI_CALLBACK_HANDLER_COUNT];
void registerExtiCallbackHandler(IRQn_Type irqn, extiCallbackHandlerFunc *fn)
{
for (int index = 0; index < EXTI_CALLBACK_HANDLER_COUNT; index++) {
extiCallbackHandlerConfig_t *candidate = &extiHandlerConfigs[index];
if (!candidate->fn) {
candidate->fn = fn;
candidate->irqn = irqn;
return;
}
}
failureMode(FAILURE_DEVELOPER); // EXTI_CALLBACK_HANDLER_COUNT is too low for the amount of handlers required.
}
// cycles per microsecond // cycles per microsecond
static uint32_t usTicks = 0; static uint32_t usTicks = 0;
// current uptime for 1kHz systick timer. will rollover after 49 days. hopefully we won't care. // current uptime for 1kHz systick timer. will rollover after 49 days. hopefully we won't care.

17
src/main/drivers/system.h
View file

@ -48,22 +48,9 @@ void enableGPIOPowerUsageAndNoiseReductions(void);
// current crystal frequency - 8 or 12MHz // current crystal frequency - 8 or 12MHz
extern uint32_t hse_value; extern uint32_t hse_value;
extern uint32_t cachedRccCsrValue;
typedef void extiCallbackHandlerFunc(void); typedef void extiCallbackHandlerFunc(void);
typedef struct extiCallbackHandlerConfig_s { void registerExtiCallbackHandler(IRQn_Type irqn, extiCallbackHandlerFunc *fn);void unregisterExtiCallbackHandler(IRQn_Type irqn, extiCallbackHandlerFunc *fn);
IRQn_Type irqn;
extiCallbackHandlerFunc* fn;
} extiCallbackHandlerConfig_t;
#ifndef EXTI_CALLBACK_HANDLER_COUNT
#define EXTI_CALLBACK_HANDLER_COUNT 1
#endif
extern extiCallbackHandlerConfig_t extiHandlerConfigs[EXTI_CALLBACK_HANDLER_COUNT];
void registerExtiCallbackHandler(IRQn_Type irqn, extiCallbackHandlerFunc *fn);
void unregisterExtiCallbackHandler(IRQn_Type irqn, extiCallbackHandlerFunc *fn);
extern uint32_t cachedRccCsrValue;

2
src/main/drivers/system_stm32f10x.c
View file

@ -17,7 +17,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <string.h>
#include "platform.h" #include "platform.h"
@ -107,7 +106,6 @@ void systemInit(void)
// Init cycle counter // Init cycle counter
cycleCounterInit(); cycleCounterInit();
memset(extiHandlerConfigs, 0x00, sizeof(extiHandlerConfigs));
// SysTick // SysTick
SysTick_Config(SystemCoreClock / 1000); SysTick_Config(SystemCoreClock / 1000);
} }

2
src/main/drivers/system_stm32f30x.c
View file

@ -17,7 +17,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <string.h>
#include "platform.h" #include "platform.h"
@ -100,7 +99,6 @@ void systemInit(void)
// Init cycle counter // Init cycle counter
cycleCounterInit(); cycleCounterInit();
memset(extiHandlerConfigs, 0x00, sizeof(extiHandlerConfigs));
// SysTick // SysTick
SysTick_Config(SystemCoreClock / 1000); SysTick_Config(SystemCoreClock / 1000);
} }

2
src/main/drivers/system_stm32f4xx.c
View file

@ -17,7 +17,6 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <string.h>
#include "platform.h" #include "platform.h"
@ -183,7 +182,6 @@ void systemInit(void)
// Init cycle counter // Init cycle counter
cycleCounterInit(); cycleCounterInit();
memset(extiHandlerConfigs, 0x00, sizeof(extiHandlerConfigs));
// SysTick // SysTick
SysTick_Config(SystemCoreClock / 1000); SysTick_Config(SystemCoreClock / 1000);
} }

1
src/main/target/AIRHEROF3/target.h
View file

@ -30,7 +30,6 @@
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC13 #define MPU_INT_EXTI PC13
#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU INT
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW #define ENSURE_MPU_DATA_READY_IS_LOW

4
src/main/target/ALIENFLIGHTF1/target.h
View file

@ -26,9 +26,9 @@
#define BEEPER PA12 #define BEEPER PA12
#define USE_EXTI #define USE_EXTI
#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready #define MAG_INT_EXTI PC14
//#define DEBUG_MPU_DATA_READY_INTERRUPT
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
//#define DEBUG_MPU_DATA_READY_INTERRUPT
#define GYRO #define GYRO
#define USE_GYRO_MPU6050 #define USE_GYRO_MPU6050

2
src/main/target/ALIENFLIGHTF3/target.h
View file

@ -35,8 +35,6 @@
#define BEEPER PA5 #define BEEPER PA5
#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
#define USE_EXTI #define USE_EXTI
//#define DEBUG_MPU_DATA_READY_INTERRUPT //#define DEBUG_MPU_DATA_READY_INTERRUPT
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL

1
src/main/target/ALIENFLIGHTF4/target.h
View file

@ -35,7 +35,6 @@
// MPU interrupt // MPU interrupt
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC14 #define MPU_INT_EXTI PC14
#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
//#define DEBUG_MPU_DATA_READY_INTERRUPT //#define DEBUG_MPU_DATA_READY_INTERRUPT
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW #define ENSURE_MPU_DATA_READY_IS_LOW

8
src/main/target/BLUEJAYF4/target.h
View file

@ -27,7 +27,6 @@
#define HW_PIN PB2 #define HW_PIN PB2
#define BOARD_HAS_VOLTAGE_DIVIDER #define BOARD_HAS_VOLTAGE_DIVIDER
#define USE_EXTI
#define LED0 PB6 #define LED0 PB6
#define LED1 PB5 #define LED1 PB5
@ -41,10 +40,11 @@
#define INVERTER_USART USART6 #define INVERTER_USART USART6
// MPU6500 interrupt // MPU6500 interrupt
//#define DEBUG_MPU_DATA_READY_INTERRUPT #define USE_EXTI
#define USE_MPU_DATA_READY_SIGNAL
//#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
#define MPU_INT_EXTI PC5 #define MPU_INT_EXTI PC5
#define USE_MPU_DATA_READY_SIGNAL
//#define DEBUG_MPU_DATA_READY_INTERRUPT
#define MPU6500_CS_PIN PC4 #define MPU6500_CS_PIN PC4
#define MPU6500_SPI_INSTANCE SPI1 #define MPU6500_SPI_INSTANCE SPI1

12
src/main/target/COLIBRI/target.h
View file

@ -17,9 +17,6 @@
#pragma once #pragma once
#define PLL_M 16
#define PLL_N 336
#define TARGET_BOARD_IDENTIFIER "COLI" #define TARGET_BOARD_IDENTIFIER "COLI"
#define CONFIG_START_FLASH_ADDRESS (0x08080000) //0x08080000 to 0x080A0000 (FLASH_Sector_8) #define CONFIG_START_FLASH_ADDRESS (0x08080000) //0x08080000 to 0x080A0000 (FLASH_Sector_8)
@ -29,9 +26,14 @@
#define USBD_SERIALNUMBER_STRING "0x8020000" #define USBD_SERIALNUMBER_STRING "0x8020000"
#endif #endif
#define PLL_M 16
#define PLL_N 336
#define LED0 PC14 #define LED0 PC14
#define LED1 PC13 #define LED1 PC13
#define BEEPER PC5 #define BEEPER PC5
#define INVERTER PB2 // PB2 used as inverter select GPIO #define INVERTER PB2 // PB2 used as inverter select GPIO
#define INVERTER_USART USART2 #define INVERTER_USART USART2
@ -50,15 +52,14 @@
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC0 #define MPU_INT_EXTI PC0
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
#define MAG #define MAG
#define USE_MAG_HMC5883 #define USE_MAG_HMC5883
#define MAG_HMC5883_ALIGN CW270_DEG_FLIP #define MAG_HMC5883_ALIGN CW270_DEG_FLIP
#define MAG_INT_EXTI PC1
#define USE_MAG_DATA_READY_SIGNAL #define USE_MAG_DATA_READY_SIGNAL
#define ENSURE_MAG_DATA_READY_IS_HIGH #define ENSURE_MAG_DATA_READY_IS_HIGH
#define MAG_INT_EXTI PC1
#define BARO #define BARO
#define USE_BARO_MS5611 #define USE_BARO_MS5611
@ -118,7 +119,6 @@
#define SENSORS_SET (SENSOR_ACC) #define SENSORS_SET (SENSOR_ACC)
#define LED_STRIP #define LED_STRIP
#define WS2811_PIN PB7 // Shared UART1 #define WS2811_PIN PB7 // Shared UART1
#define WS2811_TIMER TIM4 #define WS2811_TIMER TIM4
#define WS2811_TIMER_CHANNEL TIM_Channel_2 #define WS2811_TIMER_CHANNEL TIM_Channel_2

1
src/main/target/COLIBRI_RACE/target.h
View file

@ -34,7 +34,6 @@
// MPU6500 interrupt // MPU6500 interrupt
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PA5 #define MPU_INT_EXTI PA5
#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW #define ENSURE_MPU_DATA_READY_IS_LOW
//#define DEBUG_MPU_DATA_READY_INTERRUPT //#define DEBUG_MPU_DATA_READY_INTERRUPT

2
src/main/target/DOGE/target.h
View file

@ -115,8 +115,6 @@
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW #define ENSURE_MPU_DATA_READY_IS_LOW
#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
#define LED_STRIP #define LED_STRIP
// tqfp48 pin 16 // tqfp48 pin 16

5
src/main/target/F4BY/target.h
View file

@ -34,10 +34,9 @@
// MPU6000 interrupts // MPU6000 interrupts
#define USE_MPU_DATA_READY_SIGNAL
#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
#define MPU_INT_EXTI PB0
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PB0
#define USE_MPU_DATA_READY_SIGNAL
#define MPU6000_CS_PIN PA4 #define MPU6000_CS_PIN PA4
#define MPU6000_SPI_INSTANCE SPI1 #define MPU6000_SPI_INSTANCE SPI1

1
src/main/target/FURYF3/target.h
View file

@ -29,7 +29,6 @@
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PA3 #define MPU_INT_EXTI PA3
#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU INT, SDCardDetect
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW #define ENSURE_MPU_DATA_READY_IS_LOW

1
src/main/target/FURYF4/target.h
View file

@ -34,7 +34,6 @@
// MPU6000 interrupts // MPU6000 interrupts
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC4 #define MPU_INT_EXTI PC4
#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready (mag disabled)
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define MPU6000_CS_PIN PA4 #define MPU6000_CS_PIN PA4

3
src/main/target/IRCFUSIONF3/target.h
View file

@ -25,9 +25,6 @@
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC13 #define MPU_INT_EXTI PC13
#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready, no MAG
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW #define ENSURE_MPU_DATA_READY_IS_LOW

1
src/main/target/LUX_RACE/target.h
View file

@ -32,7 +32,6 @@
// MPU6500 interrupt // MPU6500 interrupt
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PA5 #define MPU_INT_EXTI PA5
#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
//#define DEBUG_MPU_DATA_READY_INTERRUPT //#define DEBUG_MPU_DATA_READY_INTERRUPT
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW #define ENSURE_MPU_DATA_READY_IS_LOW

1
src/main/target/MICROSCISKY/target.h
View file

@ -32,7 +32,6 @@
#define USE_EXTI #define USE_EXTI
#define MAG_INT_EXTI PC14 #define MAG_INT_EXTI PC14
#define EXTI_CALLBACK_HANDLER_COUNT 3 // MPU data ready, MAG data ready, BMP085 EOC
//#define DEBUG_MPU_DATA_READY_INTERRUPT //#define DEBUG_MPU_DATA_READY_INTERRUPT
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
//#define DEBUG_MAG_DATA_READY_INTERRUPT //#define DEBUG_MAG_DATA_READY_INTERRUPT

1
src/main/target/NAZE/target.h
View file

@ -38,7 +38,6 @@
#define USE_EXTI #define USE_EXTI
#define MAG_INT_EXTI PC14 #define MAG_INT_EXTI PC14
#define EXTI_CALLBACK_HANDLER_COUNT 3 // MPU data ready, MAG data ready, BMP085 EOC
//#define DEBUG_MPU_DATA_READY_INTERRUPT //#define DEBUG_MPU_DATA_READY_INTERRUPT
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
//#define DEBUG_MAG_DATA_READY_INTERRUPT //#define DEBUG_MAG_DATA_READY_INTERRUPT

1
src/main/target/OMNIBUS/target.h
View file

@ -29,7 +29,6 @@
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC13 #define MPU_INT_EXTI PC13
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
#define EXTI15_10_CALLBACK_HANDLER_COUNT 2 // MPU_INT, SDCardDetect #define EXTI15_10_CALLBACK_HANDLER_COUNT 2 // MPU_INT, SDCardDetect
#define MPU6000_SPI_INSTANCE SPI1 #define MPU6000_SPI_INSTANCE SPI1

1
src/main/target/OMNIBUSF4/target.h
View file

@ -49,7 +49,6 @@
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC4 #define MPU_INT_EXTI PC4
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
#define MAG #define MAG
#define USE_MAG_HMC5883 #define USE_MAG_HMC5883

1
src/main/target/REVO/target.h
View file

@ -47,7 +47,6 @@
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC4 #define MPU_INT_EXTI PC4
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
#define MAG #define MAG
#define USE_MAG_HMC5883 #define USE_MAG_HMC5883

1
src/main/target/REVONANO/target.h
View file

@ -57,7 +57,6 @@
#define MPU_INT_EXTI PA15 #define MPU_INT_EXTI PA15
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
//#define ENSURE_MPU_DATA_READY_IS_LOW //#define ENSURE_MPU_DATA_READY_IS_LOW
#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready (mag disabled)
#define USE_VCP #define USE_VCP
#define VBUS_SENSING_PIN PA9 #define VBUS_SENSING_PIN PA9

1
src/main/target/RMDO/target.h
View file

@ -28,7 +28,6 @@
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC13 #define MPU_INT_EXTI PC13
#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready and MAG data ready
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW #define ENSURE_MPU_DATA_READY_IS_LOW
//#define USE_MAG_DATA_READY_SIGNAL // XXX Do RMDO has onboard mag??? //#define USE_MAG_DATA_READY_SIGNAL // XXX Do RMDO has onboard mag???

1
src/main/target/SPARKY2/target.h
View file

@ -39,7 +39,6 @@
// MPU9250 interrupt // MPU9250 interrupt
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC5 #define MPU_INT_EXTI PC5
#define EXTI_CALLBACK_HANDLER_COUNT 1 // MPU data ready
//#define DEBUG_MPU_DATA_READY_INTERRUPT //#define DEBUG_MPU_DATA_READY_INTERRUPT
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW #define ENSURE_MPU_DATA_READY_IS_LOW

1
src/main/target/SPRACINGF3/target.h
View file

@ -28,7 +28,6 @@
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC13 #define MPU_INT_EXTI PC13
#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready and MAG data ready
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW #define ENSURE_MPU_DATA_READY_IS_LOW

5
src/main/target/VRRACE/target.h
View file

@ -42,10 +42,9 @@
#define GYRO_MPU6500_ALIGN CW270_DEG #define GYRO_MPU6500_ALIGN CW270_DEG
// MPU6500 interrupts // MPU6500 interrupts
#define USE_MPU_DATA_READY_SIGNAL
#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
#define MPU_INT_EXTI PD10
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PD10
#define USE_MPU_DATA_READY_SIGNAL
/* /*
#define BARO #define BARO

5
src/main/target/X_RACERSPI/target.h
View file

@ -42,10 +42,9 @@
#define ACC_MPU6000_ALIGN CW270_DEG #define ACC_MPU6000_ALIGN CW270_DEG
// MPU6000 interrupts // MPU6000 interrupts
#define USE_MPU_DATA_READY_SIGNAL
#define EXTI_CALLBACK_HANDLER_COUNT 2 // MPU data ready (mag disabled)
#define MPU_INT_EXTI PC13
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC13
#define USE_MPU_DATA_READY_SIGNAL
#define USE_FLASHFS #define USE_FLASHFS