From 9568ccf9d193dc60cf3f07b18cab9079e5fcbb18 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Thu, 15 Aug 2013 08:17:27 +0000
Subject: Upgrades to STM32 GPT, ICU and PWM drivers.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6150 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
demos/ARMCM3-STM32F100-DISCOVERY/main.c | 1 +
demos/ARMCM3-STM32L152-DISCOVERY/main.c | 1 +
demos/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c | 1 +
demos/ARMCM4-STM32F407-DISCOVERY/main.c | 1 +
os/hal/platforms/STM32/TIMv1/gpt_lld.c | 42 +++++++++++++++-------------
os/hal/platforms/STM32/TIMv1/gpt_lld.h | 10 +++++--
os/hal/platforms/STM32/TIMv1/icu_lld.c | 13 +++++----
os/hal/platforms/STM32/TIMv1/icu_lld.h | 6 ++++
os/hal/platforms/STM32/TIMv1/pwm_lld.c | 30 ++++++++++----------
os/hal/platforms/STM32/TIMv1/pwm_lld.h | 12 ++++++--
os/hal/platforms/STM32/TIMv1/stm32_tim.h | 11 ++++++++
readme.txt | 5 ++++
testhal/STM32F0xx/IRQ_STORM/main.c | 6 ++--
testhal/STM32F0xx/PWM-ICU/main.c | 4 ++-
testhal/STM32F1xx/GPT/main.c | 6 ++--
testhal/STM32F1xx/IRQ_STORM/main.c | 6 ++--
testhal/STM32F1xx/PWM-ICU/main.c | 4 ++-
testhal/STM32F30x/IRQ_STORM/main.c | 6 ++--
testhal/STM32F30x/PWM-ICU/main.c | 4 ++-
testhal/STM32F37x/IRQ_STORM/main.c | 6 ++--
testhal/STM32F37x/PWM-ICU/main.c | 4 ++-
testhal/STM32F4xx/GPT/main.c | 6 ++--
testhal/STM32F4xx/IRQ_STORM/main.c | 6 ++--
testhal/STM32F4xx/IRQ_STORM_FPU/main.c | 6 ++--
testhal/STM32F4xx/PWM-ICU/main.c | 4 ++-
testhal/STM32L1xx/IRQ_STORM/main.c | 6 ++--
testhal/STM32L1xx/PWM-ICU/main.c | 4 ++-
27 files changed, 143 insertions(+), 68 deletions(-)
diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/main.c b/demos/ARMCM3-STM32F100-DISCOVERY/main.c
index 2fe5596a9..e4550ca6f 100644
--- a/demos/ARMCM3-STM32F100-DISCOVERY/main.c
+++ b/demos/ARMCM3-STM32F100-DISCOVERY/main.c
@@ -71,6 +71,7 @@ static PWMConfig pwmcfg = {
},
/* HW dependent part.*/
0,
+ 0,
#if STM32_PWM_USE_ADVANCED
0
#endif
diff --git a/demos/ARMCM3-STM32L152-DISCOVERY/main.c b/demos/ARMCM3-STM32L152-DISCOVERY/main.c
index 12e810a22..f1d7a10f7 100644
--- a/demos/ARMCM3-STM32L152-DISCOVERY/main.c
+++ b/demos/ARMCM3-STM32L152-DISCOVERY/main.c
@@ -73,6 +73,7 @@ static PWMConfig pwmcfg = {
{PWM_OUTPUT_DISABLED, NULL}
},
/* HW dependent part.*/
+ 0,
0
};
diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c
index 77bf7196b..ac16f2ccd 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-MEMS/main.c
@@ -117,6 +117,7 @@ static const PWMConfig pwmcfg = {
{PWM_OUTPUT_ACTIVE_HIGH, NULL}
},
/* HW dependent part.*/
+ 0,
0
};
diff --git a/demos/ARMCM4-STM32F407-DISCOVERY/main.c b/demos/ARMCM4-STM32F407-DISCOVERY/main.c
index 1bd9e6b0c..7db00000b 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY/main.c
+++ b/demos/ARMCM4-STM32F407-DISCOVERY/main.c
@@ -70,6 +70,7 @@ static PWMConfig pwmcfg = {
{PWM_OUTPUT_ACTIVE_HIGH, NULL}
},
/* HW dependent part.*/
+ 0,
0
};
diff --git a/os/hal/platforms/STM32/TIMv1/gpt_lld.c b/os/hal/platforms/STM32/TIMv1/gpt_lld.c
index 4d669be18..c3d228045 100644
--- a/os/hal/platforms/STM32/TIMv1/gpt_lld.c
+++ b/os/hal/platforms/STM32/TIMv1/gpt_lld.c
@@ -606,10 +606,12 @@ void gpt_lld_start(GPTDriver *gptp) {
"gpt_lld_start(), #1", "invalid frequency");
/* Timer configuration.*/
- gptp->tim->CR1 = 0; /* Initially stopped. */
- gptp->tim->CR2 = STM32_TIM_CR2_CCDS; /* DMA on UE (if any). */
- gptp->tim->PSC = psc; /* Prescaler value. */
- gptp->tim->DIER = 0;
+ gptp->tim->CR1 = 0; /* Initially stopped. */
+ gptp->tim->CR2 = STM32_TIM_CR2_CCDS; /* DMA on UE (if any). */
+ gptp->tim->PSC = psc; /* Prescaler value. */
+ gptp->tim->DIER = gptp->config->dier & /* DMA-related DIER bits. */
+ STM32_TIM_DIER_IRQ_MASK;
+ gptp->tim->SR = 0; /* Clear pending IRQs. */
}
/**
@@ -622,9 +624,9 @@ void gpt_lld_start(GPTDriver *gptp) {
void gpt_lld_stop(GPTDriver *gptp) {
if (gptp->state == GPT_READY) {
- gptp->tim->CR1 = 0; /* Timer disabled. */
- gptp->tim->DIER = 0; /* All IRQs disabled. */
- gptp->tim->SR = 0; /* Clear eventual pending IRQs. */
+ gptp->tim->CR1 = 0; /* Timer disabled. */
+ gptp->tim->DIER = 0; /* All IRQs disabled. */
+ gptp->tim->SR = 0; /* Clear pending IRQs. */
#if STM32_GPT_USE_TIM1
if (&GPTD1 == gptp) {
@@ -711,16 +713,16 @@ void gpt_lld_stop(GPTDriver *gptp) {
*/
void gpt_lld_start_timer(GPTDriver *gptp, gptcnt_t interval) {
- gptp->tim->ARR = interval - 1; /* Time constant. */
- gptp->tim->EGR = STM32_TIM_EGR_UG; /* Update event. */
- gptp->tim->CNT = 0; /* Reset counter. */
+ gptp->tim->ARR = (uint32_t)(interval - 1); /* Time constant. */
+ gptp->tim->EGR = STM32_TIM_EGR_UG; /* Update event. */
+ gptp->tim->CNT = 0; /* Reset counter. */
/* NOTE: After generating the UG event it takes several clock cycles before
SR bit 0 goes to 1. This is because the clearing of CNT has been inserted
before the clearing of SR, to give it some time.*/
- gptp->tim->SR = 0; /* Clear pending IRQs (if any). */
- gptp->tim->DIER = STM32_TIM_DIER_UIE; /* Update Event IRQ enabled. */
- gptp->tim->CR1 = STM32_TIM_CR1_URS | STM32_TIM_CR1_CEN;
+ gptp->tim->SR = 0; /* Clear pending IRQs. */
+ gptp->tim->DIER |= STM32_TIM_DIER_UIE; /* Update Event IRQ enabled.*/
+ gptp->tim->CR1 = STM32_TIM_CR1_URS | STM32_TIM_CR1_CEN;
}
/**
@@ -732,9 +734,11 @@ void gpt_lld_start_timer(GPTDriver *gptp, gptcnt_t interval) {
*/
void gpt_lld_stop_timer(GPTDriver *gptp) {
- gptp->tim->CR1 = 0; /* Initially stopped. */
- gptp->tim->SR = 0; /* Clear pending IRQs (if any). */
- gptp->tim->DIER = 0; /* Interrupts disabled. */
+ gptp->tim->CR1 = 0; /* Initially stopped. */
+ gptp->tim->SR = 0; /* Clear pending IRQs. */
+
+ /* All interrupts disabled.*/
+ gptp->tim->DIER &= ~STM32_TIM_DIER_IRQ_MASK;
}
/**
@@ -750,9 +754,9 @@ void gpt_lld_stop_timer(GPTDriver *gptp) {
*/
void gpt_lld_polled_delay(GPTDriver *gptp, gptcnt_t interval) {
- gptp->tim->ARR = interval - 1; /* Time constant. */
- gptp->tim->EGR = STM32_TIM_EGR_UG; /* Update event. */
- gptp->tim->SR = 0; /* Clear pending IRQs (if any). */
+ gptp->tim->ARR = (uint32_t)(interval - 1); /* Time constant. */
+ gptp->tim->EGR = STM32_TIM_EGR_UG; /* Update event. */
+ gptp->tim->SR = 0; /* Clear pending IRQs. */
gptp->tim->CR1 = STM32_TIM_CR1_OPM | STM32_TIM_CR1_URS | STM32_TIM_CR1_CEN;
while (!(gptp->tim->SR & STM32_TIM_SR_UIF))
;
diff --git a/os/hal/platforms/STM32/TIMv1/gpt_lld.h b/os/hal/platforms/STM32/TIMv1/gpt_lld.h
index 0c63a6489..daec6a8a1 100644
--- a/os/hal/platforms/STM32/TIMv1/gpt_lld.h
+++ b/os/hal/platforms/STM32/TIMv1/gpt_lld.h
@@ -367,7 +367,7 @@ typedef uint32_t gptfreq_t;
/**
* @brief GPT counter type.
*/
-typedef uint16_t gptcnt_t;
+typedef uint32_t gptcnt_t;
/**
* @brief Driver configuration structure.
@@ -386,6 +386,12 @@ typedef struct {
*/
gptcallback_t callback;
/* End of the mandatory fields.*/
+ /**
+ * @brief TIM CR2 register initialization data.
+ * @note The value of this field should normally be equal to zero.
+ * @note Only the DMA-related bits can be specified in this field.
+ */
+ uint32_t dier;
} GPTConfig;
/**
@@ -432,7 +438,7 @@ struct GPTDriver {
* @notapi
*/
#define gpt_lld_change_interval(gptp, interval) \
- ((gptp)->tim->ARR = (uint16_t)((interval) - 1))
+ ((gptp)->tim->ARR = (uint32_t)((interval) - 1))
/*===========================================================================*/
/* External declarations. */
diff --git a/os/hal/platforms/STM32/TIMv1/icu_lld.c b/os/hal/platforms/STM32/TIMv1/icu_lld.c
index ad838d903..5cf734771 100644
--- a/os/hal/platforms/STM32/TIMv1/icu_lld.c
+++ b/os/hal/platforms/STM32/TIMv1/icu_lld.c
@@ -112,7 +112,7 @@ static void icu_lld_serve_interrupt(ICUDriver *icup) {
uint16_t sr;
sr = icup->tim->SR;
- sr &= icup->tim->DIER;
+ sr &= icup->tim->DIER & STM32_TIM_DIER_IRQ_MASK;
icup->tim->SR = ~sr;
if (icup->config->channel == ICU_CHANNEL_1) {
if ((sr & STM32_TIM_SR_CC1IF) != 0)
@@ -468,7 +468,8 @@ void icu_lld_start(ICUDriver *icup) {
else {
/* Driver re-configuration scenario, it must be stopped first.*/
icup->tim->CR1 = 0; /* Timer disabled. */
- icup->tim->DIER = 0; /* All IRQs disabled. */
+ icup->tim->DIER = icup->config->dier &/* DMA-related DIER settings. */
+ ~STM32_TIM_DIER_IRQ_MASK;
icup->tim->SR = 0; /* Clear eventual pending IRQs. */
icup->tim->CCR[0] = 0; /* Comparator 1 disabled. */
icup->tim->CCR[1] = 0; /* Comparator 2 disabled. */
@@ -631,9 +632,11 @@ void icu_lld_enable(ICUDriver *icup) {
*/
void icu_lld_disable(ICUDriver *icup) {
- icup->tim->CR1 = 0; /* Initially stopped. */
- icup->tim->SR = 0; /* Clear pending IRQs (if any). */
- icup->tim->DIER = 0; /* Interrupts disabled. */
+ icup->tim->CR1 = 0; /* Initially stopped. */
+ icup->tim->SR = 0; /* Clear pending IRQs (if any). */
+
+ /* All interrupts disabled.*/
+ icup->tim->DIER &= ~STM32_TIM_DIER_IRQ_MASK;
}
#endif /* HAL_USE_ICU */
diff --git a/os/hal/platforms/STM32/TIMv1/icu_lld.h b/os/hal/platforms/STM32/TIMv1/icu_lld.h
index ad6ddffe5..ddf727715 100644
--- a/os/hal/platforms/STM32/TIMv1/icu_lld.h
+++ b/os/hal/platforms/STM32/TIMv1/icu_lld.h
@@ -291,6 +291,12 @@ typedef struct {
* @note Only inputs TIMx 1 and 2 are supported.
*/
icuchannel_t channel;
+ /**
+ * @brief TIM CR2 register initialization data.
+ * @note The value of this field should normally be equal to zero.
+ * @note Only the DMA-related bits can be specified in this field.
+ */
+ uint32_t dier;
} ICUConfig;
/**
diff --git a/os/hal/platforms/STM32/TIMv1/pwm_lld.c b/os/hal/platforms/STM32/TIMv1/pwm_lld.c
index 97114ac79..223c7428b 100644
--- a/os/hal/platforms/STM32/TIMv1/pwm_lld.c
+++ b/os/hal/platforms/STM32/TIMv1/pwm_lld.c
@@ -113,7 +113,7 @@ static void pwm_lld_serve_interrupt(PWMDriver *pwmp) {
uint16_t sr;
sr = pwmp->tim->SR;
- sr &= pwmp->tim->DIER;
+ sr &= pwmp->tim->DIER & STM32_TIM_DIER_IRQ_MASK;
pwmp->tim->SR = ~sr;
if ((sr & STM32_TIM_SR_CC1IF) != 0)
pwmp->config->channels[0].callback(pwmp);
@@ -170,9 +170,8 @@ CH_IRQ_HANDLER(STM32_TIM1_CC_HANDLER) {
CH_IRQ_PROLOGUE();
- sr = STM32_TIM1->SR & STM32_TIM1->DIER;
- STM32_TIM1->SR = ~(STM32_TIM_SR_CC1IF | STM32_TIM_SR_CC2IF |
- STM32_TIM_SR_CC3IF | STM32_TIM_SR_CC4IF);
+ sr = STM32_TIM1->SR & STM32_TIM1->DIER & STM32_TIM_DIER_IRQ_MASK;
+ STM32_TIM1->SR = ~sr;
if ((sr & STM32_TIM_SR_CC1IF) != 0)
PWMD1.config->channels[0].callback(&PWMD1);
if ((sr & STM32_TIM_SR_CC2IF) != 0)
@@ -300,9 +299,8 @@ CH_IRQ_HANDLER(STM32_TIM8_CC_HANDLER) {
CH_IRQ_PROLOGUE();
- sr = STM32_TIM8->SR & STM32_TIM8->DIER;
- STM32_TIM8->SR = ~(STM32_TIM_SR_CC1IF | STM32_TIM_SR_CC2IF |
- STM32_TIM_SR_CC3IF | STM32_TIM_SR_CC4IF);
+ sr = STM32_TIM8->SR & STM32_TIM8->DIER & STM32_TIM_DIER_IRQ_MASK;
+ STM32_TIM8->SR = ~sr;
if ((sr & STM32_TIM_SR_CC1IF) != 0)
PWMD8.config->channels[0].callback(&PWMD8);
if ((sr & STM32_TIM_SR_CC2IF) != 0)
@@ -483,7 +481,8 @@ void pwm_lld_start(PWMDriver *pwmp) {
else {
/* Driver re-configuration scenario, it must be stopped first.*/
pwmp->tim->CR1 = 0; /* Timer disabled. */
- pwmp->tim->DIER = 0; /* All IRQs disabled. */
+ pwmp->tim->DIER = pwmp->config->dier &/* DMA-related DIER settings. */
+ ~STM32_TIM_DIER_IRQ_MASK;
pwmp->tim->SR = 0; /* Clear eventual pending IRQs. */
pwmp->tim->CCR[0] = 0; /* Comparator 1 disabled. */
pwmp->tim->CCR[1] = 0; /* Comparator 2 disabled. */
@@ -572,19 +571,20 @@ void pwm_lld_start(PWMDriver *pwmp) {
}
#endif /* STM32_PWM_USE_ADVANCED*/
- pwmp->tim->CCER = ccer;
- pwmp->tim->EGR = STM32_TIM_EGR_UG; /* Update event. */
- pwmp->tim->DIER = pwmp->config->callback == NULL ? 0 : STM32_TIM_DIER_UIE;
- pwmp->tim->SR = 0; /* Clear pending IRQs. */
+ pwmp->tim->CCER = ccer;
+ pwmp->tim->EGR = STM32_TIM_EGR_UG; /* Update event. */
+ pwmp->tim->DIER |= pwmp->config->callback == NULL ? 0 : STM32_TIM_DIER_UIE;
+ pwmp->tim->SR = 0; /* Clear pending IRQs. */
#if STM32_PWM_USE_TIM1 || STM32_PWM_USE_TIM8
#if STM32_PWM_USE_ADVANCED
- pwmp->tim->BDTR = pwmp->config->bdtr | STM32_TIM_BDTR_MOE;
+ pwmp->tim->BDTR = pwmp->config->bdtr | STM32_TIM_BDTR_MOE;
#else
- pwmp->tim->BDTR = STM32_TIM_BDTR_MOE;
+ pwmp->tim->BDTR = STM32_TIM_BDTR_MOE;
#endif
#endif
/* Timer configured and started.*/
- pwmp->tim->CR1 = STM32_TIM_CR1_ARPE | STM32_TIM_CR1_URS | STM32_TIM_CR1_CEN;
+ pwmp->tim->CR1 = STM32_TIM_CR1_ARPE | STM32_TIM_CR1_URS |
+ STM32_TIM_CR1_CEN;
}
/**
diff --git a/os/hal/platforms/STM32/TIMv1/pwm_lld.h b/os/hal/platforms/STM32/TIMv1/pwm_lld.h
index 0ef6abbca..687cbf7be 100644
--- a/os/hal/platforms/STM32/TIMv1/pwm_lld.h
+++ b/os/hal/platforms/STM32/TIMv1/pwm_lld.h
@@ -345,14 +345,20 @@ typedef struct {
* @brief TIM CR2 register initialization data.
* @note The value of this field should normally be equal to zero.
*/
- uint16_t cr2;
+ uint32_t cr2;
#if STM32_PWM_USE_ADVANCED || defined(__DOXYGEN__)
/**
* @brief TIM BDTR (break & dead-time) register initialization data.
* @note The value of this field should normally be equal to zero.
*/ \
- uint16_t bdtr;
-#endif
+ uint32_t bdtr;
+#endif
+ /**
+ * @brief TIM CR2 register initialization data.
+ * @note The value of this field should normally be equal to zero.
+ * @note Only the DMA-related bits can be specified in this field.
+ */
+ uint32_t dier;
} PWMConfig;
/**
diff --git a/os/hal/platforms/STM32/TIMv1/stm32_tim.h b/os/hal/platforms/STM32/TIMv1/stm32_tim.h
index 9c33d7b25..12fc718bf 100644
--- a/os/hal/platforms/STM32/TIMv1/stm32_tim.h
+++ b/os/hal/platforms/STM32/TIMv1/stm32_tim.h
@@ -121,6 +121,17 @@
#define STM32_TIM_DIER_CC4DE (1U << 12)
#define STM32_TIM_DIER_COMDE (1U << 13)
#define STM32_TIM_DIER_TDE (1U << 14)
+
+#define STM32_TIM_DIER_IRQ_MASK (STM32_TIM_DIER_UIE | \
+ STM32_TIM_DIER_CC1IE | \
+ STM32_TIM_DIER_CC2IE | \
+ STM32_TIM_DIER_CC3IE | \
+ STM32_TIM_DIER_CC4IE | \
+ STM32_TIM_DIER_COMIE | \
+ STM32_TIM_DIER_TIE | \
+ STM32_TIM_DIER_BIE | \
+ STM32_TIM_DIER_UDE)
+
/** @} */
/**
diff --git a/readme.txt b/readme.txt
index a5d35f765..f2d94fa2c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -112,6 +112,9 @@
(backported to 2.6.0).
- FIX: Fixed MS2ST() and US2ST() macros error (bug #415)(backported to 2.6.0,
2.4.4, 2.2.10, NilRTOS).
+- NEW: Added initializer for the DIER register to the STM32 GPT, ICU and
+ PWM drivers.
+- NEW: Added support for 32bits counters to the STM32 GPT driver.
- NEW: Added support for STM32F4xx backup RAM.
- NEW: Added port support for SCP560B64.
- NEW: Added DAC driver high level files and low level files templates.
@@ -120,6 +123,8 @@
- NEW: SPI driver for SPC560Pxx, SPC563Mxx, SPC564Axx, SPC56ELAxx, SPC560Dxx.
- NEW: Support for SPC560Dxx devices.
- NEW: DMA-MUX support for SPC5xx devices.
+- CHANGE: Moved the STM32 GPT, ICU and PWM low level drivers under
+ ./os/hal/platform/STM32/TIMv1. Updated all the impacted project files.
*** 2.5.2 ***
- FIX: Fixed lwipthread.h should explicitly include lwip/opts.h (bug #414).
diff --git a/testhal/STM32F0xx/IRQ_STORM/main.c b/testhal/STM32F0xx/IRQ_STORM/main.c
index fd74a54c1..4a11fcad8 100644
--- a/testhal/STM32F0xx/IRQ_STORM/main.c
+++ b/testhal/STM32F0xx/IRQ_STORM/main.c
@@ -147,7 +147,8 @@ static void gpt3cb(GPTDriver *gptp) {
*/
static const GPTConfig gpt2cfg = {
1000000, /* 1MHz timer clock.*/
- gpt2cb /* Timer callback.*/
+ gpt2cb, /* Timer callback.*/
+ 0
};
/*
@@ -155,7 +156,8 @@ static const GPTConfig gpt2cfg = {
*/
static const GPTConfig gpt3cfg = {
1000000, /* 1MHz timer clock.*/
- gpt3cb /* Timer callback.*/
+ gpt3cb, /* Timer callback.*/
+ 0
};
diff --git a/testhal/STM32F0xx/PWM-ICU/main.c b/testhal/STM32F0xx/PWM-ICU/main.c
index de6191c01..9de2c2eea 100644
--- a/testhal/STM32F0xx/PWM-ICU/main.c
+++ b/testhal/STM32F0xx/PWM-ICU/main.c
@@ -40,6 +40,7 @@ static PWMConfig pwmcfg = {
{PWM_OUTPUT_DISABLED, NULL}
},
0,
+ 0
};
icucnt_t last_width, last_period;
@@ -67,7 +68,8 @@ static ICUConfig icucfg = {
icuwidthcb,
icuperiodcb,
icuoverflowcb,
- ICU_CHANNEL_1
+ ICU_CHANNEL_1,
+ 0
};
/*
diff --git a/testhal/STM32F1xx/GPT/main.c b/testhal/STM32F1xx/GPT/main.c
index f14ffd941..d247980e3 100644
--- a/testhal/STM32F1xx/GPT/main.c
+++ b/testhal/STM32F1xx/GPT/main.c
@@ -43,7 +43,8 @@ static void gpt2cb(GPTDriver *gptp) {
*/
static const GPTConfig gpt1cfg = {
10000, /* 10kHz timer clock.*/
- gpt1cb /* Timer callback.*/
+ gpt1cb, /* Timer callback.*/
+ 0
};
/*
@@ -51,7 +52,8 @@ static const GPTConfig gpt1cfg = {
*/
static const GPTConfig gpt2cfg = {
10000, /* 10kHz timer clock.*/
- gpt2cb /* Timer callback.*/
+ gpt2cb, /* Timer callback.*/
+ 0
};
/*
diff --git a/testhal/STM32F1xx/IRQ_STORM/main.c b/testhal/STM32F1xx/IRQ_STORM/main.c
index 8961668b0..a029e02dc 100644
--- a/testhal/STM32F1xx/IRQ_STORM/main.c
+++ b/testhal/STM32F1xx/IRQ_STORM/main.c
@@ -147,7 +147,8 @@ static void gpt2cb(GPTDriver *gptp) {
*/
static const GPTConfig gpt1cfg = {
1000000, /* 1MHz timer clock.*/
- gpt1cb /* Timer callback.*/
+ gpt1cb, /* Timer callback.*/
+ 0
};
/*
@@ -155,7 +156,8 @@ static const GPTConfig gpt1cfg = {
*/
static const GPTConfig gpt2cfg = {
1000000, /* 1MHz timer clock.*/
- gpt2cb /* Timer callback.*/
+ gpt2cb, /* Timer callback.*/
+ 0
};
diff --git a/testhal/STM32F1xx/PWM-ICU/main.c b/testhal/STM32F1xx/PWM-ICU/main.c
index a2ba2a12d..eecd5b2ad 100644
--- a/testhal/STM32F1xx/PWM-ICU/main.c
+++ b/testhal/STM32F1xx/PWM-ICU/main.c
@@ -40,6 +40,7 @@ static PWMConfig pwmcfg = {
{PWM_OUTPUT_DISABLED, NULL}
},
0,
+ 0,
#if STM32_PWM_USE_ADVANCED
0
#endif
@@ -63,7 +64,8 @@ static ICUConfig icucfg = {
icuwidthcb,
icuperiodcb,
NULL,
- ICU_CHANNEL_1
+ ICU_CHANNEL_1,
+ 0
};
/*
diff --git a/testhal/STM32F30x/IRQ_STORM/main.c b/testhal/STM32F30x/IRQ_STORM/main.c
index 2487373ca..554faa6fb 100644
--- a/testhal/STM32F30x/IRQ_STORM/main.c
+++ b/testhal/STM32F30x/IRQ_STORM/main.c
@@ -147,7 +147,8 @@ static void gpt3cb(GPTDriver *gptp) {
*/
static const GPTConfig gpt2cfg = {
1000000, /* 1MHz timer clock.*/
- gpt2cb /* Timer callback.*/
+ gpt2cb, /* Timer callback.*/
+ 0
};
/*
@@ -155,7 +156,8 @@ static const GPTConfig gpt2cfg = {
*/
static const GPTConfig gpt3cfg = {
1000000, /* 1MHz timer clock.*/
- gpt3cb /* Timer callback.*/
+ gpt3cb, /* Timer callback.*/
+ 0
};
diff --git a/testhal/STM32F30x/PWM-ICU/main.c b/testhal/STM32F30x/PWM-ICU/main.c
index 01215fdda..4d7c3afd0 100644
--- a/testhal/STM32F30x/PWM-ICU/main.c
+++ b/testhal/STM32F30x/PWM-ICU/main.c
@@ -40,6 +40,7 @@ static PWMConfig pwmcfg = {
{PWM_OUTPUT_DISABLED, NULL}
},
0,
+ 0
};
icucnt_t last_width, last_period;
@@ -62,7 +63,8 @@ static ICUConfig icucfg = {
icuwidthcb,
icuperiodcb,
NULL,
- ICU_CHANNEL_1
+ ICU_CHANNEL_1,
+ 0
};
/*
diff --git a/testhal/STM32F37x/IRQ_STORM/main.c b/testhal/STM32F37x/IRQ_STORM/main.c
index 7a630450b..59e32f8df 100644
--- a/testhal/STM32F37x/IRQ_STORM/main.c
+++ b/testhal/STM32F37x/IRQ_STORM/main.c
@@ -147,7 +147,8 @@ static void gpt3cb(GPTDriver *gptp) {
*/
static const GPTConfig gpt2cfg = {
1000000, /* 1MHz timer clock.*/
- gpt2cb /* Timer callback.*/
+ gpt2cb, /* Timer callback.*/
+ 0
};
/*
@@ -155,7 +156,8 @@ static const GPTConfig gpt2cfg = {
*/
static const GPTConfig gpt3cfg = {
1000000, /* 1MHz timer clock.*/
- gpt3cb /* Timer callback.*/
+ gpt3cb, /* Timer callback.*/
+ 0
};
diff --git a/testhal/STM32F37x/PWM-ICU/main.c b/testhal/STM32F37x/PWM-ICU/main.c
index 603b891f8..ccc877f3f 100644
--- a/testhal/STM32F37x/PWM-ICU/main.c
+++ b/testhal/STM32F37x/PWM-ICU/main.c
@@ -40,6 +40,7 @@ static PWMConfig pwmcfg = {
{PWM_OUTPUT_DISABLED, NULL}
},
0,
+ 0
};
icucnt_t last_width, last_period;
@@ -62,7 +63,8 @@ static ICUConfig icucfg = {
icuwidthcb,
icuperiodcb,
NULL,
- ICU_CHANNEL_1
+ ICU_CHANNEL_1,
+ 0
};
/*
diff --git a/testhal/STM32F4xx/GPT/main.c b/testhal/STM32F4xx/GPT/main.c
index 4b0031dc3..a95d5fe81 100644
--- a/testhal/STM32F4xx/GPT/main.c
+++ b/testhal/STM32F4xx/GPT/main.c
@@ -43,7 +43,8 @@ static void gpt3cb(GPTDriver *gptp) {
*/
static const GPTConfig gpt2cfg = {
10000, /* 10kHz timer clock.*/
- gpt2cb /* Timer callback.*/
+ gpt2cb, /* Timer callback.*/
+ 0
};
/*
@@ -51,7 +52,8 @@ static const GPTConfig gpt2cfg = {
*/
static const GPTConfig gpt3cfg = {
10000, /* 10kHz timer clock.*/
- gpt3cb /* Timer callback.*/
+ gpt3cb, /* Timer callback.*/
+ 0
};
/*
diff --git a/testhal/STM32F4xx/IRQ_STORM/main.c b/testhal/STM32F4xx/IRQ_STORM/main.c
index 905af44fe..ddda52359 100644
--- a/testhal/STM32F4xx/IRQ_STORM/main.c
+++ b/testhal/STM32F4xx/IRQ_STORM/main.c
@@ -147,7 +147,8 @@ static void gpt3cb(GPTDriver *gptp) {
*/
static const GPTConfig gpt2cfg = {
1000000, /* 1MHz timer clock.*/
- gpt2cb /* Timer callback.*/
+ gpt2cb, /* Timer callback.*/
+ 0
};
/*
@@ -155,7 +156,8 @@ static const GPTConfig gpt2cfg = {
*/
static const GPTConfig gpt3cfg = {
1000000, /* 1MHz timer clock.*/
- gpt3cb /* Timer callback.*/
+ gpt3cb, /* Timer callback.*/
+ 0
};
diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/main.c b/testhal/STM32F4xx/IRQ_STORM_FPU/main.c
index ad72cc0b9..d1c5c7bb1 100644
--- a/testhal/STM32F4xx/IRQ_STORM_FPU/main.c
+++ b/testhal/STM32F4xx/IRQ_STORM_FPU/main.c
@@ -127,7 +127,8 @@ static void gpt3cb(GPTDriver *gptp) {
*/
static const GPTConfig gpt2cfg = {
1000000, /* 1MHz timer clock.*/
- gpt2cb /* Timer callback.*/
+ gpt2cb, /* Timer callback.*/
+ 0
};
/*
@@ -135,7 +136,8 @@ static const GPTConfig gpt2cfg = {
*/
static const GPTConfig gpt3cfg = {
1000000, /* 1MHz timer clock.*/
- gpt3cb /* Timer callback.*/
+ gpt3cb, /* Timer callback.*/
+ 0
};
diff --git a/testhal/STM32F4xx/PWM-ICU/main.c b/testhal/STM32F4xx/PWM-ICU/main.c
index dc6287209..55e9736d2 100644
--- a/testhal/STM32F4xx/PWM-ICU/main.c
+++ b/testhal/STM32F4xx/PWM-ICU/main.c
@@ -40,6 +40,7 @@ static PWMConfig pwmcfg = {
{PWM_OUTPUT_DISABLED, NULL}
},
0,
+ 0
};
icucnt_t last_width, last_period;
@@ -62,7 +63,8 @@ static ICUConfig icucfg = {
icuwidthcb,
icuperiodcb,
NULL,
- ICU_CHANNEL_1
+ ICU_CHANNEL_1,
+ 0
};
/*
diff --git a/testhal/STM32L1xx/IRQ_STORM/main.c b/testhal/STM32L1xx/IRQ_STORM/main.c
index 88d575b18..ac3909c0c 100644
--- a/testhal/STM32L1xx/IRQ_STORM/main.c
+++ b/testhal/STM32L1xx/IRQ_STORM/main.c
@@ -147,7 +147,8 @@ static void gpt3cb(GPTDriver *gptp) {
*/
static const GPTConfig gpt2cfg = {
1000000, /* 1MHz timer clock.*/
- gpt2cb /* Timer callback.*/
+ gpt2cb, /* Timer callback.*/
+ 0
};
/*
@@ -155,7 +156,8 @@ static const GPTConfig gpt2cfg = {
*/
static const GPTConfig gpt3cfg = {
1000000, /* 1MHz timer clock.*/
- gpt3cb /* Timer callback.*/
+ gpt3cb, /* Timer callback.*/
+ 0
};
diff --git a/testhal/STM32L1xx/PWM-ICU/main.c b/testhal/STM32L1xx/PWM-ICU/main.c
index 3ef877831..9e5955e4a 100644
--- a/testhal/STM32L1xx/PWM-ICU/main.c
+++ b/testhal/STM32L1xx/PWM-ICU/main.c
@@ -40,6 +40,7 @@ static PWMConfig pwmcfg = {
{PWM_OUTPUT_DISABLED, NULL}
},
0,
+ 0
};
icucnt_t last_width, last_period;
@@ -62,7 +63,8 @@ static ICUConfig icucfg = {
icuwidthcb,
icuperiodcb,
NULL,
- ICU_CHANNEL_1
+ ICU_CHANNEL_1,
+ 0
};
/*
--
cgit v1.2.3