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

Removed safeguards around the update code for the timer; turns out they weren't needed (but instead triggered a bug in MSPsim)

Browse source
This commit is contained in:
adamdunkels 2010-01-30 14:03:35 +00:00
parent f5c78bd4fd
commit 4ff6b5460a
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cpu/msp430/clock.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: clock.c,v 1.20 2010/01/18 21:17:11 adamdunkels Exp $ * @(#)$Id: clock.c,v 1.21 2010/01/30 14:03:35 adamdunkels Exp $
*/ */
@ -63,9 +63,7 @@ interrupt(TIMERA1_VECTOR) timera1 (void) {
/* Make sure interrupt time is future */ /* Make sure interrupt time is future */
do { do {
TACTL &= ~MC1;
TACCR1 += INTERVAL; TACCR1 += INTERVAL;
TACTL |= MC1;
++count; ++count;
/* Make sure the CLOCK_CONF_SECOND is a power of two, to ensure /* Make sure the CLOCK_CONF_SECOND is a power of two, to ensure

5
cpu/msp430/rtimer-arch.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: rtimer-arch.c,v 1.12 2010/01/18 21:17:11 adamdunkels Exp $ * $Id: rtimer-arch.c,v 1.13 2010/01/30 14:03:35 adamdunkels Exp $
*/ */
/** /**
@ -82,7 +82,6 @@ rtimer_arch_schedule(rtimer_clock_t t)
{ {
PRINTF("rtimer_arch_schedule time %u\n", t); PRINTF("rtimer_arch_schedule time %u\n", t);
TACTL &= ~MC1;
TACCR0 = t; TACCR0 = t;
TACTL |= MC1;
} }
/*---------------------------------------------------------------------------*/