From b6bd0678637f5d2fc0bf15a741c58d77658cc472 Mon Sep 17 00:00:00 2001 From: BigDaddyD Date: Wed, 22 Apr 2015 23:00:54 -0400 Subject: [PATCH 1/6] boards: removed leading underscores from macros * also added a trailing underscore to header guards for consistency Commit for PR 2623, repairing header file include guards. This PR is intended to fix the include guards in files under RIOT/boards SQUASH ME: fix underscore removal overdos SQUASH ME: consistent macro naming SQUASH ME: missed that one SQUASH ME: fixed overdo SQUASH ME: consistency --- boards/airfy-beacon/include/board.h | 6 ++--- boards/airfy-beacon/include/periph_conf.h | 6 ++--- boards/arduino-due/include/board.h | 6 ++--- boards/arduino-due/include/periph_conf.h | 6 ++--- boards/arduino-mega2560/include/board.h | 6 ++--- boards/arduino-mega2560/include/periph_conf.h | 6 ++--- boards/avsextrem/include/periph_conf.h | 6 ++--- boards/avsextrem/include/ssp0-board.h | 6 ++--- boards/cc2538dk/include/board.h | 6 ++--- boards/cc2538dk/include/periph_conf.h | 6 ++--- boards/chronos/drivers/include/battery.h | 4 ++-- boards/chronos/drivers/include/buzzer.h | 4 ++-- boards/chronos/drivers/include/display.h | 6 ++--- .../chronos/drivers/include/display_putchar.h | 6 ++--- boards/chronos/include/board.h | 6 ++--- boards/chronos/include/buttons.h | 4 ++-- boards/chronos/include/periph_conf.h | 6 ++--- boards/f4vi1/include/board.h | 6 ++--- boards/f4vi1/include/periph_conf.h | 6 ++--- boards/fox/include/periph_conf.h | 6 ++--- .../iot-lab_M3/include/ng_at86rf2xx_params.h | 4 ++-- boards/iot-lab_M3/include/periph_conf.h | 6 ++--- boards/mbed_lpc1768/include/board.h | 6 ++--- boards/mbed_lpc1768/include/periph_conf.h | 6 ++--- boards/mbed_lpc1768/system.c | 22 +++++++++---------- boards/msb-430-common/include/board-conf.h | 4 ++-- boards/msb-430/include/board.h | 6 ++--- boards/msb-430/include/periph_conf.h | 6 ++--- boards/msb-430h/include/board.h | 6 ++--- boards/msb-430h/include/periph_conf.h | 5 +++-- boards/msba2-common/drivers/include/uart0.h | 6 ++--- boards/msba2-common/include/msba2_common.h | 6 ++--- boards/msba2-common/tools/src/control_2xxx.h | 6 ++--- boards/msba2-common/tools/src/serial.h | 6 ++--- boards/msba2/include/board.h | 6 ++--- boards/msba2/include/periph_conf.h | 6 ++--- boards/msbiot/include/board.h | 6 ++--- boards/msbiot/include/periph_conf.h | 6 ++--- boards/mulle/include/periph_conf.h | 6 ++--- boards/native/include/board.h | 6 ++--- boards/native/include/board_internal.h | 4 ++-- boards/nucleo-f091/include/periph_conf.h | 6 ++--- boards/nucleo-f334/include/periph_conf.h | 6 ++--- boards/nucleo-l1/include/periph_conf.h | 6 ++--- boards/openmote/include/board.h | 6 ++--- boards/openmote/include/periph_conf.h | 6 ++--- boards/pba-d-01-kw2x/include/board.h | 4 ++-- boards/pba-d-01-kw2x/include/kw2xrf_params.h | 4 ++-- boards/pba-d-01-kw2x/include/periph_conf.h | 4 ++-- boards/pca10000/include/board.h | 6 ++--- boards/pca10000/include/periph_conf.h | 6 ++--- boards/pca10005/include/board.h | 6 ++--- boards/pca10005/include/periph_conf.h | 6 ++--- boards/pttu/include/board.h | 6 ++--- boards/pttu/include/periph_conf.h | 6 ++--- boards/qemu-i386/include/board.h | 4 ++-- boards/qemu-i386/include/cpu_conf.h | 4 ++-- boards/redbee-econotag/drivers/include/nvm.h | 6 ++--- boards/redbee-econotag/drivers/include/uart.h | 4 ++-- boards/redbee-econotag/include/board.h | 4 ++-- boards/redbee-econotag/include/periph_conf.h | 6 ++--- boards/samr21-xpro/include/board.h | 6 ++--- .../samr21-xpro/include/ng_at86rf2xx_params.h | 4 ++-- boards/samr21-xpro/include/periph_conf.h | 6 ++--- boards/spark-core/include/periph_conf.h | 6 ++--- boards/stm32f0discovery/include/board.h | 6 ++--- boards/stm32f0discovery/include/periph_conf.h | 6 ++--- boards/stm32f3discovery/include/board.h | 6 ++--- boards/stm32f3discovery/include/periph_conf.h | 6 ++--- boards/stm32f4discovery/include/board.h | 6 ++--- boards/stm32f4discovery/include/periph_conf.h | 6 ++--- boards/telosb/include/board-conf.h | 4 ++-- boards/telosb/include/board.h | 6 ++--- boards/telosb/include/periph_conf.h | 6 ++--- boards/udoo/include/board.h | 6 ++--- boards/udoo/include/periph_conf.h | 6 ++--- boards/wsn430-common/include/board-conf.h | 4 ++-- boards/wsn430-common/include/periph_conf.h | 6 ++--- boards/wsn430-v1_3b/include/board.h | 6 ++--- boards/wsn430-v1_4/include/board.h | 6 ++--- .../x86-multiboot-common/include/multiboot.h | 4 ++-- boards/yunjia-nrf51822/include/board.h | 6 ++--- boards/yunjia-nrf51822/include/periph_conf.h | 6 ++--- boards/z1/include/board-conf.h | 4 ++-- boards/z1/include/board.h | 6 ++--- boards/z1/include/periph_conf.h | 6 ++--- 86 files changed, 248 insertions(+), 247 deletions(-) diff --git a/boards/airfy-beacon/include/board.h b/boards/airfy-beacon/include/board.h index 5c011262f9..f5cb41a1ad 100644 --- a/boards/airfy-beacon/include/board.h +++ b/boards/airfy-beacon/include/board.h @@ -18,8 +18,8 @@ * @author Christian Mehlis */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" @@ -67,5 +67,5 @@ void board_init(void); } /* end extern "C" */ #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/airfy-beacon/include/periph_conf.h b/boards/airfy-beacon/include/periph_conf.h index 8ae3cfaa47..ebef807fe3 100644 --- a/boards/airfy-beacon/include/periph_conf.h +++ b/boards/airfy-beacon/include/periph_conf.h @@ -17,8 +17,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -180,4 +180,4 @@ } /* end extern "C" */ #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/arduino-due/include/board.h b/boards/arduino-due/include/board.h index 94aaa58592..29029e72ba 100644 --- a/boards/arduino-due/include/board.h +++ b/boards/arduino-due/include/board.h @@ -18,8 +18,8 @@ * @author Hauke Petersen */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" @@ -80,5 +80,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/arduino-due/include/periph_conf.h b/boards/arduino-due/include/periph_conf.h index bf80529e77..6d29726aa0 100644 --- a/boards/arduino-due/include/periph_conf.h +++ b/boards/arduino-due/include/periph_conf.h @@ -17,8 +17,8 @@ * @author Peter Kietzmann */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -346,5 +346,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/arduino-mega2560/include/board.h b/boards/arduino-mega2560/include/board.h index 2d1969a5a0..1fe89231bf 100644 --- a/boards/arduino-mega2560/include/board.h +++ b/boards/arduino-mega2560/include/board.h @@ -18,8 +18,8 @@ * @author Hinnerk van Bruinehsen */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" @@ -83,5 +83,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/arduino-mega2560/include/periph_conf.h b/boards/arduino-mega2560/include/periph_conf.h index 351e59f602..8d9f9dce5b 100644 --- a/boards/arduino-mega2560/include/periph_conf.h +++ b/boards/arduino-mega2560/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Hinnerk van Bruinehsen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -286,4 +286,4 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/avsextrem/include/periph_conf.h b/boards/avsextrem/include/periph_conf.h index 5a721fd413..7b8c486f8d 100644 --- a/boards/avsextrem/include/periph_conf.h +++ b/boards/avsextrem/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #include "lpc2387.h" @@ -54,5 +54,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/avsextrem/include/ssp0-board.h b/boards/avsextrem/include/ssp0-board.h index 723803fbdd..3a5212ce10 100644 --- a/boards/avsextrem/include/ssp0-board.h +++ b/boards/avsextrem/include/ssp0-board.h @@ -19,8 +19,8 @@ * * @note $Id: avsextrem-ssp0.c 3854 2010-01-18 15:27:01Z zkasmi $ */ -#ifndef __SSP_H__ -#define __SSP_H__ +#ifndef SSP_H__ +#define SSP_H__ #include "stdint.h" @@ -122,4 +122,4 @@ void SSP0Handler(void); } #endif -#endif /* __SSP_H__ */ +#endif /* SSP_H__ */ diff --git a/boards/cc2538dk/include/board.h b/boards/cc2538dk/include/board.h index 8f7e19ef6f..b82526e96f 100644 --- a/boards/cc2538dk/include/board.h +++ b/boards/cc2538dk/include/board.h @@ -17,8 +17,8 @@ * @author Ian Martin */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" #include "periph/gpio.h" @@ -100,5 +100,5 @@ void board_init(void); } /* end extern "C" */ #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/cc2538dk/include/periph_conf.h b/boards/cc2538dk/include/periph_conf.h index e6d341b516..8d5245183f 100644 --- a/boards/cc2538dk/include/periph_conf.h +++ b/boards/cc2538dk/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Ian Martin */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #include "gptimer.h" @@ -192,5 +192,5 @@ extern "C" { } /* end extern "C" */ #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/chronos/drivers/include/battery.h b/boards/chronos/drivers/include/battery.h index 5bf58dd9c4..34bb37b0b3 100644 --- a/boards/chronos/drivers/include/battery.h +++ b/boards/chronos/drivers/include/battery.h @@ -6,8 +6,8 @@ * directory for more details. */ -#ifndef BATTERY_H -#define BATTERY_H +#ifndef BATTERY_H_ +#define BATTERY_H_ #ifdef __cplusplus extern "C" { diff --git a/boards/chronos/drivers/include/buzzer.h b/boards/chronos/drivers/include/buzzer.h index 22fe35da0b..f964b5a3e3 100644 --- a/boards/chronos/drivers/include/buzzer.h +++ b/boards/chronos/drivers/include/buzzer.h @@ -6,8 +6,8 @@ * directory for more details. */ -#ifndef BUZZER_H -#define BUZZER_H +#ifndef BUZZER_H_ +#define BUZZER_H_ #ifdef __cplusplus extern "C" { diff --git a/boards/chronos/drivers/include/display.h b/boards/chronos/drivers/include/display.h index 7bccf5e061..bd726f63e8 100644 --- a/boards/chronos/drivers/include/display.h +++ b/boards/chronos/drivers/include/display.h @@ -35,8 +35,8 @@ * Basic display functions. * ************************************************************************************************/ -#ifndef __DISPLAY_H -#define __DISPLAY_H +#ifndef DISPLAY_H_ +#define DISPLAY_H_ #ifdef __cplusplus extern "C" { @@ -463,4 +463,4 @@ void display_all_off(void); } #endif -#endif /* __DISPLAY_ */ +#endif /* DISPLAY_ */ diff --git a/boards/chronos/drivers/include/display_putchar.h b/boards/chronos/drivers/include/display_putchar.h index 0dcdaae018..b5194d0ab9 100644 --- a/boards/chronos/drivers/include/display_putchar.h +++ b/boards/chronos/drivers/include/display_putchar.h @@ -6,8 +6,8 @@ * directory for more details. */ -#ifndef __DISPLAY_PUTCHAR_H -#define __DISPLAY_PUTCHAR_H +#ifndef DISPLAY_PUTCHAR_H_ +#define DISPLAY_PUTCHAR_H_ #ifdef __cplusplus extern "C" { @@ -19,4 +19,4 @@ void init_display_putchar(void); } #endif -#endif /* __DISPLAY_PUTCHAR_H */ +#endif /* DISPLAY_PUTCHAR_H_ */ diff --git a/boards/chronos/include/board.h b/boards/chronos/include/board.h index ed3659d1d0..73ce773562 100644 --- a/boards/chronos/include/board.h +++ b/boards/chronos/include/board.h @@ -18,8 +18,8 @@ * @author unknwon */ -#ifndef _CHRONOS_BOARD_H -#define _CHRONOS_BOARD_H +#ifndef CHRONOS_BOARD_H_ +#define CHRONOS_BOARD_H_ #include @@ -44,5 +44,5 @@ typedef uint8_t radio_packet_length_t; } #endif -#endif /* _CHRONOS_BOARD_H */ +#endif /* _CHRONOS_BOARD_H_ */ /** @} */ diff --git a/boards/chronos/include/buttons.h b/boards/chronos/include/buttons.h index 592f2ad0bc..9bd68173bd 100644 --- a/boards/chronos/include/buttons.h +++ b/boards/chronos/include/buttons.h @@ -6,8 +6,8 @@ * directory for more details. */ -#ifndef BUTTONS_H -#define BUTTONS_H +#ifndef BUTTONS_H_ +#define BUTTONS_H_ #ifdef __cplusplus extern "C" { diff --git a/boards/chronos/include/periph_conf.h b/boards/chronos/include/periph_conf.h index 7f825ab6fc..d76d953f6a 100644 --- a/boards/chronos/include/periph_conf.h +++ b/boards/chronos/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Oliver Hahm */ -#ifndef PERIPH_CONF_H -#define PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -32,4 +32,4 @@ extern "C" { } #endif -#endif /* PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/f4vi1/include/board.h b/boards/f4vi1/include/board.h index 283ebb10e2..f7f7fbb786 100644 --- a/boards/f4vi1/include/board.h +++ b/boards/f4vi1/include/board.h @@ -19,8 +19,8 @@ * @author Hauke Petersen */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" #include "periph_conf.h" @@ -94,5 +94,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/f4vi1/include/periph_conf.h b/boards/f4vi1/include/periph_conf.h index 7f7826406d..5a00d270ef 100644 --- a/boards/f4vi1/include/periph_conf.h +++ b/boards/f4vi1/include/periph_conf.h @@ -18,8 +18,8 @@ * @author Peter Kietzmann */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -99,5 +99,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/fox/include/periph_conf.h b/boards/fox/include/periph_conf.h index b20edddd46..98d399adbf 100644 --- a/boards/fox/include/periph_conf.h +++ b/boards/fox/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Thomas Eichinger */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -304,5 +304,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/iot-lab_M3/include/ng_at86rf2xx_params.h b/boards/iot-lab_M3/include/ng_at86rf2xx_params.h index 08d721527e..b9f01637ec 100644 --- a/boards/iot-lab_M3/include/ng_at86rf2xx_params.h +++ b/boards/iot-lab_M3/include/ng_at86rf2xx_params.h @@ -16,8 +16,8 @@ * @author Kaspar Schleiser */ -#ifndef NG_AT86RF2XX_PARAMS_H -#define NG_AT86RF2XX_PARAMS_H +#ifndef NG_AT86RF2XX_PARAMS_H_ +#define NG_AT86RF2XX_PARAMS_H_ #ifdef __cplusplus extern "C" { diff --git a/boards/iot-lab_M3/include/periph_conf.h b/boards/iot-lab_M3/include/periph_conf.h index 8bb4912c1c..e9d5d87743 100644 --- a/boards/iot-lab_M3/include/periph_conf.h +++ b/boards/iot-lab_M3/include/periph_conf.h @@ -17,8 +17,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -319,5 +319,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/mbed_lpc1768/include/board.h b/boards/mbed_lpc1768/include/board.h index cb7006243a..daf7e8907b 100644 --- a/boards/mbed_lpc1768/include/board.h +++ b/boards/mbed_lpc1768/include/board.h @@ -20,8 +20,8 @@ * @author Hauke Petersen */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include @@ -102,5 +102,5 @@ void board_init(void); } #endif -#endif /* __BOARD_H */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/mbed_lpc1768/include/periph_conf.h b/boards/mbed_lpc1768/include/periph_conf.h index d05cee233c..33de1b9bf5 100644 --- a/boards/mbed_lpc1768/include/periph_conf.h +++ b/boards/mbed_lpc1768/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -89,5 +89,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/mbed_lpc1768/system.c b/boards/mbed_lpc1768/system.c index c2dbc0ae1b..1866d97bf7 100644 --- a/boards/mbed_lpc1768/system.c +++ b/boards/mbed_lpc1768/system.c @@ -382,34 +382,34 @@ /* F_cco0 = (2 * M * F_in) / N */ -#define __M (((PLL0CFG_Val ) & 0x7FFF) + 1) -#define __N (((PLL0CFG_Val >> 16) & 0x00FF) + 1) -#define __FCCO(__F_IN) ((2ULL * __M * __F_IN) / __N) -#define __CCLK_DIV (((CCLKCFG_Val ) & 0x00FF) + 1) +#define M (((PLL0CFG_Val ) & 0x7FFF) + 1) +#define N (((PLL0CFG_Val >> 16) & 0x00FF) + 1) +#define FCCO(F_IN) ((2ULL * M * F_IN) / N) +#define CCLK_DIV (((CCLKCFG_Val ) & 0x00FF) + 1) /* Determine core clock frequency according to settings */ #if (PLL0_SETUP) #if ((CLKSRCSEL_Val & 0x03) == 1) -#define __CORE_CLK (__FCCO(OSC_CLK) / __CCLK_DIV) +#define CORE_CLK (FCCO(OSC_CLK) / CCLK_DIV) #elif ((CLKSRCSEL_Val & 0x03) == 2) -#define __CORE_CLK (__FCCO(RTC_CLK) / __CCLK_DIV) +#define CORE_CLK (FCCO(RTC_CLK) / CCLK_DIV) #else -#define __CORE_CLK (__FCCO(IRC_OSC) / __CCLK_DIV) +#define CORE_CLK (FCCO(IRC_OSC) / CCLK_DIV) #endif #else #if ((CLKSRCSEL_Val & 0x03) == 1) -#define __CORE_CLK (OSC_CLK / __CCLK_DIV) +#define CORE_CLK (OSC_CLK / CCLK_DIV) #elif ((CLKSRCSEL_Val & 0x03) == 2) -#define __CORE_CLK (RTC_CLK / __CCLK_DIV) +#define CORE_CLK (RTC_CLK / CCLK_DIV) #else -#define __CORE_CLK (IRC_OSC / __CCLK_DIV) +#define CORE_CLK (IRC_OSC / CCLK_DIV) #endif #endif /*---------------------------------------------------------------------------- Clock Variable definitions *----------------------------------------------------------------------------*/ -uint32_t system_clock = __CORE_CLK;/*!< System Clock Frequency (Core Clock)*/ +uint32_t system_clock = CORE_CLK;/*!< System Clock Frequency (Core Clock)*/ /*---------------------------------------------------------------------------- diff --git a/boards/msb-430-common/include/board-conf.h b/boards/msb-430-common/include/board-conf.h index c22e6b99e8..9a63298949 100644 --- a/boards/msb-430-common/include/board-conf.h +++ b/boards/msb-430-common/include/board-conf.h @@ -18,8 +18,8 @@ * @author unknown */ -#ifndef BOARD_CONF_H -#define BOARD_CONF_H +#ifndef BOARD_CONF_H_ +#define BOARD_CONF_H_ #include diff --git a/boards/msb-430/include/board.h b/boards/msb-430/include/board.h index 2706c914fa..2bad4640e9 100644 --- a/boards/msb-430/include/board.h +++ b/boards/msb-430/include/board.h @@ -23,8 +23,8 @@ * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project */ -#ifndef _MSB_BOARD_H -#define _MSB_BOARD_H +#ifndef MSB_BOARD_H_ +#define MSB_BOARD_H_ #include "board-conf.h" @@ -64,4 +64,4 @@ extern "C" { typedef uint8_t radio_packet_length_t; /** @} */ -#endif // _MSB_BOARD_H +#endif // MSB_BOARD_H_ diff --git a/boards/msb-430/include/periph_conf.h b/boards/msb-430/include/periph_conf.h index cf7bb61559..2bdcff4f1c 100644 --- a/boards/msb-430/include/periph_conf.h +++ b/boards/msb-430/include/periph_conf.h @@ -16,9 +16,9 @@ * @author Oliver Hahm */ -#ifndef PERIPH_CONF_H -#define PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */ -#endif /* PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/msb-430h/include/board.h b/boards/msb-430h/include/board.h index 7f8366980e..b2780a68c2 100644 --- a/boards/msb-430h/include/board.h +++ b/boards/msb-430h/include/board.h @@ -18,8 +18,8 @@ * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project */ -#ifndef _MSB_BOARD_H -#define _MSB_BOARD_H +#ifndef MSB_BOARD_H_ +#define MSB_BOARD_H_ #ifdef __cplusplus extern "C" { @@ -57,4 +57,4 @@ extern "C" { typedef uint8_t radio_packet_length_t; /** @} */ -#endif // _MSB_BOARD_H +#endif // MSB_BOARD_H_ diff --git a/boards/msb-430h/include/periph_conf.h b/boards/msb-430h/include/periph_conf.h index 8f5b8b8fc4..b742d02f1b 100644 --- a/boards/msb-430h/include/periph_conf.h +++ b/boards/msb-430h/include/periph_conf.h @@ -16,9 +16,10 @@ * @author Oliver Hahm */ -#ifndef PERIPH_CONF_H -#define PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */ +#endif /* PERIPH_CONF_H_ */ #endif /* PERIPH_CONF_H */ diff --git a/boards/msba2-common/drivers/include/uart0.h b/boards/msba2-common/drivers/include/uart0.h index c78c8f9f07..24a22b99c7 100644 --- a/boards/msba2-common/drivers/include/uart0.h +++ b/boards/msba2-common/drivers/include/uart0.h @@ -6,8 +6,8 @@ * directory for more details. */ -#ifndef __UART0_H -#define __UART0_H +#ifndef UART0_H_ +#define UART0_H_ #ifdef __cplusplus extern "C" { @@ -19,4 +19,4 @@ extern kernel_pid_t uart0_handler_pid; } #endif -#endif /* __UART0_H */ +#endif /* UART0_H */ diff --git a/boards/msba2-common/include/msba2_common.h b/boards/msba2-common/include/msba2_common.h index 6d9a763fcf..0a0fd71714 100644 --- a/boards/msba2-common/include/msba2_common.h +++ b/boards/msba2-common/include/msba2_common.h @@ -17,8 +17,8 @@ * * @author Kaspar Schleiser */ -#ifndef __MSBA2_COMMON_H -#define __MSBA2_COMMON_H +#ifndef MSBA2_COMMON_H_ +#define MSBA2_COMMON_H_ #include @@ -41,4 +41,4 @@ static inline void pllfeed(void) #endif /** @} */ -#endif // __MSBA2_COMMON_H +#endif // MSBA2_COMMON_H_ diff --git a/boards/msba2-common/tools/src/control_2xxx.h b/boards/msba2-common/tools/src/control_2xxx.h index d43dd60cba..9b0598a6fd 100644 --- a/boards/msba2-common/tools/src/control_2xxx.h +++ b/boards/msba2-common/tools/src/control_2xxx.h @@ -16,10 +16,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef CONTROL_2XXXX_H -#define CONTROL_2XXXX_H +#ifndef CONTROL_2XXXX_H_ +#define CONTROL_2XXXX_H_ void hard_reset_to_bootloader(void); void hard_reset_to_user_code(void); -#endif // ..._H +#endif // ..._H_ diff --git a/boards/msba2-common/tools/src/serial.h b/boards/msba2-common/tools/src/serial.h index 9607361086..27f0ac3b9b 100644 --- a/boards/msba2-common/tools/src/serial.h +++ b/boards/msba2-common/tools/src/serial.h @@ -16,8 +16,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef SERIAL_H -#define SERIAL_H +#ifndef SERIAL_H_ +#define SERIAL_H_ extern char *baud_rate; @@ -34,4 +34,4 @@ void set_rts(int val); void set_dtr(int val); void change_baud(const char *baud_name); -#endif // SERIAL_H +#endif // SERIAL_H_ diff --git a/boards/msba2/include/board.h b/boards/msba2/include/board.h index bbc8789895..599e2ab411 100644 --- a/boards/msba2/include/board.h +++ b/boards/msba2/include/board.h @@ -18,8 +18,8 @@ * @author unknown */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "msba2_common.h" #include "bitarithm.h" @@ -47,5 +47,5 @@ typedef uint8_t radio_packet_length_t; } #endif -#endif /* __BOARD_H */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/msba2/include/periph_conf.h b/boards/msba2/include/periph_conf.h index a9a7bdf3be..7ae12d6b54 100644 --- a/boards/msba2/include/periph_conf.h +++ b/boards/msba2/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #include "lpc2387.h" @@ -55,5 +55,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/msbiot/include/board.h b/boards/msbiot/include/board.h index 843aa75164..4ca982d43c 100644 --- a/boards/msbiot/include/board.h +++ b/boards/msbiot/include/board.h @@ -18,8 +18,8 @@ * @author Fabian Nack */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" #include "periph_conf.h" @@ -105,5 +105,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/msbiot/include/periph_conf.h b/boards/msbiot/include/periph_conf.h index 6135a7f3b8..b1d86dc92f 100644 --- a/boards/msbiot/include/periph_conf.h +++ b/boards/msbiot/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Fabian Nack */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -395,5 +395,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/mulle/include/periph_conf.h b/boards/mulle/include/periph_conf.h index 8b54f45882..d467d6e69d 100644 --- a/boards/mulle/include/periph_conf.h +++ b/boards/mulle/include/periph_conf.h @@ -17,8 +17,8 @@ * @author Joakim Gebart */ -#ifndef MULLE_PERIPH_CONF_H -#define MULLE_PERIPH_CONF_H +#ifndef MULLE_PERIPH_CONF_H_ +#define MULLE_PERIPH_CONF_H_ #ifdef __cplusplus extern "C" @@ -812,5 +812,5 @@ extern "C" } #endif -#endif /* MULLE_PERIPH_CONF_H */ +#endif /* MULLE_PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/native/include/board.h b/boards/native/include/board.h index c3a20664f2..a3354034f1 100644 --- a/boards/native/include/board.h +++ b/boards/native/include/board.h @@ -21,8 +21,8 @@ * @author Ludwig Ortmann */ -#ifndef BOARD_H -#define BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include @@ -52,4 +52,4 @@ typedef uint16_t radio_packet_length_t; #endif /** @} */ -#endif /* BOARD_H */ +#endif /* BOARD_H_ */ diff --git a/boards/native/include/board_internal.h b/boards/native/include/board_internal.h index d8af212015..9556d4118a 100644 --- a/boards/native/include/board_internal.h +++ b/boards/native/include/board_internal.h @@ -6,8 +6,8 @@ * directory for more details. */ -#ifndef BOARD_INTERNAL_H -#define BOARD_INTERNAL_H +#ifndef BOARD_INTERNAL_H_ +#define BOARD_INTERNAL_H_ #ifdef __cplusplus extern "C" { diff --git a/boards/nucleo-f091/include/periph_conf.h b/boards/nucleo-f091/include/periph_conf.h index f059424907..30fc77cf52 100644 --- a/boards/nucleo-f091/include/periph_conf.h +++ b/boards/nucleo-f091/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -161,5 +161,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/nucleo-f334/include/periph_conf.h b/boards/nucleo-f334/include/periph_conf.h index 9168aaf099..827906a9f2 100644 --- a/boards/nucleo-f334/include/periph_conf.h +++ b/boards/nucleo-f334/include/periph_conf.h @@ -17,8 +17,8 @@ * @author Kaspar Schleiser */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -166,5 +166,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/nucleo-l1/include/periph_conf.h b/boards/nucleo-l1/include/periph_conf.h index 3b25c8f8d5..e6cef65b5b 100644 --- a/boards/nucleo-l1/include/periph_conf.h +++ b/boards/nucleo-l1/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Thomas Eichinger */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -288,5 +288,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/openmote/include/board.h b/boards/openmote/include/board.h index d4c37b0a6e..e1db0aaa2a 100644 --- a/boards/openmote/include/board.h +++ b/boards/openmote/include/board.h @@ -18,8 +18,8 @@ * @author Hauke Petersen */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" #include "periph/gpio.h" @@ -88,5 +88,5 @@ void board_init(void); } /* end extern "C" */ #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/openmote/include/periph_conf.h b/boards/openmote/include/periph_conf.h index 6dc5ab8344..c530705d6a 100644 --- a/boards/openmote/include/periph_conf.h +++ b/boards/openmote/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -175,5 +175,5 @@ } /* end extern "C" */ #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/pba-d-01-kw2x/include/board.h b/boards/pba-d-01-kw2x/include/board.h index 2ac7a07cc1..9cf3d50231 100644 --- a/boards/pba-d-01-kw2x/include/board.h +++ b/boards/pba-d-01-kw2x/include/board.h @@ -19,8 +19,8 @@ * @author Johann Fischer */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" #include "periph_conf.h" diff --git a/boards/pba-d-01-kw2x/include/kw2xrf_params.h b/boards/pba-d-01-kw2x/include/kw2xrf_params.h index d0b9bd8813..ca9c318519 100644 --- a/boards/pba-d-01-kw2x/include/kw2xrf_params.h +++ b/boards/pba-d-01-kw2x/include/kw2xrf_params.h @@ -22,8 +22,8 @@ extern "C" { #endif -#ifndef KW2XRF_PARAMS_H -#define KW2XRF_PARAMS_H +#ifndef KW2XRF_PARAMS_H_ +#define KW2XRF_PARAMS_H_ /** * @name KW2XRF configuration diff --git a/boards/pba-d-01-kw2x/include/periph_conf.h b/boards/pba-d-01-kw2x/include/periph_conf.h index 11ca5db40f..9dc75d80e0 100644 --- a/boards/pba-d-01-kw2x/include/periph_conf.h +++ b/boards/pba-d-01-kw2x/include/periph_conf.h @@ -19,8 +19,8 @@ * @author Jonas Remmert */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #include "cpu_conf.h" diff --git a/boards/pca10000/include/board.h b/boards/pca10000/include/board.h index 701eb31a2f..2ce721e230 100644 --- a/boards/pca10000/include/board.h +++ b/boards/pca10000/include/board.h @@ -19,8 +19,8 @@ * @author Timo Ziegler */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" @@ -82,5 +82,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/pca10000/include/periph_conf.h b/boards/pca10000/include/periph_conf.h index 9b1fee932d..b3fdb0fbec 100644 --- a/boards/pca10000/include/periph_conf.h +++ b/boards/pca10000/include/periph_conf.h @@ -18,8 +18,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -167,4 +167,4 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/pca10005/include/board.h b/boards/pca10005/include/board.h index 9ce840b3c0..1a358c7dae 100644 --- a/boards/pca10005/include/board.h +++ b/boards/pca10005/include/board.h @@ -19,8 +19,8 @@ * @author Timo Ziegler */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" @@ -73,5 +73,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/pca10005/include/periph_conf.h b/boards/pca10005/include/periph_conf.h index d935a6069c..8b70ece07b 100644 --- a/boards/pca10005/include/periph_conf.h +++ b/boards/pca10005/include/periph_conf.h @@ -18,8 +18,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -186,4 +186,4 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/pttu/include/board.h b/boards/pttu/include/board.h index 16a071c15a..95fedb449f 100644 --- a/boards/pttu/include/board.h +++ b/boards/pttu/include/board.h @@ -18,8 +18,8 @@ * @author Kaspar Schleiser */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include @@ -59,5 +59,5 @@ typedef uint8_t radio_packet_length_t; } #endif -#endif /* __BOARD_H */ /** @} */ +#endif /* BOARD_H_ */ diff --git a/boards/pttu/include/periph_conf.h b/boards/pttu/include/periph_conf.h index ed13a5c78e..f644040aca 100644 --- a/boards/pttu/include/periph_conf.h +++ b/boards/pttu/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #include "lpc2387.h" @@ -54,5 +54,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/qemu-i386/include/board.h b/boards/qemu-i386/include/board.h index e06cd8ed32..bee456c9d1 100644 --- a/boards/qemu-i386/include/board.h +++ b/boards/qemu-i386/include/board.h @@ -18,8 +18,8 @@ * @author René Kijewski */ -#ifndef __RIOT__BOARDS__QEMU_I386__BOARD__H -#define __RIOT__BOARDS__QEMU_I386__BOARD__H +#ifndef RIOT__BOARDS__QEMU_I386__BOARD__H_ +#define RIOT__BOARDS__QEMU_I386__BOARD__H_ #ifdef __cplusplus extern "C" { diff --git a/boards/qemu-i386/include/cpu_conf.h b/boards/qemu-i386/include/cpu_conf.h index a273115f11..3dbe9a4653 100644 --- a/boards/qemu-i386/include/cpu_conf.h +++ b/boards/qemu-i386/include/cpu_conf.h @@ -16,8 +16,8 @@ * @author René Kijewski */ -#ifndef __RIOT__BOARDS__QEMU_I386__CPU_CONF__H -#define __RIOT__BOARDS__QEMU_I386__CPU_CONF__H +#ifndef RIOT__BOARDS__QEMU_I386__CPU_CONF__H_ +#define RIOT__BOARDS__QEMU_I386__CPU_CONF__H_ #ifdef __cplusplus extern "C" { diff --git a/boards/redbee-econotag/drivers/include/nvm.h b/boards/redbee-econotag/drivers/include/nvm.h index f0887beee1..f08c9fb93c 100644 --- a/boards/redbee-econotag/drivers/include/nvm.h +++ b/boards/redbee-econotag/drivers/include/nvm.h @@ -7,8 +7,8 @@ * directory for more details. */ -#ifndef NVM_H -#define NVM_H +#ifndef NVM_H_ +#define NVM_H_ #include @@ -62,4 +62,4 @@ extern void(*nvm_setsvar)(uint32_t zero_for_awesome); } #endif -#endif //NVM_H +#endif //NVM_H_ diff --git a/boards/redbee-econotag/drivers/include/uart.h b/boards/redbee-econotag/drivers/include/uart.h index 546c3fe7e5..7cc4ab620b 100644 --- a/boards/redbee-econotag/drivers/include/uart.h +++ b/boards/redbee-econotag/drivers/include/uart.h @@ -7,8 +7,8 @@ * directory for more details. */ -#ifndef UART_H -#define UART_H +#ifndef UART_H_ +#define UART_H_ #include diff --git a/boards/redbee-econotag/include/board.h b/boards/redbee-econotag/include/board.h index 5dcd027b61..cd02b15013 100644 --- a/boards/redbee-econotag/include/board.h +++ b/boards/redbee-econotag/include/board.h @@ -18,8 +18,8 @@ * @author Thomas Eichinger */ -#ifndef REDBEE_ECONOTAG_BOARD_H -#define REDBEE_ECONOTAG_BOARD_H +#ifndef REDBEE_ECONOTAG_BOARD_H_ +#define REDBEE_ECONOTAG_BOARD_H_ #include diff --git a/boards/redbee-econotag/include/periph_conf.h b/boards/redbee-econotag/include/periph_conf.h index 1fa2059b55..ee839d71de 100644 --- a/boards/redbee-econotag/include/periph_conf.h +++ b/boards/redbee-econotag/include/periph_conf.h @@ -16,9 +16,9 @@ * @author Oliver Hahm */ -#ifndef PERIPH_CONF_H -#define PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */ -#endif /* PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h index 7143c6452a..1c7beceac9 100644 --- a/boards/samr21-xpro/include/board.h +++ b/boards/samr21-xpro/include/board.h @@ -18,8 +18,8 @@ * @author Thomas Eichinger */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" @@ -113,5 +113,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/samr21-xpro/include/ng_at86rf2xx_params.h b/boards/samr21-xpro/include/ng_at86rf2xx_params.h index 9a75c29ac2..b4ae732e18 100644 --- a/boards/samr21-xpro/include/ng_at86rf2xx_params.h +++ b/boards/samr21-xpro/include/ng_at86rf2xx_params.h @@ -16,8 +16,8 @@ * @author Kaspar Schleiser */ -#ifndef NG_AT86RF2XX_PARAMS_H -#define NG_AT86RF2XX_PARAMS_H +#ifndef NG_AT86RF2XX_PARAMS_H_ +#define NG_AT86RF2XX_PARAMS_H_ #ifdef __cplusplus extern "C" { diff --git a/boards/samr21-xpro/include/periph_conf.h b/boards/samr21-xpro/include/periph_conf.h index 1830c68ab3..23a24f441a 100644 --- a/boards/samr21-xpro/include/periph_conf.h +++ b/boards/samr21-xpro/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Thomas Eichinger */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -264,5 +264,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/spark-core/include/periph_conf.h b/boards/spark-core/include/periph_conf.h index a77a1abe80..bbc0f611a0 100644 --- a/boards/spark-core/include/periph_conf.h +++ b/boards/spark-core/include/periph_conf.h @@ -15,8 +15,8 @@ * * @author Christian Mehlis */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -253,5 +253,5 @@ } /* end extern "C" */ #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/stm32f0discovery/include/board.h b/boards/stm32f0discovery/include/board.h index 69be3abf7d..fc1dac3054 100644 --- a/boards/stm32f0discovery/include/board.h +++ b/boards/stm32f0discovery/include/board.h @@ -18,8 +18,8 @@ * @author Hauke Petersen */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" @@ -82,5 +82,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/stm32f0discovery/include/periph_conf.h b/boards/stm32f0discovery/include/periph_conf.h index b9fdc988ec..b8e76c52fb 100644 --- a/boards/stm32f0discovery/include/periph_conf.h +++ b/boards/stm32f0discovery/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -276,4 +276,4 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/stm32f3discovery/include/board.h b/boards/stm32f3discovery/include/board.h index 999ad53212..5c5d047534 100644 --- a/boards/stm32f3discovery/include/board.h +++ b/boards/stm32f3discovery/include/board.h @@ -18,8 +18,8 @@ * @author Hauke Petersen */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" @@ -107,5 +107,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/stm32f3discovery/include/periph_conf.h b/boards/stm32f3discovery/include/periph_conf.h index 8120902dfa..3e9f4d2f5d 100644 --- a/boards/stm32f3discovery/include/periph_conf.h +++ b/boards/stm32f3discovery/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -372,4 +372,4 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/stm32f4discovery/include/board.h b/boards/stm32f4discovery/include/board.h index f29617a960..b33960044e 100644 --- a/boards/stm32f4discovery/include/board.h +++ b/boards/stm32f4discovery/include/board.h @@ -18,8 +18,8 @@ * @author Hauke Petersen */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" #include "periph_conf.h" @@ -93,5 +93,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/stm32f4discovery/include/periph_conf.h b/boards/stm32f4discovery/include/periph_conf.h index 7e29a06864..515d0a8dcb 100644 --- a/boards/stm32f4discovery/include/periph_conf.h +++ b/boards/stm32f4discovery/include/periph_conf.h @@ -17,8 +17,8 @@ * @author Peter Kietzmann */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -409,5 +409,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/telosb/include/board-conf.h b/boards/telosb/include/board-conf.h index bdf1dc6198..aa24dffec7 100644 --- a/boards/telosb/include/board-conf.h +++ b/boards/telosb/include/board-conf.h @@ -6,8 +6,8 @@ * directory for more details. */ -#ifndef BOARD_CONF_H -#define BOARD_CONF_H +#ifndef BOARD_CONF_H_ +#define BOARD_CONF_H_ #ifdef __cplusplus extern "C" { diff --git a/boards/telosb/include/board.h b/boards/telosb/include/board.h index c5ff8ac940..37f148ce37 100644 --- a/boards/telosb/include/board.h +++ b/boards/telosb/include/board.h @@ -23,8 +23,8 @@ * @author Oliver Hahm */ -#ifndef _TELOSB_BOARD_H -#define _TELOSB_BOARD_H +#ifndef TELOSB_BOARD_H_ +#define TELOSB_BOARD_H_ #ifdef __cplusplus extern "C" { @@ -70,4 +70,4 @@ extern "C" { typedef uint8_t radio_packet_length_t; /** @} */ -#endif // _TELOSB_BOARD_H +#endif // TELOSB_BOARD_H_ diff --git a/boards/telosb/include/periph_conf.h b/boards/telosb/include/periph_conf.h index ff1db5a34f..e5626ec493 100644 --- a/boards/telosb/include/periph_conf.h +++ b/boards/telosb/include/periph_conf.h @@ -16,9 +16,9 @@ * @author Oliver Hahm */ -#ifndef PERIPH_CONF_H -#define PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */ -#endif /* PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/udoo/include/board.h b/boards/udoo/include/board.h index 224c468b43..fff203b064 100644 --- a/boards/udoo/include/board.h +++ b/boards/udoo/include/board.h @@ -18,8 +18,8 @@ * @author Hauke Petersen */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" #include "cpu_conf.h" @@ -82,5 +82,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/udoo/include/periph_conf.h b/boards/udoo/include/periph_conf.h index 5c49bf3adc..52b31e739f 100644 --- a/boards/udoo/include/periph_conf.h +++ b/boards/udoo/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -347,5 +347,5 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ /** @} */ diff --git a/boards/wsn430-common/include/board-conf.h b/boards/wsn430-common/include/board-conf.h index c6985226db..cff1c02246 100644 --- a/boards/wsn430-common/include/board-conf.h +++ b/boards/wsn430-common/include/board-conf.h @@ -18,8 +18,8 @@ * @author unknown */ -#ifndef BOARD_CONF_H -#define BOARD_CONF_H +#ifndef BOARD_CONF_H_ +#define BOARD_CONF_H_ #include diff --git a/boards/wsn430-common/include/periph_conf.h b/boards/wsn430-common/include/periph_conf.h index 16a2f385f2..39305bbb3d 100644 --- a/boards/wsn430-common/include/periph_conf.h +++ b/boards/wsn430-common/include/periph_conf.h @@ -16,9 +16,9 @@ * @author Oliver Hahm */ -#ifndef PERIPH_CONF_H -#define PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */ -#endif /* PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/wsn430-v1_3b/include/board.h b/boards/wsn430-v1_3b/include/board.h index 685a0f58d8..d5fe423860 100644 --- a/boards/wsn430-v1_3b/include/board.h +++ b/boards/wsn430-v1_3b/include/board.h @@ -23,8 +23,8 @@ * @author Milan Babel */ -#ifndef _WSN_BOARD_H -#define _WSN_BOARD_H +#ifndef WSN_BOARD_H_ +#define WSN_BOARD_H_ #include "board-conf.h" @@ -72,4 +72,4 @@ extern "C" { typedef uint8_t radio_packet_length_t; /** @} */ -#endif // _WSN_BOARD_H +#endif // WSN_BOARD_H_ diff --git a/boards/wsn430-v1_4/include/board.h b/boards/wsn430-v1_4/include/board.h index 409d5d3dc4..f72f7bfee2 100644 --- a/boards/wsn430-v1_4/include/board.h +++ b/boards/wsn430-v1_4/include/board.h @@ -23,8 +23,8 @@ * @author Milan Babel */ -#ifndef _WSN_BOARD_H -#define _WSN_BOARD_H +#ifndef WSN_BOARD_H_ +#define WSN_BOARD_H_ #include "board-conf.h" @@ -72,4 +72,4 @@ extern "C" { typedef uint8_t radio_packet_length_t; /** @} */ -#endif // _WSN_BOARD_H +#endif // WSN_BOARD_H_ diff --git a/boards/x86-multiboot-common/include/multiboot.h b/boards/x86-multiboot-common/include/multiboot.h index c7802af734..44e629d69a 100644 --- a/boards/x86-multiboot-common/include/multiboot.h +++ b/boards/x86-multiboot-common/include/multiboot.h @@ -25,8 +25,8 @@ * @brief Architecture specific definitions for multiboot enabled kernels */ -#ifndef MULTIBOOT_H -#define MULTIBOOT_H +#ifndef MULTIBOOT_H_ +#define MULTIBOOT_H_ #ifdef __cplusplus extern "C" { diff --git a/boards/yunjia-nrf51822/include/board.h b/boards/yunjia-nrf51822/include/board.h index 1fd47cbe70..6cbf25ab20 100644 --- a/boards/yunjia-nrf51822/include/board.h +++ b/boards/yunjia-nrf51822/include/board.h @@ -18,8 +18,8 @@ * @author Hauke Petersen */ -#ifndef __BOARD_H -#define __BOARD_H +#ifndef BOARD_H_ +#define BOARD_H_ #include "cpu.h" @@ -72,5 +72,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /** BOARD_H_ */ /** @} */ diff --git a/boards/yunjia-nrf51822/include/periph_conf.h b/boards/yunjia-nrf51822/include/periph_conf.h index d4144a17b8..a69d8cc3fb 100644 --- a/boards/yunjia-nrf51822/include/periph_conf.h +++ b/boards/yunjia-nrf51822/include/periph_conf.h @@ -16,8 +16,8 @@ * @author Hauke Petersen */ -#ifndef __PERIPH_CONF_H -#define __PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ #ifdef __cplusplus extern "C" { @@ -168,4 +168,4 @@ extern "C" { } #endif -#endif /* __PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ diff --git a/boards/z1/include/board-conf.h b/boards/z1/include/board-conf.h index 3031846d7a..0a97ea2215 100644 --- a/boards/z1/include/board-conf.h +++ b/boards/z1/include/board-conf.h @@ -6,8 +6,8 @@ * directory for more details. */ -#ifndef BOARD_CONF_H -#define BOARD_CONF_H +#ifndef BOARD_CONF_H_ +#define BOARD_CONF_H_ /** * @ingroup boards_z1 diff --git a/boards/z1/include/board.h b/boards/z1/include/board.h index 3dcf3d02b0..6f3c320736 100644 --- a/boards/z1/include/board.h +++ b/boards/z1/include/board.h @@ -7,8 +7,8 @@ * directory for more details. */ -#ifndef _Z1_BOARD_H -#define _Z1_BOARD_H +#ifndef Z1_BOARD_H_ +#define Z1_BOARD_H_ /** * @defgroup boards_z1 Zolertia Z1 @@ -83,4 +83,4 @@ typedef uint8_t radio_packet_length_t; #endif /** @} */ -#endif // _Z1_BOARD_H +#endif // Z1_BOARD_H_ diff --git a/boards/z1/include/periph_conf.h b/boards/z1/include/periph_conf.h index 3f77da85c1..a7b7994801 100644 --- a/boards/z1/include/periph_conf.h +++ b/boards/z1/include/periph_conf.h @@ -16,9 +16,9 @@ * @author Oliver Hahm */ -#ifndef PERIPH_CONF_H -#define PERIPH_CONF_H +#ifndef PERIPH_CONF_H_ +#define PERIPH_CONF_H_ /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */ -#endif /* PERIPH_CONF_H */ +#endif /* PERIPH_CONF_H_ */ From 5ca37400b83a080e85d47799f277583e547790f5 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Tue, 26 May 2015 19:42:44 +0200 Subject: [PATCH 2/6] boards: remove all C++ comments --- boards/avsextrem/include/smb380-board.h | 72 +++++++++---------- boards/avsextrem/include/ssp0-board.h | 8 +-- boards/msb-430/include/board.h | 6 +- .../drivers/include/sht11-board.h | 14 ++-- boards/msba2-common/include/msba2_common.h | 2 +- boards/msba2-common/tools/src/chipinfo.h | 20 +++--- boards/msba2-common/tools/src/control_2xxx.h | 2 +- boards/msba2-common/tools/src/lpc2k_pgm.h | 2 +- boards/msba2-common/tools/src/serial.h | 2 +- boards/redbee-econotag/drivers/include/nvm.h | 2 +- boards/redbee-econotag/include/board.h | 2 +- boards/telosb/include/board.h | 6 +- boards/wsn430-v1_4/include/board.h | 6 +- boards/z1/include/board.h | 8 +-- 14 files changed, 76 insertions(+), 76 deletions(-) diff --git a/boards/avsextrem/include/smb380-board.h b/boards/avsextrem/include/smb380-board.h index b3db576afa..03e0e34dc6 100644 --- a/boards/avsextrem/include/smb380-board.h +++ b/boards/avsextrem/include/smb380-board.h @@ -34,9 +34,9 @@ extern "C" { #define MSG_TYPE_SMB380_WAKEUP 814 -#define SMB380_X_AXIS 0 //X Axis-Name -#define SMB380_Y_AXIS 1 //Y Axis-Name -#define SMB380_Z_AXIS 2 //Z Axis-Name +#define SMB380_X_AXIS 0 /* X Axis-Name */ +#define SMB380_Y_AXIS 1 /* Y Axis-Name */ +#define SMB380_Z_AXIS 2 /* Z Axis-Name */ #define LPM_PREVENT_SLEEP_ACCSENSOR BIT2 @@ -47,8 +47,8 @@ enum SMB380_MODE { SMB380_THRESHOLD, SMB380_FALSEALERT }; -//volatile enum SMB380_MODE -volatile enum SMB380_MODE smb380_mode;// = SMB380_POLL; +/* volatile enum SMB380_MODE */ +volatile enum SMB380_MODE smb380_mode;/* = SMB380_POLL; */ /* Writeable values to EEPROM: from 0x0A (control1) to 0x1D (offset_T). For writing enable ... flag and add eeprom_offset_address. @@ -58,32 +58,32 @@ volatile enum SMB380_MODE smb380_mode;// = SMB380_POLL; */ #define SMB380_EEPROM_OFFSET 0x20 -//Chip-ID Bit0-2, default: 010b +/* Chip-ID Bit0-2, default: 010b */ #define SMB380_CHIP_ID 0x00 -//Chip-ID mask +/* Chip-ID mask */ #define SMB380_CHIP_ID_MASK 0x07 -//ml_version Bit0-3 ; al_version Bit4-7 +/* ml_version Bit0-3 ; al_version Bit4-7 */ #define SMB380_AL_ML_VERSION 0x01 #define SMB380_AL_MASK 0xF0 #define SMB380_ML_MASK 0x0F -//LSB_acc_x Bit6-7; new_data_x Bit0 +/* LSB_acc_x Bit6-7; new_data_x Bit0 */ #define SMB380_ACC_X_LSB_NEWDATA 0x02 -//MSB_acc_x Bit0-7 +/* MSB_acc_x Bit0-7 */ #define SMB380_ACC_X_MSB 0x03 -//LSB_acc_y Bit6-7; new_data_y Bit0 +/* LSB_acc_y Bit6-7; new_data_y Bit0 */ #define SMB380_ACC_Y_LSB_NEWDATA 0x04 -//MSB_acc_y Bit0-7 +/* MSB_acc_y Bit0-7 */ #define SMB380_ACC_Y_MSB 0x05 -//LSB_acc_z Bit6-7; new_data_z Bit0 +/* LSB_acc_z Bit6-7; new_data_z Bit0 */ #define SMB380_ACC_Z_LSB_NEWDATA 0x06 -//MSB_acc_z Bit0-7 +/* MSB_acc_z Bit0-7 */ #define SMB380_ACC_Z_MSB 0x07 #define SMB380_ACC_LSB_MASK 0xC0 #define SMB380_ACC_MSB_MASK 0xFF #define SMB380_ACC_NEWDATA_MASK 0x01 -//Temperature Bit0-7 +/* Temperature Bit0-7 */ #define SMB380_TEMP 0x08 -//Status register, contains six flags +/* Status register, contains six flags */ #define SMB380_STATUS 0x09 #define SMB380_STATUS_ST_RESULT_MASK 0x80 #define SMB380_STATUS_ALERT_PHASE_MASK 0x10 @@ -91,7 +91,7 @@ volatile enum SMB380_MODE smb380_mode;// = SMB380_POLL; #define SMB380_STATUS_HG_LATCHED_MASK 0x04 #define SMB380_STATUS_STATUS_LG_MASK 0x02 #define SMB380_STATUS_STATUS_HG_MASK 0x01 -//Control register - contains seven values, default: x000 0000b +/* Control register - contains seven values, default: x000 0000b */ #define SMB380_CONTROL1 0x0A #define SMB380_CONTROL1_RESET_INT_MASK 0x40 #define SMB380_CONTROL1_UPDATE_MASK 0x20 @@ -100,7 +100,7 @@ volatile enum SMB380_MODE smb380_mode;// = SMB380_POLL; #define SMB380_CONTROL1_SELF_TEST_0_MASK 0x04 #define SMB380_CONTROL1_SOFT_RESET_MASK 0x02 #define SMB380_CONTROL1_SLEEP_MASK 0x01 -//Control register - contains six values, default: x000 0011b +/* Control register - contains six values, default: x000 0011b */ #define SMB380_CONTROL2 0x0B #define SMB380_CONTROL2_ALERT_MASK 0x80 #define SMB380_CONTROL2_ANY_MOTION_MASK 0x40 @@ -108,30 +108,30 @@ volatile enum SMB380_MODE smb380_mode;// = SMB380_POLL; #define SMB380_CONTROL2_COUNTER_LG_MASK 0x0C #define SMB380_CONTROL2_ENABLE_HG_MASK 0x02 #define SMB380_CONTROL2_ENABLE_LG_MASK 0x01 -//default: 20 +/* default: 20 */ #define SMB380_LG_THRES 0x0C -//default: 150 +/* default: 150 */ #define SMB380_LG_DUR 0x0D -//default: 160 +/* default: 160 */ #define SMB380_HG_THRES 0x0E -//default: 150 +/* default: 150 */ #define SMB380_HG_DUR 0x0F -//default: 0 +/* default: 0 */ #define SMB380_ANY_MOTION_THRES 0x10 -//default: 0000 0000b +/* default: 0000 0000b */ #define SMB380_ANY_MOTION_DUR_HYST 0x1 #define SMB380_ANY_MOTION_DUR_MASK 0xC0 #define SMB380_ANY_MOTION_DUR_HG_HYST_MASK 0x38 #define SMB380_ANY_MOTION_DUR_LG_HYST_MASK 0x07 -//default: 162 +/* default: 162 */ #define SMB380_CUST1 0x12 -//default: 13 +/* default: 13 */ #define SMB380_CUST2 0x13 -//default: xxx0 1110b +/* default: xxx0 1110b */ #define SMB380_CONTROL3 0x14 #define SMB380_CONTROL3_RANGE_MASK 0x18 #define SMB380_CONTROL3_BANDWITH_MASK 0x07 -//default: 1000 0000b +/* default: 1000 0000b */ #define SMB380_CONTROL4 0x15 #define SMB380_CONTROL4_SPI4_MASK 0x80 #define SMB380_CONTROL4_ENABLE_ADV_INT_MASK 0x40 @@ -171,9 +171,9 @@ volatile enum SMB380_MODE smb380_mode;// = SMB380_POLL; #define SMB380_BAND_WIDTH_375HZ 0x04 #define SMB380_BAND_WIDTH_750HZ 0x05 #define SMB380_BAND_WIDTH_1500HZ 0x06 -//SMB380_RING_BUFF_SIZE * int16_t (2Byte) * 4 (x,y,z,Temp) = 512 Byte (for 64) +/* SMB380_RING_BUFF_SIZE * int16_t (2Byte) * 4 (x,y,z,Temp) = 512 Byte (for 64) */ #define SMB380_RING_BUFF_SIZE 256 -//TODO chsnge size to 2048 +/* TODO chsnge size to 2048 */ #define SMB380_RING_BUFF_MAX_THREADS 10 #define SMB380_SAMPLE_RATE_MAX 3000 @@ -192,15 +192,15 @@ void SMB380_update_image(void); * enable write to 0x16 to 0x3D **/ void SMB380_enable_eeprom_default(void); -//Example Hysterese function +/* Example Hysterese function */ uint8_t SMB380_HystereseFunctionSample(int16_t *value); -//Simple api for single-sample, single thread interrupt mode +/* Simple api for single-sample, single thread interrupt mode */ uint8_t SMB380_init_simple(uint16_t samplerate, uint8_t bandwidth, uint8_t range); -//Enables Interrupts (normally only once called) +/* Enables Interrupts (normally only once called) */ uint8_t SMB380_init(uint8_t (*func)(int16_t *)); void SMB380_setSampleRate(uint16_t rate); uint16_t SMB380_getSampleRate(void); @@ -214,7 +214,7 @@ uint8_t checkRange(int16_t *value); void SMB380_enableEEPROM(void); void SMB380_disableEEPROM(void); -// getter +/* getter */ float SMB380_getSampleRatio(void); void SMB380_getAcceleration(unsigned char axis, int16_t *pAbs, int16_t *pMg); int16_t SMB380_getTemperature(void); @@ -229,7 +229,7 @@ unsigned char SMB380_readOffsetTemp(uint16_t *offset); unsigned char SMB380_readGain(uint16_t *gain); unsigned char SMB380_readGainTemp(uint16_t *gain); -// setter +/* setter */ void SMB380_setTempOffset(uint16_t offset, uint8_t EEPROM); void SMB380_setWakeUpPause(unsigned char duration); void SMB380_setBandWidth(unsigned char bandWidth); @@ -250,7 +250,7 @@ void SMB380_resetInterruptFlags(void); void SMB380_writeOffset(uint16_t *offset, uint8_t EEPROM); void SMB380_writeOffsetTemp(uint16_t *offset, uint8_t EEPROM); -// stats +/* stats */ void SMB380_ShowMemory(void); void SMB380_Selftest_1(void); diff --git a/boards/avsextrem/include/ssp0-board.h b/boards/avsextrem/include/ssp0-board.h index 3a5212ce10..083b7f2bb3 100644 --- a/boards/avsextrem/include/ssp0-board.h +++ b/boards/avsextrem/include/ssp0-board.h @@ -56,13 +56,13 @@ extern "C" { #define FIFOSIZE 8 /* SSP select pin */ -#define SSP0_SEL 1 << 21 //P1.21 SMB380 +#define SSP0_SEL 1 << 21 /* P1.21 SMB380 */ -#define SSP0_SELN 1 << 16 //P0.16 Nanotron +#define SSP0_SELN 1 << 16 /* P0.16 Nanotron */ /* SSP1 external interrupt Pin (SMB380 specific) */ -#define SMB380_INT1 1 << 1 //P0.1 -#define BMA180_INT1 1 << 8 //P2.8 +#define SMB380_INT1 1 << 1 /* P0.1 */ +#define BMA180_INT1 1 << 8 /* P2.8 */ diff --git a/boards/msb-430/include/board.h b/boards/msb-430/include/board.h index 2bad4640e9..d5ed87b9fa 100644 --- a/boards/msb-430/include/board.h +++ b/boards/msb-430/include/board.h @@ -32,12 +32,12 @@ extern "C" { #endif -// for correct inclusion of +/* for correct inclusion of */ #ifndef __MSP430F1612__ #define __MSP430F1612__ #endif -//MSB430 core +/* MSB430 core */ #define MSP430_INITIAL_CPU_SPEED 2457600uL #define F_CPU MSP430_INITIAL_CPU_SPEED #define F_RC_OSCILLATOR 32768 @@ -64,4 +64,4 @@ extern "C" { typedef uint8_t radio_packet_length_t; /** @} */ -#endif // MSB_BOARD_H_ +#endif /* MSB_BOARD_H_ */ diff --git a/boards/msba2-common/drivers/include/sht11-board.h b/boards/msba2-common/drivers/include/sht11-board.h index 1919d0071c..c9d6d019d9 100644 --- a/boards/msba2-common/drivers/include/sht11-board.h +++ b/boards/msba2-common/drivers/include/sht11-board.h @@ -31,13 +31,13 @@ extern "C" { #endif -#define SHT11_SCK_LOW FIO1CLR = BIT25; // serial clock line low -#define SHT11_SCK_HIGH FIO1SET = BIT25; // serial clock line high -#define SHT11_DATA ((FIO1PIN & BIT26) != 0) // read serial I/O -#define SHT11_DATA_LOW (FIO1CLR = BIT26); // serial I/O line low -#define SHT11_DATA_HIGH (FIO1SET = BIT26); // serial I/O line high -#define SHT11_DATA_IN (FIO1DIR &= ~BIT26) // serial I/O as input -#define SHT11_DATA_OUT (FIO1DIR |= BIT26) // serial I/O as output +#define SHT11_SCK_LOW FIO1CLR = BIT25; /* serial clock line low */ +#define SHT11_SCK_HIGH FIO1SET = BIT25; /* serial clock line high */ +#define SHT11_DATA ((FIO1PIN & BIT26) != 0) /* read serial I/O */ +#define SHT11_DATA_LOW (FIO1CLR = BIT26); /* serial I/O line low */ +#define SHT11_DATA_HIGH (FIO1SET = BIT26); /* serial I/O line high */ +#define SHT11_DATA_IN (FIO1DIR &= ~BIT26) /* serial I/O as input */ +#define SHT11_DATA_OUT (FIO1DIR |= BIT26) /* serial I/O as output */ #define SHT11_INIT FIO1DIR |= BIT25; PINSEL3 &= ~(BIT14|BIT15 | BIT16|BIT17); #ifdef __cplusplus diff --git a/boards/msba2-common/include/msba2_common.h b/boards/msba2-common/include/msba2_common.h index 0a0fd71714..9b8d3fada2 100644 --- a/boards/msba2-common/include/msba2_common.h +++ b/boards/msba2-common/include/msba2_common.h @@ -41,4 +41,4 @@ static inline void pllfeed(void) #endif /** @} */ -#endif // MSBA2_COMMON_H_ +#endif /* MSBA2_COMMON_H_ */ diff --git a/boards/msba2-common/tools/src/chipinfo.h b/boards/msba2-common/tools/src/chipinfo.h index 5b575262af..3d29c342ba 100644 --- a/boards/msba2-common/tools/src/chipinfo.h +++ b/boards/msba2-common/tools/src/chipinfo.h @@ -18,19 +18,19 @@ extern char *lpc_return_strings[]; -struct sector_info_struct { // an array of - int address; // where each sector is located - int size; // and how big it is +struct sector_info_struct { /* an array of */ + int address; /* where each sector is located */ + int size; /* and how big it is */ }; struct chip_info_struct { - char *part_number; // human readable part number - char *id_string; // id string sent by "J" command - unsigned int ram_addr; // where to download into RAM - int chunk_size; // download to ram chunk size - int num_sector; // number of flash sectors - struct sector_info_struct *layout; // layout of sectors - const unsigned int *bootprog; // code that boots into user program (NULL = DTR/RTS only) + char *part_number; /* human readable part number */ + char *id_string; /* id string sent by "J" command */ + unsigned int ram_addr; /* where to download into RAM */ + int chunk_size; /* download to ram chunk size */ + int num_sector; /* number of flash sectors */ + struct sector_info_struct *layout; /* layout of sectors */ + const unsigned int *bootprog; /* code that boots into user program (NULL = DTR/RTS only) */ }; extern struct chip_info_struct chip_info[]; diff --git a/boards/msba2-common/tools/src/control_2xxx.h b/boards/msba2-common/tools/src/control_2xxx.h index 9b0598a6fd..54dcdac814 100644 --- a/boards/msba2-common/tools/src/control_2xxx.h +++ b/boards/msba2-common/tools/src/control_2xxx.h @@ -22,4 +22,4 @@ void hard_reset_to_bootloader(void); void hard_reset_to_user_code(void); -#endif // ..._H_ +#endif /* ..._H_ */ diff --git a/boards/msba2-common/tools/src/lpc2k_pgm.h b/boards/msba2-common/tools/src/lpc2k_pgm.h index 28fcff314e..1f6fc0ef9e 100644 --- a/boards/msba2-common/tools/src/lpc2k_pgm.h +++ b/boards/msba2-common/tools/src/lpc2k_pgm.h @@ -27,4 +27,4 @@ void change_baud(const char *baud_name); */ void signal_terminal(void); -#endif // LPC2K_PGM +#endif /* LPC2K_PGM */ diff --git a/boards/msba2-common/tools/src/serial.h b/boards/msba2-common/tools/src/serial.h index 27f0ac3b9b..dc50afad6d 100644 --- a/boards/msba2-common/tools/src/serial.h +++ b/boards/msba2-common/tools/src/serial.h @@ -34,4 +34,4 @@ void set_rts(int val); void set_dtr(int val); void change_baud(const char *baud_name); -#endif // SERIAL_H_ +#endif /* SERIAL_H_ */ diff --git a/boards/redbee-econotag/drivers/include/nvm.h b/boards/redbee-econotag/drivers/include/nvm.h index f08c9fb93c..a4694c000c 100644 --- a/boards/redbee-econotag/drivers/include/nvm.h +++ b/boards/redbee-econotag/drivers/include/nvm.h @@ -62,4 +62,4 @@ extern void(*nvm_setsvar)(uint32_t zero_for_awesome); } #endif -#endif //NVM_H_ +#endif /* NVM_H_ */ diff --git a/boards/redbee-econotag/include/board.h b/boards/redbee-econotag/include/board.h index cd02b15013..516a212c53 100644 --- a/boards/redbee-econotag/include/board.h +++ b/boards/redbee-econotag/include/board.h @@ -27,7 +27,7 @@ extern "C" { #endif -#define F_CPU (24000000) ///< CPU target speed in Hz +#define F_CPU (24000000) /* /< CPU target speed in Hz */ #define CTUNE 0xb #define IBIAS 0x1f diff --git a/boards/telosb/include/board.h b/boards/telosb/include/board.h index 37f148ce37..3176092d82 100644 --- a/boards/telosb/include/board.h +++ b/boards/telosb/include/board.h @@ -30,12 +30,12 @@ extern "C" { #endif -// for correct inclusion of +/* for correct inclusion of */ #ifndef __MSP430F1611__ #define __MSP430F1611__ #endif -//TelosB core +/* TelosB core */ #define MSP430_INITIAL_CPU_SPEED 2457600uL #define F_CPU MSP430_INITIAL_CPU_SPEED #define F_RC_OSCILLATOR 32768 @@ -70,4 +70,4 @@ extern "C" { typedef uint8_t radio_packet_length_t; /** @} */ -#endif // TELOSB_BOARD_H_ +#endif /* TELOSB_BOARD_H_ */ diff --git a/boards/wsn430-v1_4/include/board.h b/boards/wsn430-v1_4/include/board.h index f72f7bfee2..f29d73977a 100644 --- a/boards/wsn430-v1_4/include/board.h +++ b/boards/wsn430-v1_4/include/board.h @@ -32,12 +32,12 @@ extern "C" { #endif -// for correct inclusion of +/* for correct inclusion of */ #ifndef __MSP430F1611__ #define __MSP430F1611__ #endif -//MSB430 core +/* MSB430 core */ #define MSP430_INITIAL_CPU_SPEED 800000uL #define F_CPU MSP430_INITIAL_CPU_SPEED #define F_RC_OSCILLATOR 32768 @@ -72,4 +72,4 @@ extern "C" { typedef uint8_t radio_packet_length_t; /** @} */ -#endif // WSN_BOARD_H_ +#endif /* WSN_BOARD_H_ */ diff --git a/boards/z1/include/board.h b/boards/z1/include/board.h index 6f3c320736..f317ad23e5 100644 --- a/boards/z1/include/board.h +++ b/boards/z1/include/board.h @@ -40,7 +40,7 @@ extern "C" { #define __MSP430F2617__ #endif -// MSP430 core +/* MSP430 core */ #define MSP430_INITIAL_CPU_SPEED 8000000uL #ifndef F_CPU #define F_CPU MSP430_INITIAL_CPU_SPEED @@ -49,7 +49,7 @@ extern "C" { #define MSP430_HAS_DCOR 0 #define MSP430_HAS_EXTERNAL_CRYSTAL 1 -// LEDs ports +/* LEDs ports */ #define LEDS_PxDIR P5DIR #define LEDS_PxOUT P5OUT #define LEDS_CONF_RED 0x10 @@ -69,7 +69,7 @@ extern "C" { #define LED_BLUE_TOGGLE LEDS_PxOUT ^= LEDS_CONF_BLUE -// User-button port +/* User-button port */ #define USER_BTN_PxIN P2IN #define USER_BTN_MASK 0x20 @@ -83,4 +83,4 @@ typedef uint8_t radio_packet_length_t; #endif /** @} */ -#endif // Z1_BOARD_H_ +#endif /* Z1_BOARD_H_ */ From 49d415389276f7209a11bc5711c02e80e79fe35c Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Tue, 26 May 2015 19:44:15 +0200 Subject: [PATCH 3/6] msb-430h: removed superfluous #endif --- boards/msb-430h/include/periph_conf.h | 1 - 1 file changed, 1 deletion(-) diff --git a/boards/msb-430h/include/periph_conf.h b/boards/msb-430h/include/periph_conf.h index b742d02f1b..dab91a33f1 100644 --- a/boards/msb-430h/include/periph_conf.h +++ b/boards/msb-430h/include/periph_conf.h @@ -22,4 +22,3 @@ /* make Travis happy: #ifdef __cplusplus extern "C" { #endif */ #endif /* PERIPH_CONF_H_ */ -#endif /* PERIPH_CONF_H */ From 5312ae998b9350fa9ae47a2210041298c767018c Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Tue, 26 May 2015 22:03:40 +0200 Subject: [PATCH 4/6] boards: removed incorrect doxygen comment markers --- boards/airfy-beacon/include/board.h | 2 +- boards/arduino-due/include/board.h | 2 +- boards/arduino-mega2560/include/board.h | 2 +- boards/cc2538dk/include/board.h | 2 +- boards/f4vi1/include/board.h | 2 +- boards/msbiot/include/board.h | 2 +- boards/openmote/include/board.h | 2 +- boards/pba-d-01-kw2x/include/board.h | 2 +- boards/pca10000/include/board.h | 2 +- boards/pca10005/include/board.h | 2 +- boards/samr21-xpro/include/board.h | 2 +- boards/stm32f0discovery/include/board.h | 2 +- boards/stm32f3discovery/include/board.h | 2 +- boards/stm32f4discovery/include/board.h | 2 +- boards/udoo/include/board.h | 2 +- boards/yunjia-nrf51822/include/board.h | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/boards/airfy-beacon/include/board.h b/boards/airfy-beacon/include/board.h index f5cb41a1ad..46e95d571d 100644 --- a/boards/airfy-beacon/include/board.h +++ b/boards/airfy-beacon/include/board.h @@ -67,5 +67,5 @@ void board_init(void); } /* end extern "C" */ #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/arduino-due/include/board.h b/boards/arduino-due/include/board.h index 29029e72ba..da696b2f4a 100644 --- a/boards/arduino-due/include/board.h +++ b/boards/arduino-due/include/board.h @@ -80,5 +80,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/arduino-mega2560/include/board.h b/boards/arduino-mega2560/include/board.h index 1fe89231bf..ea6fe3b0cb 100644 --- a/boards/arduino-mega2560/include/board.h +++ b/boards/arduino-mega2560/include/board.h @@ -83,5 +83,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/cc2538dk/include/board.h b/boards/cc2538dk/include/board.h index b82526e96f..c8ae9a156c 100644 --- a/boards/cc2538dk/include/board.h +++ b/boards/cc2538dk/include/board.h @@ -100,5 +100,5 @@ void board_init(void); } /* end extern "C" */ #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/f4vi1/include/board.h b/boards/f4vi1/include/board.h index f7f7fbb786..4e264cbd25 100644 --- a/boards/f4vi1/include/board.h +++ b/boards/f4vi1/include/board.h @@ -94,5 +94,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/msbiot/include/board.h b/boards/msbiot/include/board.h index 4ca982d43c..6105f2489c 100644 --- a/boards/msbiot/include/board.h +++ b/boards/msbiot/include/board.h @@ -105,5 +105,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/openmote/include/board.h b/boards/openmote/include/board.h index e1db0aaa2a..86ed21c1ce 100644 --- a/boards/openmote/include/board.h +++ b/boards/openmote/include/board.h @@ -88,5 +88,5 @@ void board_init(void); } /* end extern "C" */ #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/pba-d-01-kw2x/include/board.h b/boards/pba-d-01-kw2x/include/board.h index 9cf3d50231..88a3bf1c14 100644 --- a/boards/pba-d-01-kw2x/include/board.h +++ b/boards/pba-d-01-kw2x/include/board.h @@ -110,5 +110,5 @@ void board_init(void); } #endif -#endif /** __BOARD_H */ +#endif /* __BOARD_H */ /** @} */ diff --git a/boards/pca10000/include/board.h b/boards/pca10000/include/board.h index 2ce721e230..b46178eb70 100644 --- a/boards/pca10000/include/board.h +++ b/boards/pca10000/include/board.h @@ -82,5 +82,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/pca10005/include/board.h b/boards/pca10005/include/board.h index 1a358c7dae..a1a36a3744 100644 --- a/boards/pca10005/include/board.h +++ b/boards/pca10005/include/board.h @@ -73,5 +73,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/samr21-xpro/include/board.h b/boards/samr21-xpro/include/board.h index 1c7beceac9..8eae84cf88 100644 --- a/boards/samr21-xpro/include/board.h +++ b/boards/samr21-xpro/include/board.h @@ -113,5 +113,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/stm32f0discovery/include/board.h b/boards/stm32f0discovery/include/board.h index fc1dac3054..471d59253f 100644 --- a/boards/stm32f0discovery/include/board.h +++ b/boards/stm32f0discovery/include/board.h @@ -82,5 +82,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/stm32f3discovery/include/board.h b/boards/stm32f3discovery/include/board.h index 5c5d047534..e1ff8e5e93 100644 --- a/boards/stm32f3discovery/include/board.h +++ b/boards/stm32f3discovery/include/board.h @@ -107,5 +107,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/stm32f4discovery/include/board.h b/boards/stm32f4discovery/include/board.h index b33960044e..e64a03876f 100644 --- a/boards/stm32f4discovery/include/board.h +++ b/boards/stm32f4discovery/include/board.h @@ -93,5 +93,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/udoo/include/board.h b/boards/udoo/include/board.h index fff203b064..a1852ddd63 100644 --- a/boards/udoo/include/board.h +++ b/boards/udoo/include/board.h @@ -82,5 +82,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ diff --git a/boards/yunjia-nrf51822/include/board.h b/boards/yunjia-nrf51822/include/board.h index 6cbf25ab20..c1b7098581 100644 --- a/boards/yunjia-nrf51822/include/board.h +++ b/boards/yunjia-nrf51822/include/board.h @@ -72,5 +72,5 @@ void board_init(void); } #endif -#endif /** BOARD_H_ */ +#endif /* BOARD_H_ */ /** @} */ From 140afc3800858a88d6391896ed1780e41b0d403e Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Wed, 3 Jun 2015 11:45:52 +0200 Subject: [PATCH 5/6] boards: cosmetics --- boards/avsextrem/include/smb380-board.h | 7 ++---- boards/avsextrem/include/ssp0-board.h | 6 ++--- boards/msb-430h/include/board.h | 4 ++-- .../drivers/include/sht11-board.h | 22 +++++++++++++------ boards/msba2-common/tools/src/chipinfo.h | 19 ++++++++-------- boards/msba2-common/tools/src/control_2xxx.h | 6 ++--- boards/msba2-common/tools/src/lpc2k_pgm.h | 6 ++--- boards/qemu-i386/include/board.h | 4 ++-- boards/qemu-i386/include/cpu_conf.h | 4 ++-- boards/redbee-econotag/include/board.h | 2 +- boards/wsn430-v1_3b/include/board.h | 2 +- .../x86-multiboot-common/include/multiboot.h | 2 +- 12 files changed, 45 insertions(+), 39 deletions(-) diff --git a/boards/avsextrem/include/smb380-board.h b/boards/avsextrem/include/smb380-board.h index 03e0e34dc6..6e5a9f1249 100644 --- a/boards/avsextrem/include/smb380-board.h +++ b/boards/avsextrem/include/smb380-board.h @@ -15,9 +15,6 @@ * * @author Marco Ziegert * @author Zakaria Kasmi - * @version $Revision: 3854 $ - * - * @note $Id: msba2acc-smb380.h 3854 2010-01-18 15:27:01 kasmi $ * */ @@ -47,8 +44,8 @@ enum SMB380_MODE { SMB380_THRESHOLD, SMB380_FALSEALERT }; -/* volatile enum SMB380_MODE */ -volatile enum SMB380_MODE smb380_mode;/* = SMB380_POLL; */ + +volatile enum SMB380_MODE smb380_mode; /* Writeable values to EEPROM: from 0x0A (control1) to 0x1D (offset_T). For writing enable ... flag and add eeprom_offset_address. diff --git a/boards/avsextrem/include/ssp0-board.h b/boards/avsextrem/include/ssp0-board.h index 083b7f2bb3..d48c1b5b51 100644 --- a/boards/avsextrem/include/ssp0-board.h +++ b/boards/avsextrem/include/ssp0-board.h @@ -19,8 +19,8 @@ * * @note $Id: avsextrem-ssp0.c 3854 2010-01-18 15:27:01Z zkasmi $ */ -#ifndef SSP_H__ -#define SSP_H__ +#ifndef SSP_H_ +#define SSP_H_ #include "stdint.h" @@ -122,4 +122,4 @@ void SSP0Handler(void); } #endif -#endif /* SSP_H__ */ +#endif /* SSP_H_ */ diff --git a/boards/msb-430h/include/board.h b/boards/msb-430h/include/board.h index b2780a68c2..435b65916b 100644 --- a/boards/msb-430h/include/board.h +++ b/boards/msb-430h/include/board.h @@ -25,7 +25,7 @@ extern "C" { #endif -// for correct inclusion of +/* for correct inclusion of */ #ifndef __MSP430F1612__ #define __MSP430F1612__ #endif @@ -57,4 +57,4 @@ extern "C" { typedef uint8_t radio_packet_length_t; /** @} */ -#endif // MSB_BOARD_H_ +#endif /* MSB_BOARD_H_ */ diff --git a/boards/msba2-common/drivers/include/sht11-board.h b/boards/msba2-common/drivers/include/sht11-board.h index c9d6d019d9..58451de622 100644 --- a/boards/msba2-common/drivers/include/sht11-board.h +++ b/boards/msba2-common/drivers/include/sht11-board.h @@ -31,13 +31,21 @@ extern "C" { #endif -#define SHT11_SCK_LOW FIO1CLR = BIT25; /* serial clock line low */ -#define SHT11_SCK_HIGH FIO1SET = BIT25; /* serial clock line high */ -#define SHT11_DATA ((FIO1PIN & BIT26) != 0) /* read serial I/O */ -#define SHT11_DATA_LOW (FIO1CLR = BIT26); /* serial I/O line low */ -#define SHT11_DATA_HIGH (FIO1SET = BIT26); /* serial I/O line high */ -#define SHT11_DATA_IN (FIO1DIR &= ~BIT26) /* serial I/O as input */ -#define SHT11_DATA_OUT (FIO1DIR |= BIT26) /* serial I/O as output */ +/* serial clock line low */ +#define SHT11_SCK_LOW FIO1CLR = BIT25; +/* serial clock line high */ +#define SHT11_SCK_HIGH FIO1SET = BIT25; +/* read serial I/O */ +#define SHT11_DATA ((FIO1PIN & BIT26) != 0) +/* serial I/O line low */ +#define SHT11_DATA_LOW (FIO1CLR = BIT26); +/* serial I/O line high */ +#define SHT11_DATA_HIGH (FIO1SET = BIT26); +/* serial I/O as input */ +#define SHT11_DATA_IN (FIO1DIR &= ~BIT26) +/* serial I/O as output */ +#define SHT11_DATA_OUT (FIO1DIR |= BIT26) + #define SHT11_INIT FIO1DIR |= BIT25; PINSEL3 &= ~(BIT14|BIT15 | BIT16|BIT17); #ifdef __cplusplus diff --git a/boards/msba2-common/tools/src/chipinfo.h b/boards/msba2-common/tools/src/chipinfo.h index 3d29c342ba..41c1a9cc46 100644 --- a/boards/msba2-common/tools/src/chipinfo.h +++ b/boards/msba2-common/tools/src/chipinfo.h @@ -18,19 +18,20 @@ extern char *lpc_return_strings[]; -struct sector_info_struct { /* an array of */ - int address; /* where each sector is located */ - int size; /* and how big it is */ +struct sector_info_struct { /* an array of */ + int address; /* where each sector is located */ + int size; /* and how big it is */ }; struct chip_info_struct { - char *part_number; /* human readable part number */ - char *id_string; /* id string sent by "J" command */ - unsigned int ram_addr; /* where to download into RAM */ - int chunk_size; /* download to ram chunk size */ - int num_sector; /* number of flash sectors */ + char *part_number; /* human readable part number */ + char *id_string; /* id string sent by "J" command */ + unsigned int ram_addr; /* where to download into RAM */ + int chunk_size; /* download to ram chunk size */ + int num_sector; /* number of flash sectors */ struct sector_info_struct *layout; /* layout of sectors */ - const unsigned int *bootprog; /* code that boots into user program (NULL = DTR/RTS only) */ + const unsigned int *bootprog; /* code that boots into user program + (NULL = DTR/RTS only) */ }; extern struct chip_info_struct chip_info[]; diff --git a/boards/msba2-common/tools/src/control_2xxx.h b/boards/msba2-common/tools/src/control_2xxx.h index 54dcdac814..d27d319748 100644 --- a/boards/msba2-common/tools/src/control_2xxx.h +++ b/boards/msba2-common/tools/src/control_2xxx.h @@ -16,10 +16,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef CONTROL_2XXXX_H_ -#define CONTROL_2XXXX_H_ +#ifndef CONTROL_2XXX_H_ +#define CONTROL_2XXX_H_ void hard_reset_to_bootloader(void); void hard_reset_to_user_code(void); -#endif /* ..._H_ */ +#endif /* CONTROL_2XXX_H_ */ diff --git a/boards/msba2-common/tools/src/lpc2k_pgm.h b/boards/msba2-common/tools/src/lpc2k_pgm.h index 1f6fc0ef9e..68b574489e 100644 --- a/boards/msba2-common/tools/src/lpc2k_pgm.h +++ b/boards/msba2-common/tools/src/lpc2k_pgm.h @@ -16,8 +16,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef LPC2K_PGM -#define LPC2K_PGM +#ifndef LPC2K_PGM_H_ +#define LPC2K_PGM_H /* gets a name like "115200", sets baudrate accordingly. */ void change_baud(const char *baud_name); @@ -27,4 +27,4 @@ void change_baud(const char *baud_name); */ void signal_terminal(void); -#endif /* LPC2K_PGM */ +#endif /* LPC2K_PGM_H_ */ diff --git a/boards/qemu-i386/include/board.h b/boards/qemu-i386/include/board.h index bee456c9d1..4d4f5948a0 100644 --- a/boards/qemu-i386/include/board.h +++ b/boards/qemu-i386/include/board.h @@ -18,8 +18,8 @@ * @author René Kijewski */ -#ifndef RIOT__BOARDS__QEMU_I386__BOARD__H_ -#define RIOT__BOARDS__QEMU_I386__BOARD__H_ +#ifndef RIOT_BOARDS_QEMU_I386_BOARD__H_ +#define RIOT_BOARDS_QEMU_I386_BOARD__H_ #ifdef __cplusplus extern "C" { diff --git a/boards/qemu-i386/include/cpu_conf.h b/boards/qemu-i386/include/cpu_conf.h index 3dbe9a4653..2b7b9768c2 100644 --- a/boards/qemu-i386/include/cpu_conf.h +++ b/boards/qemu-i386/include/cpu_conf.h @@ -16,8 +16,8 @@ * @author René Kijewski */ -#ifndef RIOT__BOARDS__QEMU_I386__CPU_CONF__H_ -#define RIOT__BOARDS__QEMU_I386__CPU_CONF__H_ +#ifndef RIOT_BOARDS_QEMU_I386_CPU_CONF_H_ +#define RIOT_BOARDS_QEMU_I386_CPU_CONF_H_ #ifdef __cplusplus extern "C" { diff --git a/boards/redbee-econotag/include/board.h b/boards/redbee-econotag/include/board.h index 516a212c53..964d60438d 100644 --- a/boards/redbee-econotag/include/board.h +++ b/boards/redbee-econotag/include/board.h @@ -27,7 +27,7 @@ extern "C" { #endif -#define F_CPU (24000000) /* /< CPU target speed in Hz */ +#define F_CPU (24000000) /**< CPU target speed in Hz */ #define CTUNE 0xb #define IBIAS 0x1f diff --git a/boards/wsn430-v1_3b/include/board.h b/boards/wsn430-v1_3b/include/board.h index d5fe423860..203ade22b2 100644 --- a/boards/wsn430-v1_3b/include/board.h +++ b/boards/wsn430-v1_3b/include/board.h @@ -72,4 +72,4 @@ extern "C" { typedef uint8_t radio_packet_length_t; /** @} */ -#endif // WSN_BOARD_H_ +#endif /* WSN_BOARD_H_ */ diff --git a/boards/x86-multiboot-common/include/multiboot.h b/boards/x86-multiboot-common/include/multiboot.h index 44e629d69a..8c9438088d 100644 --- a/boards/x86-multiboot-common/include/multiboot.h +++ b/boards/x86-multiboot-common/include/multiboot.h @@ -134,5 +134,5 @@ enum multiboot_info_flags { } #endif -#endif /* MULTIBOOT_H */ +#endif /* MULTIBOOT_H_ */ /** @} */ From 8c203a610b2f22965a3ff05755bc108e2261281f Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Wed, 3 Jun 2015 12:20:20 +0200 Subject: [PATCH 6/6] boards: fix qemu header guards --- boards/qemu-i386/include/board.h | 4 ++-- boards/qemu-i386/include/cpu_conf.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boards/qemu-i386/include/board.h b/boards/qemu-i386/include/board.h index 4d4f5948a0..d2cac19e32 100644 --- a/boards/qemu-i386/include/board.h +++ b/boards/qemu-i386/include/board.h @@ -18,8 +18,8 @@ * @author René Kijewski */ -#ifndef RIOT_BOARDS_QEMU_I386_BOARD__H_ -#define RIOT_BOARDS_QEMU_I386_BOARD__H_ +#ifndef QEMU_I386_BOARD_H_ +#define QEMU_I386_BOARD_H_ #ifdef __cplusplus extern "C" { diff --git a/boards/qemu-i386/include/cpu_conf.h b/boards/qemu-i386/include/cpu_conf.h index 2b7b9768c2..2a45a5ad2b 100644 --- a/boards/qemu-i386/include/cpu_conf.h +++ b/boards/qemu-i386/include/cpu_conf.h @@ -16,8 +16,8 @@ * @author René Kijewski */ -#ifndef RIOT_BOARDS_QEMU_I386_CPU_CONF_H_ -#define RIOT_BOARDS_QEMU_I386_CPU_CONF_H_ +#ifndef QEMU_I386_CPU_CONF_H_ +#define QEMU_I386_CPU_CONF_H_ #ifdef __cplusplus extern "C" {