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

fixed clock_seconds to use full 32 bit

Browse source
This commit is contained in:
nifi 2009-04-06 13:08:42 +00:00
parent c1d490b6a7
commit 43c2ccf5d8
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cpu/avr/dev/clock.c
View file

@ -6,13 +6,18 @@
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
static volatile clock_time_t count; static volatile clock_time_t count, scount;
static volatile unsigned long seconds;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
//SIGNAL(SIG_OUTPUT_COMPARE0) //SIGNAL(SIG_OUTPUT_COMPARE0)
ISR(AVR_OUTPUT_COMPARE_INT) ISR(AVR_OUTPUT_COMPARE_INT)
{ {
++count; count++;
if(++scount == CLOCK_SECOND) {
scount = 0;
seconds++;
}
if(etimer_pending()) { if(etimer_pending()) {
etimer_request_poll(); etimer_request_poll();
} }
@ -59,7 +64,7 @@ clock_init(void)
* 16 bit data type, time intervals of up to 524 seconds can be * 16 bit data type, time intervals of up to 524 seconds can be
* measured. * measured.
*/ */
count = 0; scount = count = 0;
sei (); sei ();
} }
@ -68,7 +73,11 @@ clock_init(void)
clock_time_t clock_time_t
clock_time(void) clock_time(void)
{ {
return count; clock_time_t tmp;
do {
tmp = count;
} while(tmp != count);
return tmp;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**
@ -107,5 +116,9 @@ clock_set_seconds(unsigned long sec)
unsigned long unsigned long
clock_seconds(void) clock_seconds(void)
{ {
return count / CLOCK_SECOND; unsigned long tmp;
do {
tmp = seconds;
} while(tmp != seconds);
return tmp;
} }