Skip to content
Snippets Groups Projects
Commit 1fc2da15 authored by Hauke Petersen's avatar Hauke Petersen
Browse files

boards/wsn430: cleanup for common board.h

- renamed board-conf.h to board_common.h
- moved xtimer defines to board_common.h
parent 1d6d54e1
No related branches found
No related tags found
No related merge requests found
/* /*
* Copyright (C) 2013 Milan Babel <babel@inf.fu-berlin.de> * Copyright (C) 2013 Milan Babel <babel@inf.fu-berlin.de>
* 2016 Freie Universität Berlin
* *
* This file is subject to the terms and conditions of the GNU Lesser * 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 * General Public License v2.1. See the file LICENSE in the top level
...@@ -15,23 +16,37 @@ ...@@ -15,23 +16,37 @@
* @file * @file
* @brief Common definitions for WSN430 based boards * @brief Common definitions for WSN430 based boards
* *
* @author unknown * @author Milan Babel <babel@inf.fu-berlin.de>
* @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*
*/ */
#ifndef BOARD_CONF_H_ #ifndef BOARD_COMMON_H_
#define BOARD_CONF_H_ #define BOARD_COMMON_H_
#include <stdint.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/**
* @brief Address of the info memory
*/
#define INFOMEM (0x1000) #define INFOMEM (0x1000)
/**
* @brief Xtimer configuration
* @{
*/
#define XTIMER (0)
#define XTIMER_CHAN (0)
#define XTIMER_MASK (0xffff0000)
#define XTIMER_SHIFT_ON_COMPARE (4)
#define XTIMER_BACKOFF (40)
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* BOARD_COMMON_H_ */
/** @} */ /** @} */
#endif /* BOARD-CONF_H */
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#ifndef WSN_BOARD_H_ #ifndef WSN_BOARD_H_
#define WSN_BOARD_H_ #define WSN_BOARD_H_
#include "board-conf.h" #include "board_common.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -39,17 +39,6 @@ extern "C" { ...@@ -39,17 +39,6 @@ extern "C" {
#define __MSP430F1611__ #define __MSP430F1611__
#endif #endif
/**
* @brief Xtimer configuration
* @{
*/
#define XTIMER (0)
#define XTIMER_CHAN (0)
#define XTIMER_MASK (0xffff0000)
#define XTIMER_SHIFT_ON_COMPARE (4)
#define XTIMER_BACKOFF (40)
/** @} */
//MSB430 core //MSB430 core
#define MSP430_INITIAL_CPU_SPEED 800000uL #define MSP430_INITIAL_CPU_SPEED 800000uL
#define F_CPU MSP430_INITIAL_CPU_SPEED #define F_CPU MSP430_INITIAL_CPU_SPEED
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#ifndef WSN_BOARD_H_ #ifndef WSN_BOARD_H_
#define WSN_BOARD_H_ #define WSN_BOARD_H_
#include "board-conf.h" #include "board_common.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -39,17 +39,6 @@ extern "C" { ...@@ -39,17 +39,6 @@ extern "C" {
#define __MSP430F1611__ #define __MSP430F1611__
#endif #endif
/**
* @brief Xtimer configuration
* @{
*/
#define XTIMER (0)
#define XTIMER_CHAN (0)
#define XTIMER_MASK (0xffff0000)
#define XTIMER_SHIFT_ON_COMPARE (4)
#define XTIMER_BACKOFF (40)
/** @} */
/* MSB430 core */ /* MSB430 core */
#define MSP430_INITIAL_CPU_SPEED 800000uL #define MSP430_INITIAL_CPU_SPEED 800000uL
#define F_CPU MSP430_INITIAL_CPU_SPEED #define F_CPU MSP430_INITIAL_CPU_SPEED
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment