riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/msp430-common: removed legacymsp430.h code

Browse Source
This commit is contained in:
Hauke Petersen 2015-09-02 16:29:07 +02:00
parent df21f1b59d
commit 7d25b41610
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cpu/msp430-common/include/cpu.h
View File

@ -22,7 +22,6 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <legacymsp430.h>
#include <msp430.h> #include <msp430.h>
#include "board.h" #include "board.h"
@ -40,6 +39,11 @@ extern "C" {
*/ */
#define WORDSIZE 16 #define WORDSIZE 16
/**
* @brief Macro for defining interrupt service routines
*/
#define ISR(a,b) void __attribute__((naked, interrupt (a))) b(void)
/** /**
* @brief The current ISR state (inside or not) * @brief The current ISR state (inside or not)
*/ */
@ -50,13 +54,6 @@ extern volatile int __inISR;
*/ */
extern char __isr_stack[MSP430_ISR_STACK_SIZE]; extern char __isr_stack[MSP430_ISR_STACK_SIZE];
/**
* @brief definition of legacy interrupt control functions
*/
#define eINT enableIRQ
#define dINT disableIRQ
/** @} */
/** /**
* @brief Save the current thread context from inside an ISR * @brief Save the current thread context from inside an ISR
*/ */

5
cpu/msp430-common/msp430-main.c
View File

@ -43,6 +43,7 @@
*/ */
#include "cpu.h" #include "cpu.h"
#include "irq.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
@ -109,10 +110,10 @@ static char *cur_break = (char *) &_end;
void msp430_cpu_init(void) void msp430_cpu_init(void)
{ {
dint(); disableIRQ();
init_ports(); init_ports();
// lpm_init(); // lpm_init();
eint(); enableIRQ();
if ((uintptr_t)cur_break & 1) { /* Workaround for msp430-ld bug!*/ if ((uintptr_t)cur_break & 1) { /* Workaround for msp430-ld bug!*/
cur_break++; cur_break++;