Merge pull request #9327 from jeromecoutant/PR_IFDEF

STM32: replace missing #ifdef DEVICE_xxx
pull/9357/head
Martin Kojtal 2019-01-11 14:07:28 +00:00 committed by GitHub
commit d92febe700
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions

View File

@ -23,7 +23,7 @@
extern "C" { extern "C" {
#endif #endif
#ifdef DEVICE_CAN #if DEVICE_CAN
#if defined(CAN3_BASE) #if defined(CAN3_BASE)

View File

@ -57,7 +57,7 @@ struct spi_s {
PinName pin_mosi; PinName pin_mosi;
PinName pin_sclk; PinName pin_sclk;
PinName pin_ssel; PinName pin_ssel;
#ifdef DEVICE_SPI_ASYNCH #if DEVICE_SPI_ASYNCH
uint32_t event; uint32_t event;
uint8_t transfer_type; uint8_t transfer_type;
#endif #endif

View File

@ -36,7 +36,7 @@
extern "C" { extern "C" {
#endif #endif
#ifdef DEVICE_I2C #if DEVICE_I2C
#define I2C_IP_VERSION_V2 #define I2C_IP_VERSION_V2

View File

@ -31,7 +31,7 @@
#include "pwmout_api.h" #include "pwmout_api.h"
#include "pwmout_device.h" #include "pwmout_device.h"
#ifdef DEVICE_PWMOUT #if DEVICE_PWMOUT
const pwm_apb_map_t pwm_apb_map_table[] = { const pwm_apb_map_t pwm_apb_map_table[] = {
#if defined(TIM2_BASE) #if defined(TIM2_BASE)

View File

@ -36,7 +36,7 @@
extern "C" { extern "C" {
#endif #endif
#ifdef DEVICE_PWMOUT #if DEVICE_PWMOUT
typedef enum { typedef enum {
PWMOUT_ON_APB1 = 0, PWMOUT_ON_APB1 = 0,

View File

@ -57,7 +57,7 @@ struct spi_s {
PinName pin_mosi; PinName pin_mosi;
PinName pin_sclk; PinName pin_sclk;
PinName pin_ssel; PinName pin_ssel;
#ifdef DEVICE_SPI_ASYNCH #if DEVICE_SPI_ASYNCH
uint32_t event; uint32_t event;
uint8_t transfer_type; uint8_t transfer_type;
#endif #endif