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

boards/msb-430-common: removed legacymsp430.h code

Browse Source 
Conflicts:
	boards/msb-430-common/board_init.c
This commit is contained in:
Hauke Petersen 2015-09-02 16:30:18 +02:00
parent 7d25b41610
commit 51610f0399
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boards/msb-430-common/board_init.c
View File

@ -21,6 +21,7 @@
*/ */
#include "cpu.h" #include "cpu.h"
#include "irq.h"
#include "board.h" #include "board.h"
#include "kernel_internal.h" #include "kernel_internal.h"
#include "msp430.h" #include "msp430.h"
@ -130,7 +131,7 @@ static void msb_ports_init(void)
void msp430_set_cpu_speed(uint32_t speed) void msp430_set_cpu_speed(uint32_t speed)
{ {
dint(); disableIRQ();
__msp430_cpu_speed = speed; __msp430_cpu_speed = speed;
msp430_init_dco(); msp430_init_dco();
uint16_t br; uint16_t br;
@ -148,7 +149,7 @@ void msp430_set_cpu_speed(uint32_t speed)
IE2 |= URXIE1; IE2 |= URXIE1;
//clock_init(); //clock_init();
eint(); enableIRQ();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

2
boards/msb-430-common/uart1.c
View File

@ -53,7 +53,7 @@ void usart0irq(void);
/** /**
* \brief the interrupt function * \brief the interrupt function
*/ */
interrupt(USART1RX_VECTOR) usart0irq(void) void __attribute__((interrupt(USART1RX_VECTOR))) usart0irq(void)
{ {
U1TCTL &= ~URXSE; /* Clear the URXS signal */ U1TCTL &= ~URXSE; /* Clear the URXS signal */
U1TCTL |= URXSE; /* Re-enable URXS - needed here?*/ U1TCTL |= URXSE; /* Re-enable URXS - needed here?*/