From efbbca1322a38409f44d003a706a6a8ab4441cbc Mon Sep 17 00:00:00 2001
From: zhuoshuguo <shuguo.zhuo@inria.fr>
Date: Fri, 10 Jun 2016 17:43:21 +0200
Subject: [PATCH] cpu: Fix header include guards

---
 cpu/native/include/clang_compat.h                         | 5 +++--
 cpu/nrf51/include/cpu_conf.h                              | 6 +++---
 cpu/nrf51/include/nrf51_bitfields.h                       | 6 +++---
 cpu/nrf52/include/nrf52_bitfields.h                       | 6 +++---
 cpu/sam3/include/cpu_conf.h                               | 6 +++---
 cpu/samd21/include/cpu_conf.h                             | 6 +++---
 cpu/stellaris_common/include/cortex-m4-def.h              | 6 +++---
 cpu/stellaris_common/include/hw_adc.h                     | 6 +++---
 cpu/stellaris_common/include/hw_gpio.h                    | 6 +++---
 cpu/stellaris_common/include/hw_hibernate.h               | 6 +++---
 cpu/stellaris_common/include/hw_i2c.h                     | 6 +++---
 cpu/stellaris_common/include/hw_ints.h                    | 6 +++---
 cpu/stellaris_common/include/hw_memmap.h                  | 6 +++---
 cpu/stellaris_common/include/hw_nvic.h                    | 6 +++---
 cpu/stellaris_common/include/hw_pwm.h                     | 6 +++---
 cpu/stellaris_common/include/hw_ssi.h                     | 6 +++---
 cpu/stellaris_common/include/hw_sysctl.h                  | 6 +++---
 cpu/stellaris_common/include/hw_sysexc.h                  | 6 +++---
 cpu/stellaris_common/include/hw_timer.h                   | 6 +++---
 cpu/stellaris_common/include/hw_types.h                   | 6 +++---
 cpu/stellaris_common/include/hw_uart.h                    | 6 +++---
 cpu/stellaris_common/include/hw_watchdog.h                | 6 +++---
 cpu/stellaris_common/include/stellaris_periph/adc.h       | 6 +++---
 cpu/stellaris_common/include/stellaris_periph/comp.h      | 6 +++---
 cpu/stellaris_common/include/stellaris_periph/cpu.h       | 6 +++---
 cpu/stellaris_common/include/stellaris_periph/fpu.h       | 6 +++---
 cpu/stellaris_common/include/stellaris_periph/gpio.h      | 6 +++---
 cpu/stellaris_common/include/stellaris_periph/hibernate.h | 6 +++---
 28 files changed, 84 insertions(+), 83 deletions(-)

diff --git a/cpu/native/include/clang_compat.h b/cpu/native/include/clang_compat.h
index 1459d3a16b..6c1b6917df 100644
--- a/cpu/native/include/clang_compat.h
+++ b/cpu/native/include/clang_compat.h
@@ -8,7 +8,8 @@
  * directory for more details.
  */
 
-#ifndef __CLANG_COMPAT_H
+#ifndef CLANG_COMPAT_H
+#define CLANG_COMPAT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,4 +26,4 @@ extern "C" {
 }
 #endif
 
-#endif
+#endif /* CLANG_COMPAT_H */
diff --git a/cpu/nrf51/include/cpu_conf.h b/cpu/nrf51/include/cpu_conf.h
index 1c582677d6..1bcecaf783 100644
--- a/cpu/nrf51/include/cpu_conf.h
+++ b/cpu/nrf51/include/cpu_conf.h
@@ -16,8 +16,8 @@
  * @author          Hauke Petersen <hauke.peterse@fu-berlin.de>
  */
 
-#ifndef __CPU_CONF_H
-#define __CPU_CONF_H
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 #include "nrf51.h"
@@ -39,5 +39,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/nrf51/include/nrf51_bitfields.h b/cpu/nrf51/include/nrf51_bitfields.h
index 1bcdb7269c..4ee0826d56 100644
--- a/cpu/nrf51/include/nrf51_bitfields.h
+++ b/cpu/nrf51/include/nrf51_bitfields.h
@@ -27,8 +27,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#ifndef __NRF51_BITS_H
-#define __NRF51_BITS_H
+#ifndef NRF51_BITS_H
+#define NRF51_BITS_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -7077,4 +7077,4 @@
 #endif
 
 /*lint --flb "Leave library region" */
-#endif
+#endif /* NRF51_BITS_H */
diff --git a/cpu/nrf52/include/nrf52_bitfields.h b/cpu/nrf52/include/nrf52_bitfields.h
index 1cb6c7ec0d..5fee210c15 100644
--- a/cpu/nrf52/include/nrf52_bitfields.h
+++ b/cpu/nrf52/include/nrf52_bitfields.h
@@ -27,8 +27,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#ifndef __NRF52_BITS_H
-#define __NRF52_BITS_H
+#ifndef NRF52_BITS_H
+#define NRF52_BITS_H
 
 /*lint ++flb "Enter library region" */
 
@@ -12142,4 +12142,4 @@ extern "C" {
 #endif
 
 /*lint --flb "Leave library region" */
-#endif
+#endif /* NRF52_BITS_H */
diff --git a/cpu/sam3/include/cpu_conf.h b/cpu/sam3/include/cpu_conf.h
index f3219f397d..481fad47b0 100644
--- a/cpu/sam3/include/cpu_conf.h
+++ b/cpu/sam3/include/cpu_conf.h
@@ -18,8 +18,8 @@
  * @author          Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __CPU_CONF_H
-#define __CPU_CONF_H
+#ifndef CPU_CONF_H
+#define CPU_CONF_H
 
 #include "cpu_conf_common.h"
 #include "sam3x8e.h"
@@ -41,5 +41,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __CPU_CONF_H */
+#endif /* CPU_CONF_H */
 /** @} */
diff --git a/cpu/samd21/include/cpu_conf.h b/cpu/samd21/include/cpu_conf.h
index 8ce539c9cd..59bbd8742d 100644
--- a/cpu/samd21/include/cpu_conf.h
+++ b/cpu/samd21/include/cpu_conf.h
@@ -15,8 +15,8 @@
  * @author          Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#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 */
 /** @} */
diff --git a/cpu/stellaris_common/include/cortex-m4-def.h b/cpu/stellaris_common/include/cortex-m4-def.h
index 6792776f5f..a03fe8e512 100644
--- a/cpu/stellaris_common/include/cortex-m4-def.h
+++ b/cpu/stellaris_common/include/cortex-m4-def.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __CORTEX_M4_DEF_H__
-#define __CORTEX_M4_DEF_H__
+#ifndef CORTEX_M4_DEF_H_
+#define CORTEX_M4_DEF_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -10062,4 +10062,4 @@ extern "C" {
 }
 #endif
 
