aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2016-03-04 12:39:27 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2016-03-04 12:39:27 +0000
commit81b60dab38bad8213a7167d016eb49318ad7df16 (patch)
treed9479df9b2aea1afdd36d5c1bf3876ccc483e255
parentb02624bbb051454f767f56ce4c91c815172f64be (diff)
downloadChibiOS-81b60dab38bad8213a7167d016eb49318ad7df16.tar.gz
ChibiOS-81b60dab38bad8213a7167d016eb49318ad7df16.tar.bz2
ChibiOS-81b60dab38bad8213a7167d016eb49318ad7df16.zip
Fixed obsolete structure initializers in DAC demos.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9009 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--testhal/STM32/STM32F3xx/DAC/main.c20
-rw-r--r--testhal/STM32/STM32F4xx/DAC/main.c20
-rw-r--r--testhal/STM32/STM32F4xx/DAC_DUAL/main.c20
-rw-r--r--testhal/STM32/STM32L1xx/DAC/main.c20
4 files changed, 40 insertions, 40 deletions
diff --git a/testhal/STM32/STM32F3xx/DAC/main.c b/testhal/STM32/STM32F3xx/DAC/main.c
index ca2410a93..00b8afc5d 100644
--- a/testhal/STM32/STM32F3xx/DAC/main.c
+++ b/testhal/STM32/STM32F3xx/DAC/main.c
@@ -88,25 +88,25 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) {
}
static const DACConfig dac1cfg1 = {
- init: 2047U,
- datamode: DAC_DHRM_12BIT_RIGHT
+ .init = 2047U,
+ .datamode = DAC_DHRM_12BIT_RIGHT
};
static const DACConversionGroup dacgrpcfg1 = {
- num_channels: 1U,
- end_cb: end_cb1,
- error_cb: error_cb1,
- trigger: DAC_TRG(0)
+ .num_channels = 1U,
+ .end_cb = end_cb1,
+ .error_cb = error_cb1,
+ .trigger = DAC_TRG(0)
};
/*
* GPT6 configuration.
*/
static const GPTConfig gpt6cfg1 = {
- frequency: 1000000U,
- callback: NULL,
- cr2: TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */
- dier: 0U
+ .frequency = 1000000U,
+ .callback = NULL,
+ .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */
+ .dier = 0U
};
/*
diff --git a/testhal/STM32/STM32F4xx/DAC/main.c b/testhal/STM32/STM32F4xx/DAC/main.c
index 67049ff37..1e8ce9a3f 100644
--- a/testhal/STM32/STM32F4xx/DAC/main.c
+++ b/testhal/STM32/STM32F4xx/DAC/main.c
@@ -88,25 +88,25 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) {
}
static const DACConfig dac1cfg1 = {
- init: 2047U,
- datamode: DAC_DHRM_12BIT_RIGHT
+ .init = 2047U,
+ .datamode = DAC_DHRM_12BIT_RIGHT
};
static const DACConversionGroup dacgrpcfg1 = {
- num_channels: 1U,
- end_cb: end_cb1,
- error_cb: error_cb1,
- trigger: DAC_TRG(0)
+ .num_channels = 1U,
+ .end_cb = end_cb1,
+ .error_cb = error_cb1,
+ .trigger = DAC_TRG(0)
};
/*
* GPT6 configuration.
*/
static const GPTConfig gpt6cfg1 = {
- frequency: 1000000U,
- callback: NULL,
- cr2: TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */
- dier: 0U
+ .frequency = 1000000U,
+ .callback = NULL,
+ .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */
+ .dier = 0U
};
/*
diff --git a/testhal/STM32/STM32F4xx/DAC_DUAL/main.c b/testhal/STM32/STM32F4xx/DAC_DUAL/main.c
index d72cd7ec4..bf90f72a6 100644
--- a/testhal/STM32/STM32F4xx/DAC_DUAL/main.c
+++ b/testhal/STM32/STM32F4xx/DAC_DUAL/main.c
@@ -88,25 +88,25 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) {
}
static const DACConfig dac1cfg1 = {
- init: 2047U,
- datamode: DAC_DHRM_12BIT_RIGHT_DUAL
+ .init = 2047U,
+ .datamode = DAC_DHRM_12BIT_RIGHT_DUAL
};
static const DACConversionGroup dacgrpcfg1 = {
- num_channels: 2U,
- end_cb: end_cb1,
- error_cb: error_cb1,
- trigger: DAC_TRG(0)
+ .num_channels = 2U,
+ .end_cb = end_cb1,
+ .error_cb = error_cb1,
+ .trigger = DAC_TRG(0)
};
/*
* GPT2 configuration.
*/
static const GPTConfig gpt6cfg1 = {
- frequency: 1000000U,
- callback: NULL,
- cr2: TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */
- dier: 0U
+ .frequency = 1000000U,
+ .callback = NULL,
+ .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */
+ .dier = 0U
};
/*
diff --git a/testhal/STM32/STM32L1xx/DAC/main.c b/testhal/STM32/STM32L1xx/DAC/main.c
index 62be88aaf..beb04e574 100644
--- a/testhal/STM32/STM32L1xx/DAC/main.c
+++ b/testhal/STM32/STM32L1xx/DAC/main.c
@@ -88,25 +88,25 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) {
}
static const DACConfig dac1cfg1 = {
- init: 2047U,
- datamode: DAC_DHRM_12BIT_RIGHT
+ .init = 2047U,
+ .datamode = DAC_DHRM_12BIT_RIGHT
};
static const DACConversionGroup dacgrpcfg1 = {
- num_channels: 1U,
- end_cb: end_cb1,
- error_cb: error_cb1,
- trigger: DAC_TRG(0)
+ .num_channels = 1U,
+ .end_cb = end_cb1,
+ .error_cb = error_cb1,
+ .trigger = DAC_TRG(0)
};
/*
* GPT6 configuration.
*/
static const GPTConfig gpt6cfg1 = {
- frequency: 1000000U,
- callback: NULL,
- cr2: TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */
- dier: 0U
+ .frequency = 1000000U,
+ .callback = NULL,
+ .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */
+ .dier = 0U
};
/*