fixed the z1 platform and generic code used by z1 to work with IAR compiler
This commit is contained in:
parent
c48f8fd39a
commit
77ec0bfa0f
42 changed files with 318 additions and 146 deletions
|
@ -32,10 +32,13 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "contiki.h"
|
||||
#ifdef __IAR_SYSTEMS_ICC__
|
||||
#include <msp430.h>
|
||||
#else
|
||||
#include <io.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include "contiki-conf.h"
|
||||
#endif
|
||||
|
||||
#include "sys/energest.h"
|
||||
#include "sys/clock.h"
|
||||
|
@ -53,7 +56,13 @@ static volatile clock_time_t count = 0;
|
|||
/* last_tar is used for calculating clock_fine */
|
||||
static volatile uint16_t last_tar = 0;
|
||||
/*---------------------------------------------------------------------------*/
|
||||
interrupt(TIMERA1_VECTOR) timera1 (void) {
|
||||
#ifdef __IAR_SYSTEMS_ICC__
|
||||
#pragma vector=TIMERA1_VECTOR
|
||||
__interrupt void
|
||||
#else
|
||||
interrupt(TIMERA1_VECTOR)
|
||||
#endif
|
||||
timera1 (void) {
|
||||
ENERGEST_ON(ENERGEST_TYPE_IRQ);
|
||||
|
||||
watchdog_start();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue