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

fixed the z1 platform and generic code used by z1 to work with IAR compiler

Browse source
This commit is contained in:
Joakim Eriksson 2011-05-25 17:21:51 +02:00
parent c48f8fd39a
commit 77ec0bfa0f
42 changed files with 318 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cpu/msp430/rtimer-arch.c
View file

@ -38,14 +38,16 @@
* Adam Dunkels <adam@sics.se>
*/
#include "contiki.h"
#ifdef __GNUC__
#include <io.h>
#include <signal.h>
#endif
#ifdef __IAR_SYSTEMS_ICC__
#include <io430.h>
#endif
#include <msp430.h>
#endif
#include "sys/energest.h"
#include "sys/rtimer.h"
@ -61,7 +63,13 @@
#endif
/*---------------------------------------------------------------------------*/
interrupt(TIMERA0_VECTOR) timera0 (void) {
#ifdef __IAR_SYSTEMS_ICC__
#pragma vector=TIMERA0_VECTOR
__interrupt void
#else
interrupt(TIMERA0_VECTOR)
#endif
timera0 (void) {
ENERGEST_ON(ENERGEST_TYPE_IRQ);
watchdog_start();