X-Git-Url: http://git.droids-corp.org/?p=protos%2Fxbee-avr.git;a=blobdiff_plain;f=main.c;h=11fd44234ed6c51f0a20e6bbea800a10a7dd58d2;hp=326ce64930ee66be51ad0e79e915e940ef4a43f9;hb=3abe93f4b90cf10d3d29dcb48e90dd65353e0bc5;hpb=1032fc9a27fbe5b24f3a837685467d87380b3e2c

diff --git a/main.c b/main.c
index 326ce64..11fd442 100644
--- 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)
@@ -152,7 +157,6 @@ int main(void)
 	timer0_register_OV_intr(main_timer_interrupt);
 
 	callout_mgr_init(&xbeeboard.intr_cm, get_time_ms);
-	callout_mgr_init(&xbeeboard.mainloop_cm, get_time_ms);
 
 	cmdline_init();
 	spi_servo_init();