From c11517138e2810e637bcd1741f168d9ebea0762f Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Fri, 11 Mar 2016 15:24:46 +0100
Subject: [PATCH] boards/msb-430: cleanup in common files
- renamed board-conf.h to board_common.h
- moved common defines to board_common.h
---
boards/msb-430-common/include/board-conf.h | 37 -----------
boards/msb-430-common/include/board_common.h | 69 ++++++++++++++++++++
boards/msb-430/include/board.h | 31 +--------
boards/msb-430h/include/board.h | 31 +--------
4 files changed, 72 insertions(+), 96 deletions(-)
delete mode 100644 boards/msb-430-common/include/board-conf.h
create mode 100644 boards/msb-430-common/include/board_common.h
diff --git a/boards/msb-430-common/include/board-conf.h b/boards/msb-430-common/include/board-conf.h
deleted file mode 100644
index 9a63298949..0000000000
--- a/boards/msb-430-common/include/board-conf.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * @defgroup boards_msb430-common MSB-430 common
- * @ingroup boards
- * @brief Common files for all MSB-430 boards
- * @{
- *
- * @file
- * @brief Common definitions for all msb-430 based boards
- *
- * @author unknown
- */
-
-#ifndef BOARD_CONF_H_
-#define BOARD_CONF_H_
-
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define INFOMEM (0x1000)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* BOARD-CONF_H */
-/** @} */
diff --git a/boards/msb-430-common/include/board_common.h b/boards/msb-430-common/include/board_common.h
new file mode 100644
index 0000000000..b2a28221e2
--- /dev/null
+++ b/boards/msb-430-common/include/board_common.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2013-2016 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.
+ */
+
+/**
+ * @defgroup boards_msb430-common MSB-430 common
+ * @ingroup boards
+ * @brief Common files for all MSB-430 boards
+ * @{
+ *
+ * @file
+ * @brief Common definitions for all msb-430 based boards
+ *
+ * @author unknown
+ * @author Hauke Petersen <hauke.petersen@fu-berlin.de>
+ */
+
+#ifndef BOARD_COMMON_H_
+#define BOARD_COMMON_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Address of the info memory
+ */
+#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
+}
+#endif
+
+#endif /* BOARD-CONF_H */
+/** @} */
diff --git a/boards/msb-430/include/board.h b/boards/msb-430/include/board.h
index 7ca7cc3783..c862e03fca 100644
--- a/boards/msb-430/include/board.h
+++ b/boards/msb-430/include/board.h
@@ -34,7 +34,7 @@
#ifndef MSB_BOARD_H_
#define MSB_BOARD_H_
-#include "board-conf.h"
+#include "board_common.h"
#ifdef __cplusplus
extern "C" {
@@ -45,17 +45,6 @@ extern "C" {
#define __MSP430F1612__
#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 */
#define MSP430_INITIAL_CPU_SPEED 2457600uL
#define F_CPU MSP430_INITIAL_CPU_SPEED
@@ -63,24 +52,6 @@ extern "C" {
#define MSP430_HAS_DCOR 1
#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
}
#endif
diff --git a/boards/msb-430h/include/board.h b/boards/msb-430h/include/board.h
index 18ff7dd3ee..f346a240a9 100644
--- a/boards/msb-430h/include/board.h
+++ b/boards/msb-430h/include/board.h
@@ -22,6 +22,8 @@
#ifndef MSB_BOARD_H_
#define MSB_BOARD_H_
+#include "board_common.h"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -31,17 +33,6 @@ extern "C" {
#define __MSP430F1612__
#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
#define MSP430_INITIAL_CPU_SPEED 7372800uL
#define F_CPU MSP430_INITIAL_CPU_SPEED
@@ -49,24 +40,6 @@ extern "C" {
#define MSP430_HAS_DCOR 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
}
#endif
--
GitLab