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

boards/msb-430: cleanup in common files

- renamed board-conf.h to board_common.h
- moved common defines to board_common.h
parent 0ccadc0f
No related branches found
No related tags found
No related merge requests found
/* /*
* Copyright (C) 2013 Freie Universität Berlin * Copyright (C) 2013-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
...@@ -16,19 +16,51 @@ ...@@ -16,19 +16,51 @@
* @brief Common definitions for all msb-430 based boards * @brief Common definitions for all msb-430 based boards
* *
* @author unknown * @author unknown
* @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)
/** @} */
/**
* @brief LED definitions
* @{
*/
#define LEDS_PxDIR (P5DIR)
#define LEDS_PxOUT (P5OUT)
#define LEDS_CONF_RED (0x80)
#define LEDS_CONF_GREEN (0x00)
#define LEDS_CONF_YELLOW (0x00)
#define LED_RED_ON (LEDS_PxOUT &=~LEDS_CONF_RED)
#define LED_RED_OFF (LEDS_PxOUT |= LEDS_CONF_RED)
#define LED_RED_TOGGLE (LEDS_PxOUT ^= LEDS_CONF_RED)
#define LED_GREEN_ON /* not present */
#define LED_GREEN_OFF /* not present */
#define LED_GREEN_TOGGLE /* not present */
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#ifndef MSB_BOARD_H_ #ifndef MSB_BOARD_H_
#define MSB_BOARD_H_ #define MSB_BOARD_H_
#include "board-conf.h" #include "board_common.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -45,17 +45,6 @@ extern "C" { ...@@ -45,17 +45,6 @@ extern "C" {
#define __MSP430F1612__ #define __MSP430F1612__
#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 2457600uL #define MSP430_INITIAL_CPU_SPEED 2457600uL
#define F_CPU MSP430_INITIAL_CPU_SPEED #define F_CPU MSP430_INITIAL_CPU_SPEED
...@@ -63,24 +52,6 @@ extern "C" { ...@@ -63,24 +52,6 @@ extern "C" {
#define MSP430_HAS_DCOR 1 #define MSP430_HAS_DCOR 1
#define MSP430_HAS_EXTERNAL_CRYSTAL 0 #define MSP430_HAS_EXTERNAL_CRYSTAL 0
/**
* @brief LED definitions
* @{
*/
#define LEDS_PxDIR (P5DIR)
#define LEDS_PxOUT (P5OUT)
#define LEDS_CONF_RED (0x80)
#define LEDS_CONF_GREEN (0x00)
#define LEDS_CONF_YELLOW (0x00)
#define LED_RED_ON (LEDS_PxOUT &=~LEDS_CONF_RED)
#define LED_RED_OFF (LEDS_PxOUT |= LEDS_CONF_RED)
#define LED_RED_TOGGLE (LEDS_PxOUT ^= LEDS_CONF_RED)
#define LED_GREEN_ON /* not present */
#define LED_GREEN_OFF /* not present */
#define LED_GREEN_TOGGLE /* not present */
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#ifndef MSB_BOARD_H_ #ifndef MSB_BOARD_H_
#define MSB_BOARD_H_ #define MSB_BOARD_H_
#include "board_common.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
...@@ -31,17 +33,6 @@ extern "C" { ...@@ -31,17 +33,6 @@ extern "C" {
#define __MSP430F1612__ #define __MSP430F1612__
#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 7372800uL #define MSP430_INITIAL_CPU_SPEED 7372800uL
#define F_CPU MSP430_INITIAL_CPU_SPEED #define F_CPU MSP430_INITIAL_CPU_SPEED
...@@ -49,24 +40,6 @@ extern "C" { ...@@ -49,24 +40,6 @@ extern "C" {
#define MSP430_HAS_DCOR 1 #define MSP430_HAS_DCOR 1
#define MSP430_HAS_EXTERNAL_CRYSTAL 1 #define MSP430_HAS_EXTERNAL_CRYSTAL 1
/**
* @brief LED definitions
* @{
*/
#define LEDS_PxDIR (P5DIR)
#define LEDS_PxOUT (P5OUT)
#define LEDS_CONF_RED (0x80)
#define LEDS_CONF_GREEN (0x00)
#define LEDS_CONF_YELLOW (0x00)
#define LED_RED_ON (LEDS_PxOUT &=~LEDS_CONF_RED)
#define LED_RED_OFF (LEDS_PxOUT |= LEDS_CONF_RED)
#define LED_RED_TOGGLE (LEDS_PxOUT ^= LEDS_CONF_RED)
#define LED_GREEN_ON /* not present */
#define LED_GREEN_OFF /* not present */
#define LED_GREEN_TOGGLE /* not present */
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
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