ARMmbed · 0xc0170 · Jan 7, 2019 · Dec 19, 2018
diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/flash_api.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/flash_api.c
@@ -38,7 +38,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
 
-#ifdef DEVICE_FLASH
+#if DEVICE_FLASH
 #include "flash_api.h"
 #include "flash_data.h"
 #include "mbed_critical.h"

diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/gpio_irq_api.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/gpio_irq_api.c
@@ -43,7 +43,7 @@
 #include "adi_gpio_def.h"
 #include "ADuCM302x_device.h"
 
-#ifdef DEVICE_INTERRUPTIN
+#if DEVICE_INTERRUPTIN
 
 #define MAX_GPIO_LINES    16
 #define MAX_GPIO_PORTS    ADI_GPIO_NUM_PORTS
@@ -327,4 +327,4 @@ void gpio_irq_disable(gpio_irq_t *obj)
     channel_ids[port][pin_num].int_enable = 0;
 }
 
-#endif 	// #ifdef DEVICE_INTERRUPTIN
+#endif 	// #if DEVICE_INTERRUPTIN
diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/sleep.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/sleep.c
@@ -40,7 +40,7 @@
 
 #include "sleep_api.h"
 
-#ifdef DEVICE_SLEEP
+#if DEVICE_SLEEP
 
 #include "adi_pwr.h"
 #include "adi_pwr_def.h"
@@ -218,4 +218,4 @@ void hal_deepsleep(void)
     pADI_CLKG0_CLK->CTL5 = 0;
 }
 
-#endif  // #ifdef DEVICE_SLEEP
+#endif  // #if DEVICE_SLEEP
diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/trng_api.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM302X/TARGET_ADUCM3029/api/trng_api.c
@@ -38,7 +38,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
 
-#if defined(DEVICE_TRNG)
+#if DEVICE_TRNG
 
 #include <stdlib.h>
 #include <drivers/rng/adi_rng.h>

diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api/flash_api.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api/flash_api.c
@@ -38,7 +38,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
 
-#ifdef DEVICE_FLASH
+#if DEVICE_FLASH
 #include "flash_api.h"
 #include "flash_data.h"
 #include "mbed_critical.h"

diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api/gpio_irq_api.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api/gpio_irq_api.c
@@ -42,7 +42,7 @@
 #include "adi_gpio.h"
 #include "adi_gpio_def.h"
 
-#ifdef DEVICE_INTERRUPTIN
+#if DEVICE_INTERRUPTIN
 
 #define MAX_GPIO_LINES    16
 #define MAX_GPIO_PORTS    ADI_GPIO_NUM_PORTS
@@ -326,4 +326,4 @@ void gpio_irq_disable(gpio_irq_t *obj)
     channel_ids[port][pin_num].int_enable = 0;
 }
 
-#endif	// #ifdef DEVICE_INTERRUPTIN
+#endif	// #if DEVICE_INTERRUPTIN
diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api/sleep.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api/sleep.c
@@ -40,7 +40,7 @@
 
 #include "sleep_api.h"
 
-#ifdef DEVICE_SLEEP
+#if DEVICE_SLEEP
 
 #include "adi_pwr.h"
 #include "adi_pwr_def.h"
@@ -253,4 +253,4 @@ void hal_deepsleep(void)
     pADI_CLKG0_CLK->CTL5 = 0;
 }
 
-#endif  // #ifdef DEVICE_SLEEP
+#endif  // #if DEVICE_SLEEP
diff --git a/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api/trng_api.c b/targets/TARGET_Analog_Devices/TARGET_ADUCM4X50/TARGET_ADUCM4050/api/trng_api.c
@@ -38,7 +38,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  ******************************************************************************/
 
-#if defined(DEVICE_TRNG)
+#if DEVICE_TRNG
 
 #include <stdlib.h>
 #include <adi_rng.h>

diff --git a/targets/TARGET_Atmel/TARGET_SAM_CortexM0P/serial_api.c b/targets/TARGET_Atmel/TARGET_SAM_CortexM0P/serial_api.c
@@ -503,7 +503,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
     enable_usart(obj);
 }
 
