deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed splhigh/splx for the IAR compiler

Browse source
This commit is contained in:
Niclas Finne 2011-09-23 15:48:05 +02:00
parent dd8576830e
commit bf299b1a07
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cpu/msp430/msp430.c
View file

@ -275,16 +275,16 @@ splhigh_(void)
/*
* Restore previous interrupt mask.
*/
void
splx_(int sr)
{
#ifdef __IAR_SYSTEMS_ICC__
__bis_SR_register(sr);
#else
/* If GIE was set, restore it. */
asmv("bis %0, r2" : : "r" (sr));
#endif
}
/* void */
/* splx_(int sr) */
/* { */
/* #ifdef __IAR_SYSTEMS_ICC__ */
/* __bis_SR_register(sr); */
/* #else */
/* /\* If GIE was set, restore it. *\/ */
/* asmv("bis %0, r2" : : "r" (sr)); */
/* #endif */
/* } */
/*---------------------------------------------------------------------------*/
/* this code will always start the TimerB if not already started */
void

4
cpu/msp430/msp430def.h
View file

@ -91,12 +91,12 @@ void msp430_sync_dco(void);
void *sbrk(int);
typedef int spl_t;
void splx_(spl_t);
/* void splx_(spl_t); */
spl_t splhigh_(void);
#define splhigh() splhigh_()
#ifdef __IAR_SYSTEMS_ICC__
#define splx(sr) sr = __get_SR_register()
#define splx(sr) __bis_SR_register(sr)
#else
#define splx(sr) __asm__ __volatile__("bis %0, r2" : : "r" (sr))
#endif