Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

board cpu and core: header file include guards repaired #4626

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions boards/airfy-beacon/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* @author Christian Mehlis <mehlis@inf.fu-berlin.de>
*/

#ifndef BOARD_H_
#define BOARD_H_
#ifndef BOARD_H
#define BOARD_H

#include "cpu.h"

Expand Down
4 changes: 2 additions & 2 deletions boards/airfy-beacon/include/periph_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/

#ifndef PERIPH_CONF_H_
#define PERIPH_CONF_H_
#ifndef PERIPH_CONF_H
#define PERIPH_CONF_H

#include "periph_cpu.h"

Expand Down
6 changes: 3 additions & 3 deletions boards/chronos/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* @author unknwon
*/

#ifndef CHRONOS_BOARD_H_
#define CHRONOS_BOARD_H_
#ifndef CHRONOS_BOARD_H
#define CHRONOS_BOARD_H

#include <stdint.h>

Expand Down Expand Up @@ -58,5 +58,5 @@ extern "C" {
}
#endif

#endif /* _CHRONOS_BOARD_H_ */
#endif /* CHRONOS_BOARD_H */
/** @} */
6 changes: 3 additions & 3 deletions boards/msb-430/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,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_common.h"

Expand Down Expand Up @@ -65,4 +65,4 @@ extern "C" {
#endif

/** @} */
#endif /* MSB_BOARD_H_ */
#endif /* MSB_BOARD_H */
6 changes: 3 additions & 3 deletions boards/msb-430h/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/

#ifndef MSB_BOARD_H_
#define MSB_BOARD_H_
#ifndef MSB_BOARD_H
#define MSB_BOARD_H

#include "board_common.h"

Expand Down Expand Up @@ -53,4 +53,4 @@ extern "C" {
#endif

/** @} */
#endif /* MSB_BOARD_H_ */
#endif /* MSB_BOARD_H */
4 changes: 2 additions & 2 deletions boards/pca10000/include/periph_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/

#ifndef PERIPH_CONF_H_
#define PERIPH_CONF_H_
#ifndef PERIPH_CONF_H
#define PERIPH_CONF_H

#include "periph_cpu.h"

Expand Down
4 changes: 2 additions & 2 deletions boards/samr21-xpro/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* @author Thomas Eichinger <thomas.eichinger@fu-berlin.de>
*/

#ifndef BOARD_H_
#define BOARD_H_
#ifndef BOARD_H
#define BOARD_H

#include "cpu.h"
#include "periph_conf.h"
Expand Down
4 changes: 2 additions & 2 deletions boards/samr21-xpro/include/periph_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
* @author Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
*/

#ifndef PERIPH_CONF_H_
#define PERIPH_CONF_H_
#ifndef PERIPH_CONF_H
#define PERIPH_CONF_H

#include <stdint.h>

Expand Down
6 changes: 3 additions & 3 deletions boards/telosb/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/

#ifndef TELOSB_BOARD_H_
#define TELOSB_BOARD_H_
#ifndef TELOSB_BOARD_H
#define TELOSB_BOARD_H

#include "cpu.h"

Expand Down Expand Up @@ -104,4 +104,4 @@ extern "C" {
#endif

/** @} */
#endif /* TELOSB_BOARD_H_ */
#endif /* TELOSB_BOARD_H */
6 changes: 3 additions & 3 deletions boards/wsn430-v1_3b/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/

#ifndef WSN_BOARD_H_
#define WSN_BOARD_H_
#ifndef WSN_BOARD_H
#define WSN_BOARD_H

#include "board_common.h"

Expand Down Expand Up @@ -61,4 +61,4 @@ extern "C" {
#include <msp430x16x.h>

/** @} */
#endif /* WSN_BOARD_H_ */
#endif /* WSN_BOARD_H */
6 changes: 3 additions & 3 deletions boards/wsn430-v1_4/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/

#ifndef WSN_BOARD_H_
#define WSN_BOARD_H_
#ifndef WSN_BOARD_H
#define WSN_BOARD_H

#include "board_common.h"

Expand Down Expand Up @@ -61,4 +61,4 @@ extern "C" {
#include <msp430x16x.h>

/** @} */
#endif /* WSN_BOARD_H_ */
#endif /* WSN_BOARD_H */
4 changes: 2 additions & 2 deletions boards/yunjia-nrf51822/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/

#ifndef BOARD_H_
#define BOARD_H_
#ifndef BOARD_H
#define BOARD_H

#include "cpu.h"

Expand Down
4 changes: 2 additions & 2 deletions boards/yunjia-nrf51822/include/periph_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/

#ifndef PERIPH_CONF_H_
#define PERIPH_CONF_H_
#ifndef PERIPH_CONF_H
#define PERIPH_CONF_H

#include "periph_cpu.h"

Expand Down
6 changes: 3 additions & 3 deletions boards/z1/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -134,4 +134,4 @@ extern "C" {
#endif

/** @} */
#endif /* Z1_BOARD_H_ */
#endif /* Z1_BOARD_H */
6 changes: 3 additions & 3 deletions core/include/atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* @author Joakim Nohlgård <joakim.nohlgard@eistec.se>
*/

#ifndef ATOMIC_H_
#define ATOMIC_H_
#ifndef ATOMIC_H
#define ATOMIC_H

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -149,5 +149,5 @@ static inline int atomic_set_to_zero(atomic_int_t *var)
}
#endif

#endif /* ATOMIC_H_ */
#endif /* ATOMIC_H */
/** @} */
6 changes: 3 additions & 3 deletions core/include/bitarithm.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
* @author Martine Lenders <mlenders@inf.fu-berlin.de>
*/

#ifndef BITARITHM_H_
#define BITARITHM_H_
#ifndef BITARITHM_H
#define BITARITHM_H

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -122,5 +122,5 @@ unsigned bitarithm_bits_set(unsigned v);
}
#endif

#endif /* BITARITHM_H_ */
#endif /* BITARITHM_H */
/** @} */
6 changes: 3 additions & 3 deletions core/include/byteorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* @author René Kijewski <rene.kijewski@fu-berlin.de>
*/

#ifndef BYTEORDER_H_
#define BYTEORDER_H_
#ifndef BYTEORDER_H
#define BYTEORDER_H

#include <stdint.h>

Expand Down Expand Up @@ -422,5 +422,5 @@ static inline uint64_t NTOHLL(uint64_t v)
}
#endif

#endif /* BYTEORDER_H_ */
#endif /* BYTEORDER_H */
/** @} */
6 changes: 3 additions & 3 deletions core/include/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
* @author Freie Universität Berlin, Computer Systems & Telematics
*/

#ifndef IRQ_H_
#define IRQ_H_
#ifndef IRQ_H
#define IRQ_H

#include <stdbool.h>
#include "arch/irq_arch.h"
Expand Down Expand Up @@ -71,5 +71,5 @@ int irq_is_in(void);
}
#endif

#endif /* IRQ_H_ */
#endif /* IRQ_H */
/** @} */
72 changes: 72 additions & 0 deletions core/include/kernel.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/*
* Copyright (C) 2013 Freie Universität Berlin
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/

/**
* @addtogroup core_internal
* @{
*
* @file
* @brief Kernel compile time configuration
*
* A reboot() function is also provided
* (and used by core_panic() when needed).
*
* @author Kaspar Schleiser <kaspar@schleiser.de>
*/

#ifndef KERNEL_H
#define KERNEL_H

#include <stdbool.h>
#include <stdint.h>

#include "attributes.h"
#include "config.h"
#include "tcb.h"
#include "cpu.h"
#include "sched.h"
#include "cpu_conf.h"

#ifdef __cplusplus
extern "C" {
#endif

/* ------------------------------------------------------------------------- */

/**
* @def LPM_PREVENT_SLEEP_UART
* @brief This flag tells the kernel that the deepest power saving
* mode that currently can be used must still allow UART
* communication. Bitmask to use with `lpm_prevent_sleep`
* in power management.
*/
#define LPM_PREVENT_SLEEP_UART BIT2

/**
* @brief This bitfield is used to configure which modules are
* currently active and prevent the kernel to go to the
* deepest power modes. It is used with `LPM_PREVENT_SLEEP_HWTIMER`
* and/or `LPM_PREVENT_SLEEP_UART`.
*/
extern volatile int lpm_prevent_sleep;

/**
* @brief Variable used to store system configuration
*
* @details This contains e.g. the node ID, name, default channel and so on
*/
extern config_t sysconfig;

/* ------------------------------------------------------------------------- */

#ifdef __cplusplus
}
#endif

#endif /* KERNEL_H */
/** @} */
6 changes: 3 additions & 3 deletions core/include/kernel_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* @author René Kijewski <rene.kijewski@fu-berlin.de>
*/

#ifndef KERNEL_DEFINES_H_
#define KERNEL_DEFINES_H_
#ifndef KERNEL_DEFINES_H
#define KERNEL_DEFINES_H

#include <stddef.h>

Expand Down Expand Up @@ -118,5 +118,5 @@
}
#endif

#endif /* KERNEL_DEFINES_H_ */
#endif /* KERNEL_DEFINES_H */
/** @} */
6 changes: 3 additions & 3 deletions core/include/lifo.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* If you insert a value twice the LIFO will break.
*/

#ifndef LIFO_H_
#define LIFO_H_
#ifndef LIFO_H
#define LIFO_H

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -70,5 +70,5 @@ int lifo_get(int *array);
}
#endif

#endif /* LIFO_H_ */
#endif /* LIFO_H */
/** @} */
6 changes: 3 additions & 3 deletions core/include/lpm.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* @author Freie Universität Berlin, Computer Systems & Telematics
*/

#ifndef LPM_H_
#define LPM_H_
#ifndef LPM_H
#define LPM_H

#include "arch/lpm_arch.h"

Expand Down Expand Up @@ -73,5 +73,5 @@ extern volatile int lpm_prevent_sleep;
}
#endif

#endif /* __LPM_H_ */
#endif /* LPM_H */
/** @} */
Loading