git.droids-corp.org
/
protos
/
xbee-avr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
49ab9ee
)
lock irq when retrieving time
author
Olivier Matz
<zer0@droids-corp.org>
Tue, 4 Mar 2014 20:54:02 +0000
(21:54 +0100)
committer
Olivier Matz
<zer0@droids-corp.org>
Sun, 9 Mar 2014 21:13:08 +0000
(22:13 +0100)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index
326ce64
..
1b9bc97
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-91,7
+91,12
@@
void bootloader(void)
/* return time in milliseconds on unsigned 16 bits */
static uint16_t get_time_ms(void)
{
- return (uint16_t)global_ms;
+ uint16_t ms;
+ uint8_t flags;
+ IRQ_LOCK(flags);
+ ms = global_ms;
+ IRQ_UNLOCK(flags);
+ return ms;
}
static void main_timer_interrupt(void)