Merge pull request #408 from rousselk/simplify-msp430-headers

Simplify msp430 headers
RIOT-OS · Dec 19, 2013 · 37a7393 · 37a7393
2 parents ead2e11 + c1f8106
commit 37a7393
Show file tree

Hide file tree

Showing 18 changed files with 93 additions and 130 deletions.
diff --git a/boards/Makefile.base b/boards/Makefile.base
@@ -25,6 +25,9 @@ ifeq ($(BOARD),chronos)
  INCLUDES += -I$(RIOTBOARD)/chronos/include/
  INCLUDES += -I$(RIOTBOARD)/chronos/drivers/include/
 endif
+ifeq ($(BOARD),telosb)
+ INCLUDES += -I$(RIOTBOARD)/telosb/include/
+endif
 ifeq ($(BOARD),native)
  INCLUDES += -I$(RIOTBOARD)/native/include/
 endif
diff --git a/boards/chronos/include/board.h b/boards/chronos/include/board.h
@@ -22,7 +22,11 @@
 #define _MSB_BOARD_H
 
 #include <stdint.h>
-#include <cc430f6137.h>
+
+// for correct inclusion of <msp430.h>
+#ifndef __CC430F6137__
+#define __CC430F6137__
+#endif
 
 #define MSP430_INITIAL_CPU_SPEED    7372800uL
 #define MSP430_HAS_DCOR             1

diff --git a/boards/msb-430/include/board.h b/boards/msb-430/include/board.h
@@ -32,7 +32,7 @@ and the mailinglist (subscription via web site)
  * <h2>Compontents</h2>
  * \li MSP430
  * \li CC1100
- * 
+ *
  * @{
  *
  * @file        board.h
@@ -46,6 +46,11 @@ and the mailinglist (subscription via web site)
 
 #include "board-conf.h"
 
+// for correct inclusion of <msp430.h>
+#ifndef __MSP430F1612__
+#define __MSP430F1612__
+#endif
+
 //MSB430 core
 #define MSP430_INITIAL_CPU_SPEED 2457600uL
 #define MSP430_HAS_DCOR             1
@@ -62,7 +67,7 @@ and the mailinglist (subscription via web site)
 #define LED_RED_OFF     LEDS_PxOUT |= LEDS_CONF_RED
 #define LED_RED_TOGGLE     LEDS_PxOUT ^= LEDS_CONF_RED
 
-#include <msp430x16x.h>
+#include "board-conf.h"
 
 typedef uint8_t radio_packet_length_t;
 

diff --git a/boards/msb-430h/include/board.h b/boards/msb-430h/include/board.h
@@ -39,6 +39,11 @@ and the mailinglist (subscription via web site)
 #ifndef _MSB_BOARD_H
 #define _MSB_BOARD_H
 
+// for correct inclusion of <msp430.h>
+#ifndef __MSP430F1612__
+#define __MSP430F1612__
+#endif
+
 //MSB430 core
 #define MSP430_INITIAL_CPU_SPEED    7372800uL
 #define MSP430_HAS_DCOR             1
@@ -55,7 +60,6 @@ and the mailinglist (subscription via web site)
 #define LED_RED_OFF     LEDS_PxOUT |= LEDS_CONF_RED
 #define LED_RED_TOGGLE     LEDS_PxOUT ^= LEDS_CONF_RED
 
-#include <msp430x16x.h>
 #include "board-conf.h"
 
 typedef uint8_t radio_packet_length_t;

diff --git a/boards/telosb/include/board.h b/boards/telosb/include/board.h
@@ -25,6 +25,11 @@
 #ifndef _TELOSB_BOARD_H
 #define _TELOSB_BOARD_H
 
+// for correct inclusion of <msp430.h>
+#ifndef __MSP430F1611__
+#define __MSP430F1611__
+#endif
+
 //MSB430 core
 #define MSP430_INITIAL_CPU_SPEED    8000000uL
 #define MSP430_HAS_DCOR             0
@@ -50,7 +55,6 @@
 #define LED_BLUE_TOGGLE     LEDS_PxOUT ^= LEDS_CONF_BLUE
 
 #include <stdint.h>
-#include <msp430x16x.h>
 
 typedef uint8_t radio_packet_length_t;
 

diff --git a/boards/wsn430-v1_3b/include/board.h b/boards/wsn430-v1_3b/include/board.h
@@ -28,6 +28,11 @@
 
 #include "board-conf.h"
 
+// for correct inclusion of <msp430.h>
+#ifndef __MSP430F1611__
+#define __MSP430F1611__
+#endif
+
 //MSB430 core
 #define MSP430_INITIAL_CPU_SPEED    800000uL
 #define MSP430_HAS_DCOR             0

diff --git a/boards/wsn430-v1_4/include/board.h b/boards/wsn430-v1_4/include/board.h
@@ -28,6 +28,11 @@
 
 #include "board-conf.h"
 
+// for correct inclusion of <msp430.h>
+#ifndef __MSP430F1611__
+#define __MSP430F1611__
+#endif
+
 //MSB430 core
 #define MSP430_INITIAL_CPU_SPEED    800000uL
 #define MSP430_HAS_DCOR             0

diff --git a/cpu/cc430/cc430-gpioint.c b/cpu/cc430/cc430-gpioint.c
@@ -25,7 +25,6 @@ See the file LICENSE in the top level directory for more details.
 #include <cpu.h>
 #include <irq.h>
 #include <hwtimer.h>
-#include <cc430f6137.h>
 
 /** min and max portnumber to generate interrupts */
 #define PORTINT_MIN     (1)

diff --git a/cpu/cc430/cc430-rtc.c b/cpu/cc430/cc430-rtc.c
@@ -22,7 +22,6 @@ See the file LICENSE in the top level directory for more details.
 #include <legacymsp430.h>
 #include <irq.h>
 #include <cpu.h>
-#include <cc430f6137.h>
 #include <cc430-rtc.h>
 
 //static volatile time_t epoch;

diff --git a/cpu/cc430/flashrom.c b/cpu/cc430/flashrom.c
@@ -0,0 +1,41 @@
+#include <stddef.h>
+#include <stdint.h>
+#include "cpu.h"
+#include "irq.h"
+
+static uint8_t prepare(void);
+static void finish(uint8_t istate);
+static inline void busy_wait(void);
+
+/*---------------------------------------------------------------------------*/
+uint8_t flashrom_erase(uint8_t *addr)
+{
+	// TODO implement this function
+    return 0;
+}
+/*---------------------------------------------------------------------------*/
+void flashrom_write(uint8_t *dst, uint8_t *src, size_t size)
+{
+    // TODO implement this function
+}
+
+/*---------------------------------------------------------------------------*/
+static uint8_t prepare(void)
+{
+    // TODO implement this function
+
+    return 0;
+}
+/*---------------------------------------------------------------------------*/
+void finish(uint8_t istate)
+{
+    // TODO implement this function
+}
+/*---------------------------------------------------------------------------*/
+static inline void busy_wait(void)
+{
+    /* Wait for BUSY = 0, not needed unless run from RAM */
+    while (FCTL3 & 0x0001) {
+        nop();
+    }
+}
diff --git a/cpu/msp430-common/cpu.c b/cpu/msp430-common/cpu.c
@@ -9,11 +9,7 @@ This file is part of RIOT.
 This file is subject to the terms and conditions of the LGPLv2.
 See the file LICENSE in the top level directory for more details.
 *******************************************************************************/
-#ifdef CC430
-#include <cc430f6137.h>
-#else
-#include <msp430x16x.h>
-#endif
+
 #include "cpu.h"
 #include "kernel.h"
 #include "kernel_internal.h"

diff --git a/cpu/msp430-common/flashrom.c b/cpu/msp430-common/flashrom.c
diff --git a/cpu/msp430-common/include/cpu.h b/cpu/msp430-common/include/cpu.h
@@ -24,11 +24,15 @@ See the file LICENSE in the top level directory for more details.
  * @{
  */
 
-#include <sched.h>
 #include <stdio.h>
 #include <legacymsp430.h>
-#include <msp430_types.h>
-#include <cpu-conf.h>
+
+#include "board.h"
+#include <msp430.h>
+
+#include "sched.h"
+#include "msp430_types.h"
+#include "cpu-conf.h"
 
 #define WORDSIZE 16
 

diff --git a/cpu/msp430-common/include/hwtimer_cpu.h b/cpu/msp430-common/include/hwtimer_cpu.h
@@ -13,16 +13,10 @@ See the file LICENSE in the top level directory for more details.
 #ifndef __HWTIMER_CPU_H
 #define __HWTIMER_CPU_H
 
-#include "cpu.h"
-
-#ifdef CC430
-#include <cc430f6137.h>
-#else
-#include <msp430x16x.h>
-#endif
-#include <cpu.h>
 #include <stdint.h>
 
+#include "cpu.h"
+
 #ifdef __MSP430_HAS_TA2__
 #define ARCH_MAXTIMERS 2
 #endif

diff --git a/cpu/msp430-common/irq.c b/cpu/msp430-common/irq.c
@@ -1,10 +1,5 @@
-#include <irq.h>
-#ifdef CC430
-#include <cc430f6137.h>
-#else
-#include <msp430x16x.h>
-#endif
-#include <cpu.h>
+#include "irq.h"
+#include "cpu.h"
 
 unsigned int disableIRQ()
 {

diff --git a/cpu/msp430-common/msp430-main.c b/cpu/msp430-common/msp430-main.c
@@ -34,12 +34,6 @@
  */
 
 #include "cpu.h"
-#ifdef CC430
-#include <cc430f6137.h>
-#else
-#include <msp430x16x.h>
-#endif
-
 
 /*---------------------------------------------------------------------------*/
 static void

diff --git a/cpu/msp430x16x/flashrom.c b/cpu/msp430x16x/flashrom.c
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <stdint.h>
-#include <msp430x16x.h>
-#include <irq.h>
+#include "cpu.h"
+#include "irq.h"
 
 uint8_t ie1, ie2;
 

diff --git a/cpu/msp430x16x/hwtimer_msp430.c b/cpu/msp430x16x/hwtimer_msp430.c
@@ -1,7 +1,6 @@
-#include <msp430x16x.h>
-#include <hwtimer.h>
-#include <hwtimer_arch.h>
-#include <cpu.h>
+#include "cpu.h"
+#include "hwtimer.h"
+#include "hwtimer_arch.h"
 
 static uint32_t ticks = 0;