From 9568ccf9d193dc60cf3f07b18cab9079e5fcbb18 Mon Sep 17 00:00:00 2001 From: gdisirio 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 --- 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 +++- 15 files changed, 54 insertions(+), 24 deletions(-) (limited to 'testhal') 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