riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu: Fix array-bounds errors with GCC 6

Browse Source
This commit is contained in:
Joakim Nohlgård 2016-07-05 13:41:20 +02:00
parent 58baba58bb
commit 0a847d53a7
5 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cpu/nrf51/periph/adc.c
View File

@ -25,15 +25,11 @@
#include "periph/adc.h" #include "periph/adc.h"
#include "periph_conf.h" #include "periph_conf.h"
#ifdef ADC_CONFIG
/** /**
* @brief Load the ADC configuration * @brief Load the ADC configuration
* @{
*/ */
#ifdef ADC_CONFIG
static const uint8_t adc_config[] = ADC_CONFIG; static const uint8_t adc_config[] = ADC_CONFIG;
#else
static const uint8_t adc_config[] = {};
#endif
/** /**
* @brief Lock to prevent concurrency issues when used from different threads * @brief Lock to prevent concurrency issues when used from different threads
@ -91,3 +87,7 @@ int adc_sample(adc_t line, adc_res_t res)
return val; return val;
} }
#else
typedef int dont_be_pedantic;
#endif /* ADC_CONFIG */

12
cpu/stm32_common/periph/dac.c
View File

@ -25,7 +25,7 @@
#include "periph_conf.h" #include "periph_conf.h"
/* only compile this, if the CPU has a DAC */ /* only compile this, if the CPU has a DAC */
#if defined(DAC) || defined(DAC1) #if (defined(DAC) || defined(DAC1)) && defined(DAC_CONFIG)
#ifdef DAC2 #ifdef DAC2
#define _DAC(line) (dac_config[line].dac ? DAC2 : DAC1) #define _DAC(line) (dac_config[line].dac ? DAC2 : DAC1)
@ -34,15 +34,9 @@
#endif #endif
/** /**
* @brief Get the DAC configuration from the board (if configured) * @brief Get the DAC configuration from the board config
* @{
*/ */
#ifdef DAC_CONFIG
static const dac_conf_t dac_config[] = DAC_CONFIG; static const dac_conf_t dac_config[] = DAC_CONFIG;
#else
static const dac_conf_t dac_config[] = {};
#endif
/** @} */
int8_t dac_init(dac_t line) int8_t dac_init(dac_t line)
{ {
@ -96,4 +90,6 @@ void dac_poweroff(dac_t line)
DAC->CR &= ~(1 << (16 * dac_config[line].chan)); DAC->CR &= ~(1 << (16 * dac_config[line].chan));
} }
#else
typedef int dont_be_pedantic;
#endif /* DAC */ #endif /* DAC */

11
cpu/stm32f0/periph/adc.c
View File

@ -22,6 +22,8 @@
#include "mutex.h" #include "mutex.h"
#include "periph/adc.h" #include "periph/adc.h"
#ifdef ADC_CONFIG
/** /**
* @brief Maximum allowed ADC clock speed * @brief Maximum allowed ADC clock speed
*/ */
@ -29,13 +31,8 @@
/** /**
* @brief Load the ADC configuration * @brief Load the ADC configuration
* @{
*/ */
#ifdef ADC_CONFIG
static const adc_conf_t adc_config[] = ADC_CONFIG; static const adc_conf_t adc_config[] = ADC_CONFIG;
#else
static const adc_conf_t adc_config[] = {};
#endif
/** /**
* @brief Allocate locks for all three available ADC device * @brief Allocate locks for all three available ADC device
@ -105,3 +102,7 @@ int adc_sample(adc_t line, adc_res_t res)
return sample; return sample;
} }
#else
typedef int dont_be_pedantic;
#endif /* ADC_CONFIG */

11
cpu/stm32f1/periph/adc.c
View File

@ -24,6 +24,8 @@
#include "periph/adc.h" #include "periph/adc.h"
#include "periph_conf.h" #include "periph_conf.h"
#ifdef ADC_CONFIG
/** /**
* @brief Maximum allowed ADC clock speed * @brief Maximum allowed ADC clock speed
*/ */
@ -31,13 +33,8 @@
/** /**
* @brief Load the ADC configuration * @brief Load the ADC configuration
* @{
*/ */
#ifdef ADC_CONFIG
static const adc_conf_t adc_config[] = ADC_CONFIG; static const adc_conf_t adc_config[] = ADC_CONFIG;
#else
static const adc_conf_t adc_config[] = {};
#endif
/** /**
* @brief Allocate locks for all three available ADC devices * @brief Allocate locks for all three available ADC devices
@ -159,3 +156,7 @@ int adc_sample(adc_t line, adc_res_t res)
return sample; return sample;
} }
#else
typedef int dont_be_pedantic;
#endif /* ADC_CONFIG */

11
cpu/stm32f4/periph/adc.c
View File

@ -23,6 +23,8 @@
#include "periph/adc.h" #include "periph/adc.h"
#include "periph_conf.h" #include "periph_conf.h"
#ifdef ADC_CONFIG
/** /**
* @brief Maximum allowed ADC clock speed * @brief Maximum allowed ADC clock speed
*/ */
@ -30,13 +32,8 @@
/** /**
* @brief Load the ADC configuration * @brief Load the ADC configuration
* @{
*/ */
#ifdef ADC_CONFIG
static const adc_conf_t adc_config[] = ADC_CONFIG; static const adc_conf_t adc_config[] = ADC_CONFIG;
#else
static const adc_conf_t adc_config[] = {};
#endif
/** /**
* @brief Allocate locks for all three available ADC devices * @brief Allocate locks for all three available ADC devices
@ -124,3 +121,7 @@ int adc_sample(adc_t line, adc_res_t res)
return sample; return sample;
} }
#else
typedef int dont_be_pedantic;
#endif /* ADC_CONFIG */