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

Merge pull request #727 from atiselsts/msp430_timing_fixes

Browse source 
Fix time accounting on msp430 Series 1 and Series 2 MCU based platforms.
This commit is contained in:
Fredrik Österlind 2014-08-13 13:47:36 +02:00
commit 573d75f13d
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cpu/msp430/f1xxx/clock.c
View file

@ -41,12 +41,26 @@
#define MAX_TICKS (~((clock_time_t)0) / 2) #define MAX_TICKS (~((clock_time_t)0) / 2)
#define CLOCK_LT(a, b) ((int16_t)((a)-(b)) < 0)
static volatile unsigned long seconds; static volatile unsigned long seconds;
static volatile clock_time_t count = 0; static volatile clock_time_t count = 0;
/* last_tar is used for calculating clock_fine */ /* last_tar is used for calculating clock_fine */
static volatile uint16_t last_tar = 0; static volatile uint16_t last_tar = 0;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static inline uint16_t
read_tar(void)
{
/* Same as clock_counter(), but can be inlined */
uint16_t t1, t2;
do {
t1 = TAR;
t2 = TAR;
} while(t1 != t2);
return t1;
}
/*---------------------------------------------------------------------------*/
ISR(TIMERA1, timera1) ISR(TIMERA1, timera1)
{ {
ENERGEST_ON(ENERGEST_TYPE_IRQ); ENERGEST_ON(ENERGEST_TYPE_IRQ);
@ -57,10 +71,11 @@ ISR(TIMERA1, timera1)
/* HW timer bug fix: Interrupt handler called before TR==CCR. /* HW timer bug fix: Interrupt handler called before TR==CCR.
* Occurs when timer state is toggled between STOP and CONT. */ * Occurs when timer state is toggled between STOP and CONT. */
while(TACTL & MC1 && TACCR1 - TAR == 1); while(TACTL & MC1 && TACCR1 - read_tar() == 1);
last_tar = read_tar();
/* Make sure interrupt time is future */ /* Make sure interrupt time is future */
do { while(!CLOCK_LT(last_tar, TACCR1)) {
TACCR1 += INTERVAL; TACCR1 += INTERVAL;
++count; ++count;
@ -76,9 +91,8 @@ ISR(TIMERA1, timera1)
++seconds; ++seconds;
energest_flush(); energest_flush();
} }
} while((TACCR1 - TAR) > INTERVAL); last_tar = read_tar();
}
last_tar = TAR;
if(etimer_pending() && if(etimer_pending() &&
(etimer_next_expiration_time() - count - 1) > MAX_TICKS) { (etimer_next_expiration_time() - count - 1) > MAX_TICKS) {