-#endif // __LM4F120H5QR_H__
+#endif /* CORTEX_M4_DEF_H_ */
diff --git a/cpu/stellaris_common/include/hw_adc.h b/cpu/stellaris_common/include/hw_adc.h
index 7d742cdce0..8eadc6e436 100644
--- a/cpu/stellaris_common/include/hw_adc.h
+++ b/cpu/stellaris_common/include/hw_adc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_ADC_H__
-#define __HW_ADC_H__
+#ifndef HW_ADC_H_
+#define HW_ADC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -1357,4 +1357,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_ADC_H__
+#endif /* HW_ADC_H_ */
diff --git a/cpu/stellaris_common/include/hw_gpio.h b/cpu/stellaris_common/include/hw_gpio.h
index 96f96c8a6b..5f74be23f8 100644
--- a/cpu/stellaris_common/include/hw_gpio.h
+++ b/cpu/stellaris_common/include/hw_gpio.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_GPIO_H__
-#define __HW_GPIO_H__
+#ifndef HW_GPIO_H_
+#define HW_GPIO_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -197,4 +197,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_GPIO_H__
+#endif /* HW_GPIO_H_ */
diff --git a/cpu/stellaris_common/include/hw_hibernate.h b/cpu/stellaris_common/include/hw_hibernate.h
index b8c36a3942..9f024f1543 100644
--- a/cpu/stellaris_common/include/hw_hibernate.h
+++ b/cpu/stellaris_common/include/hw_hibernate.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_HIBERNATE_H__
-#define __HW_HIBERNATE_H__
+#ifndef HW_HIBERNATE_H_
+#define HW_HIBERNATE_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -291,4 +291,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_HIBERNATE_H__
+#endif /* HW_HIBERNATE_H_ */
diff --git a/cpu/stellaris_common/include/hw_i2c.h b/cpu/stellaris_common/include/hw_i2c.h
index 359bbaee47..a082cbcced 100644
--- a/cpu/stellaris_common/include/hw_i2c.h
+++ b/cpu/stellaris_common/include/hw_i2c.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_I2C_H__
-#define __HW_I2C_H__
+#ifndef HW_I2C_H_
+#define HW_I2C_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -494,4 +494,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_I2C_H__
+#endif /* HW_I2C_H_ */
diff --git a/cpu/stellaris_common/include/hw_ints.h b/cpu/stellaris_common/include/hw_ints.h
index 96200bccd4..605c0747d5 100644
--- a/cpu/stellaris_common/include/hw_ints.h
+++ b/cpu/stellaris_common/include/hw_ints.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_INTS_H__
-#define __HW_INTS_H__
+#ifndef HW_INTS_H_
+#define HW_INTS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -222,4 +222,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_INTS_H__
+#endif /* HW_INTS_H_ */
diff --git a/cpu/stellaris_common/include/hw_memmap.h b/cpu/stellaris_common/include/hw_memmap.h
index 4ad3b93d70..3dc05b6db8 100644
--- a/cpu/stellaris_common/include/hw_memmap.h
+++ b/cpu/stellaris_common/include/hw_memmap.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_MEMMAP_H__
-#define __HW_MEMMAP_H__
+#ifndef HW_MEMMAP_H_
+#define HW_MEMMAP_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -169,4 +169,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_MEMMAP_H__
+#endif /* HW_MEMMAP_H_ */
diff --git a/cpu/stellaris_common/include/hw_nvic.h b/cpu/stellaris_common/include/hw_nvic.h
index 8273103108..d70d030895 100644
--- a/cpu/stellaris_common/include/hw_nvic.h
+++ b/cpu/stellaris_common/include/hw_nvic.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_NVIC_H__
-#define __HW_NVIC_H__
+#ifndef HW_NVIC_H_
+#define HW_NVIC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -1722,4 +1722,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_NVIC_H__
+#endif /* HW_NVIC_H_ */
diff --git a/cpu/stellaris_common/include/hw_pwm.h b/cpu/stellaris_common/include/hw_pwm.h
index d780480dad..e9394ededd 100644
--- a/cpu/stellaris_common/include/hw_pwm.h
+++ b/cpu/stellaris_common/include/hw_pwm.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_PWM_H__
-#define __HW_PWM_H__
+#ifndef HW_PWM_H_
+#define HW_PWM_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -2025,4 +2025,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_PWM_H__
+#endif /* HW_PWM_H_ */
diff --git a/cpu/stellaris_common/include/hw_ssi.h b/cpu/stellaris_common/include/hw_ssi.h
index ac3b67a182..d3fc4dcfe4 100644
--- a/cpu/stellaris_common/include/hw_ssi.h
+++ b/cpu/stellaris_common/include/hw_ssi.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_SSI_H__
-#define __HW_SSI_H__
+#ifndef HW_SSI_H_
+#define HW_SSI_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -249,4 +249,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_SSI_H__
+#endif /* HW_SSI_H_ */
diff --git a/cpu/stellaris_common/include/hw_sysctl.h b/cpu/stellaris_common/include/hw_sysctl.h
index cff565e62f..3ab38ee907 100644
--- a/cpu/stellaris_common/include/hw_sysctl.h
+++ b/cpu/stellaris_common/include/hw_sysctl.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_SYSCTL_H__
-#define __HW_SYSCTL_H__
+#ifndef HW_SYSCTL_H_
+#define HW_SYSCTL_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -3681,4 +3681,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_SYSCTL_H__
+#endif /* HW_SYSCTL_H_ */
diff --git a/cpu/stellaris_common/include/hw_sysexc.h b/cpu/stellaris_common/include/hw_sysexc.h
index 325b5c953f..f8aafabf8c 100644
--- a/cpu/stellaris_common/include/hw_sysexc.h
+++ b/cpu/stellaris_common/include/hw_sysexc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_SYSEXC_H__
-#define __HW_SYSEXC_H__
+#ifndef HW_SYSEXC_H_
+#define HW_SYSEXC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -136,4 +136,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_SYSEXC_H__
+#endif /* HW_SYSEXC_H_ */
diff --git a/cpu/stellaris_common/include/hw_timer.h b/cpu/stellaris_common/include/hw_timer.h
index 544f338606..f4665d4acb 100644
--- a/cpu/stellaris_common/include/hw_timer.h
+++ b/cpu/stellaris_common/include/hw_timer.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_TIMER_H__
-#define __HW_TIMER_H__
+#ifndef HW_TIMER_H_
+#define HW_TIMER_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -764,4 +764,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_TIMER_H__
+#endif /* HW_TIMER_H_ */
diff --git a/cpu/stellaris_common/include/hw_types.h b/cpu/stellaris_common/include/hw_types.h
index c3cf5c35b0..58dfe9404e 100644
--- a/cpu/stellaris_common/include/hw_types.h
+++ b/cpu/stellaris_common/include/hw_types.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_TYPES_H__
-#define __HW_TYPES_H__
+#ifndef HW_TYPES_H_
+#define HW_TYPES_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -223,4 +223,4 @@ typedef unsigned char tBoolean;
 }
 #endif
 
-#endif // __HW_TYPES_H__
+#endif /* HW_TYPES_H_ */
diff --git a/cpu/stellaris_common/include/hw_uart.h b/cpu/stellaris_common/include/hw_uart.h
index eb985338e1..39db08c018 100644
--- a/cpu/stellaris_common/include/hw_uart.h
+++ b/cpu/stellaris_common/include/hw_uart.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_UART_H__
-#define __HW_UART_H__
+#ifndef HW_UART_H_
+#define HW_UART_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -527,4 +527,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_UART_H__
+#endif /* HW_UART_H_ */
diff --git a/cpu/stellaris_common/include/hw_watchdog.h b/cpu/stellaris_common/include/hw_watchdog.h
index a712adaf1f..0b38da6d8c 100644
--- a/cpu/stellaris_common/include/hw_watchdog.h
+++ b/cpu/stellaris_common/include/hw_watchdog.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HW_WATCHDOG_H__
-#define __HW_WATCHDOG_H__
+#ifndef HW_WATCHDOG_H_
+#define HW_WATCHDOG_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -196,4 +196,4 @@ extern "C" {
 }
 #endif
 
-#endif // __HW_WATCHDOG_H__
+#endif /* HW_WATCHDOG_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/adc.h b/cpu/stellaris_common/include/stellaris_periph/adc.h
index 47f82f9c4a..fecd1e8018 100644
--- a/cpu/stellaris_common/include/stellaris_periph/adc.h
+++ b/cpu/stellaris_common/include/stellaris_periph/adc.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __ADC_H__
-#define __ADC_H__
+#ifndef ADC_H_
+#define ADC_H_
 
 //*****************************************************************************
 //
@@ -308,4 +308,4 @@ extern unsigned long ADCPhaseDelayGet(unsigned long ulBase);
 }
 #endif
 
-#endif // __ADC_H__
+#endif /* ADC_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/comp.h b/cpu/stellaris_common/include/stellaris_periph/comp.h
index 43f12eff5d..3b2a81a0a1 100644
--- a/cpu/stellaris_common/include/stellaris_periph/comp.h
+++ b/cpu/stellaris_common/include/stellaris_periph/comp.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __COMP_H__
-#define __COMP_H__
+#ifndef COMP_H_
+#define COMP_H_
 
 //*****************************************************************************
 //
@@ -142,4 +142,4 @@ extern void ComparatorIntClear(unsigned long ulBase, unsigned long ulComp);
 }
 #endif
 
-#endif // __COMP_H__
+#endif /* COMP_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/cpu.h b/cpu/stellaris_common/include/stellaris_periph/cpu.h
index ca093d1e1a..b0d8468e6b 100644
--- a/cpu/stellaris_common/include/stellaris_periph/cpu.h
+++ b/cpu/stellaris_common/include/stellaris_periph/cpu.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __CPU_H__
-#define __CPU_H__
+#ifndef STELLARIS_CPU_H_
+#define STELLARIS_CPU_H_
 
 //*****************************************************************************
 //
@@ -72,4 +72,4 @@ extern void CPUbasepriSet(unsigned long ulNewBasepri);
 }
 #endif
 
-#endif // __CPU_H__
+#endif /* STELLARIS_CPU_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/fpu.h b/cpu/stellaris_common/include/stellaris_periph/fpu.h
index cd7ab72010..72637c82b7 100644
--- a/cpu/stellaris_common/include/stellaris_periph/fpu.h
+++ b/cpu/stellaris_common/include/stellaris_periph/fpu.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __FPU_H__
-#define __FPU_H__
+#ifndef FPU_H_
+#define FPU_H_
 
 //*****************************************************************************
 //
@@ -109,4 +109,4 @@ extern void FPURoundingModeSet(unsigned long ulMode);
 }
 #endif
 
-#endif // __FPU_H__
+#endif /* FPU_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/gpio.h b/cpu/stellaris_common/include/stellaris_periph/gpio.h
index f8740eaac0..683c329e62 100644
--- a/cpu/stellaris_common/include/stellaris_periph/gpio.h
+++ b/cpu/stellaris_common/include/stellaris_periph/gpio.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __GPIO_H__
-#define __GPIO_H__
+#ifndef GPIO_H_
+#define GPIO_H_
 
 //*****************************************************************************
 //
@@ -196,4 +196,4 @@ extern void GPIOADCTriggerDisable(unsigned long ulPort, unsigned char ucPins);
 }
 #endif
 
-#endif //  __GPIO_H__
+#endif /* GPIO_H_ */
diff --git a/cpu/stellaris_common/include/stellaris_periph/hibernate.h b/cpu/stellaris_common/include/stellaris_periph/hibernate.h
index d698ed86dd..39732cb4d1 100644
--- a/cpu/stellaris_common/include/stellaris_periph/hibernate.h
+++ b/cpu/stellaris_common/include/stellaris_periph/hibernate.h
@@ -37,8 +37,8 @@
 //
 //*****************************************************************************
 
-#ifndef __HIBERNATE_H__
-#define __HIBERNATE_H__
+#ifndef HIBERNATE_H_
+#define HIBERNATE_H_
 
 //*****************************************************************************
 //
@@ -164,4 +164,4 @@ extern unsigned long HibernateBatCheckDone(void);
 }
 #endif
 
-#endif  // __HIBERNATE_H__
+#endif  /* HIBERNATE_H_ */
-- 
GitLab