-#ifdef DEVICE_SERIAL_FC
+#if DEVICE_SERIAL_FC
 
 void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, PinName txflow)
 {

diff --git a/targets/TARGET_Atmel/TARGET_SAM_CortexM4/serial_api.c b/targets/TARGET_Atmel/TARGET_SAM_CortexM4/serial_api.c
@@ -283,7 +283,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
     sysclk_enable_peripheral_clock(clockid);
 }
 
-#ifdef DEVICE_SERIAL_FC
+#if DEVICE_SERIAL_FC
 
 void serial_set_flow_control(serial_t *obj, FlowControl type, PinName rxflow, PinName txflow)
 {
@@ -783,4 +783,4 @@ void serial_rx_abort_asynch(serial_t *obj)
     pSERIAL_S(obj)->actrec = false;
 }
 
-#endif
+#endif
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/PeripheralPins.h b/targets/TARGET_Cypress/TARGET_PSOC6/PeripheralPins.h
@@ -34,28 +34,28 @@ extern const PinMap PinMap_PWM_OUT[];
 #endif
 
 //*** SERIAL ***
-#ifdef DEVICE_SERIAL
+#if DEVICE_SERIAL
 extern const PinMap PinMap_UART_TX[];
 extern const PinMap PinMap_UART_RX[];
 extern const PinMap PinMap_UART_RTS[];
 extern const PinMap PinMap_UART_CTS[];
 #endif
 
 //*** SPI ***
-#ifdef DEVICE_SPI
+#if DEVICE_SPI
 extern const PinMap PinMap_SPI_MOSI[];
 extern const PinMap PinMap_SPI_MISO[];
 extern const PinMap PinMap_SPI_SCLK[];
 extern const PinMap PinMap_SPI_SSEL[];
 #endif
 
 //*** ADC ***
-#ifdef DEVICE_ANALOGIN
+#if DEVICE_ANALOGIN
 extern const PinMap PinMap_ADC[];
 #endif
 
 //*** DAC ***
-#ifdef DEVICE_ANALOGOUT
+#if DEVICE_ANALOGOUT
 extern const PinMap PinMap_DAC[];
 #endif
 

diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/objects.h b/targets/TARGET_Cypress/TARGET_PSOC6/objects.h
@@ -185,7 +185,7 @@ struct pwmout_s {
 };
 #endif // DEVICE_PWMOUT
 
-#ifdef DEVICE_ANALOGIN
+#if DEVICE_ANALOGIN
 #include "cy_sar.h"
 
 struct analogin_s {
@@ -196,7 +196,7 @@ struct analogin_s {
 };
 #endif // DEVICE_ANALOGIN
 
-#ifdef DEVICE_ANALOGOUT
+#if DEVICE_ANALOGOUT
 #include "cy_ctdac.h"
 
 struct dac_s {
@@ -206,7 +206,7 @@ struct dac_s {
 };
 #endif // DEVICE_ANALOGOUT
 
-#ifdef DEVICE_FLASH
+#if DEVICE_FLASH
 struct flash_s {
     /*  nothing to be stored for now */
     void *dummy;

diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/sleep_api.c b/targets/TARGET_Cypress/TARGET_PSOC6/sleep_api.c
@@ -19,7 +19,7 @@
 #include "device.h"
 #include "cy_syspm.h"
 
-#ifdef DEVICE_SLEEP
+#if DEVICE_SLEEP
 
 void hal_sleep(void)
 {

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/trng_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/trng_api.c
@@ -22,7 +22,7 @@
  * Reference: "K66 Sub-Family Reference Manual, Rev. 2", chapter 38
  */
 
-#if defined(DEVICE_TRNG)
+#if DEVICE_TRNG
 
 #include <stdlib.h>
 #include "cmsis.h"

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/trng_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/trng_api.c
@@ -18,7 +18,7 @@
  *
  */
 
-#if defined(DEVICE_TRNG)
+#if DEVICE_TRNG
 
 #include <stdlib.h>
 #include "cmsis.h"

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/trng_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/trng_api.c
@@ -22,7 +22,7 @@
  * Reference: "MKW41Z/31Z/21Z Reference Manual", chapter 43
  */
 
-#if defined(DEVICE_TRNG)
+#if DEVICE_TRNG
 
 #include "fsl_trng.h"
 #include "trng_api.h"

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/trng_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/trng_api.c
@@ -18,7 +18,7 @@
  *
  */
 
-#if defined(DEVICE_TRNG)
+#if DEVICE_TRNG
 
 #include <stdlib.h>
 #include "cmsis.h"

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K24F/trng_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K24F/trng_api.c
@@ -18,7 +18,7 @@
  *
  */
 
-#if defined(DEVICE_TRNG)
+#if DEVICE_TRNG
 
 #include <stdlib.h>
 #include "cmsis.h"

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/mbed_crc_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/mbed_crc_api.c
@@ -18,7 +18,7 @@
 #include "drivers/fsl_crc.h"
 #include "platform/mbed_assert.h"
 
-#ifdef DEVICE_CRC
+#if DEVICE_CRC
 
 static crc_bits_t width;
 static uint32_t final_xor;

diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/trng_api.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/trng_api.c
@@ -22,7 +22,7 @@
  * Reference: "K64 Sub-Family Reference Manual, Rev. 2", chapter 34
  */
 
-#if defined(DEVICE_TRNG)
+#if DEVICE_TRNG
 
 #include <stdlib.h>
 #include "cmsis.h"

diff --git a/targets/TARGET_GigaDevice/TARGET_GD32F30X/PeripheralPins.h b/targets/TARGET_GigaDevice/TARGET_GD32F30X/PeripheralPins.h
@@ -27,12 +27,12 @@ extern const int GD_GPIO_MODE[];
 extern const int GD_GPIO_SPEED[];
 
 /* ADC */
-#ifdef DEVICE_ANALOGIN
+#if DEVICE_ANALOGIN
 extern const PinMap PinMap_ADC[];
 #endif
 
 /* DAC */
-#ifdef DEVICE_ANALOGOUT
+#if DEVICE_ANALOGOUT
 extern const PinMap PinMap_DAC[];
 #endif
 
@@ -48,25 +48,25 @@ extern const PinMap PinMap_PWM[];
 #endif
 
 /* SERIAL */
-#ifdef DEVICE_SERIAL
+#if DEVICE_SERIAL
 extern const PinMap PinMap_UART_TX[];
 extern const PinMap PinMap_UART_RX[];
-#ifdef DEVICE_SERIAL_FC
+#if DEVICE_SERIAL_FC
 extern const PinMap PinMap_UART_RTS[];
 extern const PinMap PinMap_UART_CTS[];
 #endif
 #endif
 
 /* SPI */
-#ifdef DEVICE_SPI
+#if DEVICE_SPI
 extern const PinMap PinMap_SPI_MOSI[];
 extern const PinMap PinMap_SPI_MISO[];
 extern const PinMap PinMap_SPI_SCLK[];
 extern const PinMap PinMap_SPI_SSEL[];
 #endif
 
 /* CAN */
-#ifdef DEVICE_CAN
+#if DEVICE_CAN
 extern const PinMap PinMap_CAN_RD[];
 extern const PinMap PinMap_CAN_TD[];
 #endif

diff --git a/targets/TARGET_Maxim/TARGET_MAX32600/rtc_api.c b/targets/TARGET_Maxim/TARGET_MAX32600/rtc_api.c
@@ -74,7 +74,7 @@ void rtc_init(void)
     MXC_PWRSEQ->reg0 |= MXC_F_PWRSEQ_REG0_PWR_RTCEN_RUN;
 
     // Prepare interrupt handlers
-#ifdef DEVICE_LPTICKER
+#if DEVICE_LPTICKER
     NVIC_SetVector(RTC0_IRQn, (uint32_t)lp_ticker_irq_handler);
     NVIC_EnableIRQ(RTC0_IRQn);
 #endif

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/analogin_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/TARGET_MCU_NRF51822_UNIFIED/analogin_api.c
@@ -19,7 +19,7 @@
 #include "pinmap.h"
 #include "nrf_drv_adc.h"
 
-#ifdef DEVICE_ANALOGIN
+#if DEVICE_ANALOGIN
 
 
 #define ADC_10BIT_RANGE  0x3FF

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/flash_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/flash_api.c
@@ -36,7 +36,7 @@
  *
  */
 
-#if (defined(DEVICE_FLASH) && defined(DEVICE_LPTICKER))
+#if DEVICE_FLASH && DEVICE_LPTICKER
 
 #include "hal/flash_api.h"
 #include "hal/lp_ticker_api.h"

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/i2c_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/i2c_api.c
@@ -39,7 +39,7 @@
 
 #include "i2c_api.h"
 
-#if (defined(DEVICE_I2C) && defined(DEVICE_LPTICKER))
+#if DEVICE_I2C && DEVICE_LPTICKER
 
 #include "mbed_assert.h"
 #include "mbed_error.h"

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/trng_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/trng_api.c
@@ -36,7 +36,7 @@
  *
  */
 
-#if (defined(DEVICE_TRNG) && defined(DEVICE_LPTICKER))
+#if DEVICE_TRNG && DEVICE_LPTICKER
 
 #include "hal/trng_api.h"
 #include "hal/lp_ticker_api.h"

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/system_nrf52.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/device/system_nrf52.c
@@ -222,7 +222,7 @@ void SystemInit(void)
      *
      * The ITM has to be initialized before the SoftDevice which weren't guaranteed using the normal API.
      */
-#if defined (DEVICE_ITM)
+#if DEVICE_ITM
         /* Enable SWO trace functionality */
         CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
         NRF_CLOCK->TRACECONFIG |= CLOCK_TRACECONFIG_TRACEMUX_Serial << CLOCK_TRACECONFIG_TRACEMUX_Pos;

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/system_nrf52840.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/device/system_nrf52840.c
@@ -198,7 +198,7 @@ void SystemInit(void)
      *
      * The ITM has to be initialized before the SoftDevice which weren't guaranteed using the normal API.
      */
-#if defined (DEVICE_ITM)
+#if DEVICE_ITM
         /* Enable SWO trace functionality */
         CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
         NRF_CLOCK->TRACECONFIG |= CLOCK_TRACECONFIG_TRACEMUX_Serial << CLOCK_TRACECONFIG_TRACEMUX_Pos;

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/analogin_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/analogin_api.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#ifdef DEVICE_ANALOGIN
+#if DEVICE_ANALOGIN
 #include "hal/analogin_api.h"
 
 #include "pinmap.h"

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/flash_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/flash_api.c
@@ -36,7 +36,7 @@
  *
  */
 
-#if (defined(DEVICE_FLASH) && defined(DEVICE_LPTICKER))
+#if DEVICE_FLASH && DEVICE_LPTICKER
 
 #include "hal/flash_api.h"
 #include "hal/lp_ticker_api.h"

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/i2c_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/i2c_api.c
@@ -36,7 +36,7 @@
  *
  */
 
-#if (defined(DEVICE_I2C) && defined(DEVICE_LPTICKER))
+#if DEVICE_I2C && DEVICE_LPTICKER
 /* I2C
  *
  * This HAL implementation uses the nrf_drv_twi.h API primarily but switches to TWI for the

diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/itm_api.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/itm_api.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#if defined(DEVICE_ITM)
+#if DEVICE_ITM
 
 #include "hal/itm_api.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ @@
      *
      */
-    #if (defined(DEVICE_I2C) && defined(DEVICE_LPTICKER))
+    #if DEVICE_I2C && DEVICE_LPTICKER
     /* I2C
      *
      * This HAL implementation uses the nrf_drv_twi.h API primarily but switches to TWI for the
@@ Expand Down @@