From 1cbe79a373039472ac0748e968dde7e5aa1038ff Mon Sep 17 00:00:00 2001 From: zhuoshuguo Date: Tue, 7 Jun 2016 16:29:37 +0200 Subject: [PATCH] CPU: fix include header guards Fix cpu/lpc2387/include/lpc2387.h --- cpu/atmega2560/include/cpu_conf.h | 6 +++--- cpu/atmega_common/include/cpu.h | 6 +++--- cpu/cc2538/include/cpu_conf.h | 6 +++--- cpu/cortexm_common/include/cmsis_armcc.h | 6 +++--- cpu/cortexm_common/include/cmsis_armcc_V6.h | 6 +++--- cpu/cortexm_common/include/cmsis_gcc.h | 6 +++--- cpu/ezr32wg/include/ezr32wg330f256r60.h | 6 +++--- cpu/k64f/include/cpu_conf.h | 6 +++--- cpu/kinetis_common/include/mcg.h | 8 ++++---- cpu/kw2x/include/cpu_conf.h | 6 +++--- cpu/lpc11u34/include/LPC11Uxx.h | 6 +++--- cpu/lpc11u34/include/cpu_conf.h | 6 +++--- cpu/lpc1768/include/LPC17xx.h | 6 +++--- cpu/lpc1768/include/cpu_conf.h | 6 +++--- cpu/lpc2387/include/cpu.h | 6 +++--- cpu/lpc2387/include/i2c.h | 6 +++--- cpu/lpc2387/include/lpc2387.h | 6 +++--- cpu/saml21/include/cpu_conf.h | 6 +++--- 18 files changed, 55 insertions(+), 55 deletions(-) diff --git a/cpu/atmega2560/include/cpu_conf.h b/cpu/atmega2560/include/cpu_conf.h index 4c32f88842..2219a0af40 100644 --- a/cpu/atmega2560/include/cpu_conf.h +++ b/cpu/atmega2560/include/cpu_conf.h @@ -17,8 +17,8 @@ * @author Hinnerk van Bruinehsen */ -#ifndef __CPU_CONF_H -#define __CPU_CONF_H +#ifndef CPU_CONF_H +#define CPU_CONF_H #include "atmega2560_regs.h" @@ -47,5 +47,5 @@ extern "C" { } #endif -#endif /* __CPU_CONF_H */ +#endif /* CPU_CONF_H */ /** @} */ diff --git a/cpu/atmega_common/include/cpu.h b/cpu/atmega_common/include/cpu.h index b7c7d83d2f..4be4234a4b 100644 --- a/cpu/atmega_common/include/cpu.h +++ b/cpu/atmega_common/include/cpu.h @@ -24,8 +24,8 @@ * @author Kaspar Schleiser */ -#ifndef __ATMEGA_COMMON_H -#define __ATMEGA_COMMON_H +#ifndef ATMEGA_COMMON_H +#define ATMEGA_COMMON_H #include #include @@ -83,5 +83,5 @@ static inline void cpu_print_last_instruction(void) } #endif -#endif /* __ATMEGA_COMMON_H */ +#endif /* ATMEGA_COMMON_H */ /** @} */ diff --git a/cpu/cc2538/include/cpu_conf.h b/cpu/cc2538/include/cpu_conf.h index 4a34f3f3d9..8c7695d46e 100644 --- a/cpu/cc2538/include/cpu_conf.h +++ b/cpu/cc2538/include/cpu_conf.h @@ -16,8 +16,8 @@ * @author Ian Martin */ -#ifndef __CPU_CONF_H -#define __CPU_CONF_H +#ifndef CPU_CONF_H +#define CPU_CONF_H #include "cpu_conf_common.h" #include "cc2538.h" @@ -46,5 +46,5 @@ extern "C" { } /* end extern "C" */ #endif -#endif /* __CPU_CONF_H */ +#endif /* CPU_CONF_H */ /** @} */ diff --git a/cpu/cortexm_common/include/cmsis_armcc.h b/cpu/cortexm_common/include/cmsis_armcc.h index 682b36c9e3..0866aeca7f 100644 --- a/cpu/cortexm_common/include/cmsis_armcc.h +++ b/cpu/cortexm_common/include/cmsis_armcc.h @@ -32,8 +32,8 @@ ---------------------------------------------------------------------------*/ -#ifndef __CMSIS_ARMCC_H -#define __CMSIS_ARMCC_H +#ifndef CMSIS_ARMCC_H +#define CMSIS_ARMCC_H #ifdef __cplusplus extern "C" { @@ -737,4 +737,4 @@ __attribute__((section(".rrx_text"))) __STATIC_INLINE __ASM uint32_t __RRX(uint3 } #endif -#endif /* __CMSIS_ARMCC_H */ +#endif /* CMSIS_ARMCC_H */ diff --git a/cpu/cortexm_common/include/cmsis_armcc_V6.h b/cpu/cortexm_common/include/cmsis_armcc_V6.h index b19533679b..82c3687446 100644 --- a/cpu/cortexm_common/include/cmsis_armcc_V6.h +++ b/cpu/cortexm_common/include/cmsis_armcc_V6.h @@ -32,8 +32,8 @@ ---------------------------------------------------------------------------*/ -#ifndef __CMSIS_ARMCC_V6_H -#define __CMSIS_ARMCC_V6_H +#ifndef CMSIS_ARMCC_V6_H +#define CMSIS_ARMCC_V6_H #ifdef __cplusplus extern "C" { @@ -1804,4 +1804,4 @@ __attribute__((always_inline)) __STATIC_INLINE uint32_t __SMMLA (int32_t op1, in } #endif -#endif /* __CMSIS_ARMCC_V6_H */ +#endif /* CMSIS_ARMCC_V6_H */ diff --git a/cpu/cortexm_common/include/cmsis_gcc.h b/cpu/cortexm_common/include/cmsis_gcc.h index 2c303362a7..6a6987af31 100644 --- a/cpu/cortexm_common/include/cmsis_gcc.h +++ b/cpu/cortexm_common/include/cmsis_gcc.h @@ -32,8 +32,8 @@ ---------------------------------------------------------------------------*/ -#ifndef __CMSIS_GCC_H -#define __CMSIS_GCC_H +#ifndef CMSIS_GCC_H +#define CMSIS_GCC_H #ifdef __cplusplus extern "C" { @@ -1378,4 +1378,4 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __SMMLA (int32_t op1 } #endif -#endif /* __CMSIS_GCC_H */ +#endif /* CMSIS_GCC_H */ diff --git a/cpu/ezr32wg/include/ezr32wg330f256r60.h b/cpu/ezr32wg/include/ezr32wg330f256r60.h index e9754760db..663c413fcb 100644 --- a/cpu/ezr32wg/include/ezr32wg330f256r60.h +++ b/cpu/ezr32wg/include/ezr32wg330f256r60.h @@ -31,8 +31,8 @@ * *****************************************************************************/ -#ifndef __SILICON_LABS_EZR32WG330F256R60_H__ -#define __SILICON_LABS_EZR32WG330F256R60_H__ +#ifndef SILICON_LABS_EZR32WG330F256R60_H__ +#define SILICON_LABS_EZR32WG330F256R60_H__ #ifdef __cplusplus extern "C" { @@ -492,4 +492,4 @@ typedef enum IRQn #ifdef __cplusplus } #endif -#endif /* __SILICON_LABS_EZR32WG330F256R60_H__ */ +#endif /* SILICON_LABS_EZR32WG330F256R60_H__ */ diff --git a/cpu/k64f/include/cpu_conf.h b/cpu/k64f/include/cpu_conf.h index 15cef19607..6906081d7d 100644 --- a/cpu/k64f/include/cpu_conf.h +++ b/cpu/k64f/include/cpu_conf.h @@ -21,8 +21,8 @@ * @author Johann Fischer */ -#ifndef __CPU_CONF_H -#define __CPU_CONF_H +#ifndef CPU_CONF_H +#define CPU_CONF_H #include "cpu_conf_common.h" @@ -84,5 +84,5 @@ extern "C" } #endif -#endif /* __CPU_CONF_H */ +#endif /* CPU_CONF_H */ /** @} */ diff --git a/cpu/kinetis_common/include/mcg.h b/cpu/kinetis_common/include/mcg.h index 034fb6f0e0..7d12c768ea 100644 --- a/cpu/kinetis_common/include/mcg.h +++ b/cpu/kinetis_common/include/mcg.h @@ -97,8 +97,8 @@ * @author Johann Fischer */ -#ifndef __MCG_CPU_H -#define __MCG_CPU_H +#ifndef MCG_CPU_H +#define MCG_CPU_H #include "periph_conf.h" @@ -130,7 +130,7 @@ int kinetis_mcg_set_mode(kinetis_mcg_mode_t mode); } #endif -#endif /* __MCG_CPU_H */ +#endif /* KINETIS_CPU_USE_MCG */ /** @} */ -#endif /* KINETIS_CPU_USE_MCG */ +#endif /* MCG_CPU_H */ diff --git a/cpu/kw2x/include/cpu_conf.h b/cpu/kw2x/include/cpu_conf.h index 01d1baa731..713e8a9942 100644 --- a/cpu/kw2x/include/cpu_conf.h +++ b/cpu/kw2x/include/cpu_conf.h @@ -22,8 +22,8 @@ * @author Johann Fischer */ -#ifndef __CPU_CONF_H -#define __CPU_CONF_H +#ifndef CPU_CONF_H +#define CPU_CONF_H #include "cpu_conf_common.h" @@ -115,5 +115,5 @@ extern "C" } #endif -#endif /* __CPU_CONF_H */ +#endif /* CPU_CONF_H */ /** @} */ diff --git a/cpu/lpc11u34/include/LPC11Uxx.h b/cpu/lpc11u34/include/LPC11Uxx.h index 35afda3511..eab26b78a3 100644 --- a/cpu/lpc11u34/include/LPC11Uxx.h +++ b/cpu/lpc11u34/include/LPC11Uxx.h @@ -25,8 +25,8 @@ * */ -#ifndef __LPC11UXX_H__ -#define __LPC11UXX_H__ +#ifndef LPC11UXX_H__ +#define LPC11UXX_H__ #ifdef __cplusplus extern "C" { @@ -662,5 +662,5 @@ typedef struct { #endif -#endif // __LPC11UXX_H__ +#endif /* LPC11UXX_H__ */ /** @} */ diff --git a/cpu/lpc11u34/include/cpu_conf.h b/cpu/lpc11u34/include/cpu_conf.h index faecfc1e4e..4acf87d56b 100644 --- a/cpu/lpc11u34/include/cpu_conf.h +++ b/cpu/lpc11u34/include/cpu_conf.h @@ -18,8 +18,8 @@ * @author Paul RATHGEB */ -#ifndef __CPU_CONF_H -#define __CPU_CONF_H +#ifndef CPU_CONF_H +#define CPU_CONF_H #include "cpu_conf_common.h" @@ -42,5 +42,5 @@ extern "C" { } #endif -#endif /* __CPU_CONF_H */ +#endif /* CPU_CONF_H */ /** @} */ diff --git a/cpu/lpc1768/include/LPC17xx.h b/cpu/lpc1768/include/LPC17xx.h index 952cb73c66..2a63feba2b 100644 --- a/cpu/lpc1768/include/LPC17xx.h +++ b/cpu/lpc1768/include/LPC17xx.h @@ -23,8 +23,8 @@ ******************************************************************************/ -#ifndef __LPC17xx_H__ -#define __LPC17xx_H__ +#ifndef LPC17xx_H__ +#define LPC17xx_H__ #ifdef __cplusplus extern "C" { @@ -1044,4 +1044,4 @@ typedef struct } #endif -#endif // __LPC17xx_H__ +#endif /* LPC17xx_H__ */ diff --git a/cpu/lpc1768/include/cpu_conf.h b/cpu/lpc1768/include/cpu_conf.h index 6eec80c604..f3dfab6fb5 100644 --- a/cpu/lpc1768/include/cpu_conf.h +++ b/cpu/lpc1768/include/cpu_conf.h @@ -18,8 +18,8 @@ * @author Hauke Petersen */ -#ifndef __CPU_CONF_H -#define __CPU_CONF_H +#ifndef CPU_CONF_H +#define CPU_CONF_H #include "cpu_conf_common.h" @@ -49,5 +49,5 @@ extern "C" { } #endif -#endif /* __CPU_CONF_H */ +#endif /* CPU_CONF_H */ /** @} */ diff --git a/cpu/lpc2387/include/cpu.h b/cpu/lpc2387/include/cpu.h index fc8f179c4f..fddb45b025 100644 --- a/cpu/lpc2387/include/cpu.h +++ b/cpu/lpc2387/include/cpu.h @@ -6,8 +6,8 @@ * directory for more details. */ -#ifndef __CPU_H -#define __CPU_H +#ifndef CPU_H +#define CPU_H /** * @defgroup lpc2387 NXP LPC2387 @@ -58,4 +58,4 @@ static inline void cpu_print_last_instruction(void) #endif /** @} */ -#endif /* __CPU_H */ +#endif /* CPU_H */ diff --git a/cpu/lpc2387/include/i2c.h b/cpu/lpc2387/include/i2c.h index c7e4aaaa65..9fbef8d355 100644 --- a/cpu/lpc2387/include/i2c.h +++ b/cpu/lpc2387/include/i2c.h @@ -28,8 +28,8 @@ * @note $Id: i2c.h 3857 2013-09-02 18:11:27 kasmi $ */ -#ifndef __I2C_H -#define __I2C_H +#ifndef I2C_H +#define I2C_H #include #include @@ -334,4 +334,4 @@ void i2c_disable_pull_up_resistor(uint8_t i2c_interface); } #endif -#endif /* end __I2C_H */ +#endif /* I2C_H */ diff --git a/cpu/lpc2387/include/lpc2387.h b/cpu/lpc2387/include/lpc2387.h index c16a3e11c6..5c40c08e51 100644 --- a/cpu/lpc2387/include/lpc2387.h +++ b/cpu/lpc2387/include/lpc2387.h @@ -8,8 +8,8 @@ * Parts taken from FeuerWhere-Project, lpc2387.h. */ -#ifndef __LPC2387_H -#define __LPC2387_H +#ifndef LPC2387_H +#define LPC2387_H #include "lpc23xx.h" #include "arm7_common.h" @@ -151,4 +151,4 @@ extern "C" { } #endif -#endif // __LPC2387_H +#endif /* LPC2387_H */ diff --git a/cpu/saml21/include/cpu_conf.h b/cpu/saml21/include/cpu_conf.h index fb0e41f7fb..413b59d284 100644 --- a/cpu/saml21/include/cpu_conf.h +++ b/cpu/saml21/include/cpu_conf.h @@ -15,8 +15,8 @@ * @author Thomas Eichinger */ -#ifndef __CPU_CONF_H -#define __CPU_CONF_H +#ifndef CPU_CONF_H +#define CPU_CONF_H #include "cpu_conf_common.h" @@ -39,5 +39,5 @@ extern "C" { } #endif -#endif /* __CPU_CONF_H */ +#endif /* CPU_CONF_H */ /** @} */