Removed all references to a specific MCU in "generic" files

Inclusion of generic <msp430.h> file is done in cpu.h
RIOT-OS · Dec 18, 2013 · 6428daf · 6428daf
1 parent 41da848
commit 6428daf
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 31 deletions.
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
@@ -1,7 +1,10 @@
 #include <stddef.h>
 #include <stdint.h>
-#include <msp430x16x.h>
-#include <irq.h>
+
+#include "board.h"
+#include <msp430.h>
+
+#include "irq.h"
 
 uint8_t ie1, ie2;
 

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