Count the number of times the watchdog has been stopped to avoid starting it when someone else has stopped it

This commit is contained in:
adamdunkels 2008-02-11 10:45:19 +00:00
parent 660b7f9a78
commit da49b950d4

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: watchdog.c,v 1.4 2008/01/21 10:39:23 adamdunkels Exp $ * @(#)$Id: watchdog.c,v 1.5 2008/02/11 10:45:19 adamdunkels Exp $
*/ */
#include <io.h> #include <io.h>
#include "dev/watchdog.h" #include "dev/watchdog.h"
@ -40,6 +40,7 @@ watchdog_init(void)
{ {
/* The MSP430 watchdog is enabled at boot-up, so we stop it during /* The MSP430 watchdog is enabled at boot-up, so we stop it during
initialization. */ initialization. */
stopped = 0;
watchdog_stop(); watchdog_stop();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -48,8 +49,10 @@ watchdog_start(void)
{ {
/* We setup the watchdog to reset the device after one second, /* We setup the watchdog to reset the device after one second,
unless watchdog_periodic() is called. */ unless watchdog_periodic() is called. */
stopped--;
if(!stopped) {
WDTCTL = WDTPW | WDTCNTCL | WDT_ARST_1000; WDTCTL = WDTPW | WDTCNTCL | WDT_ARST_1000;
stopped = 0; }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
@ -66,7 +69,7 @@ void
watchdog_stop(void) watchdog_stop(void)
{ {
WDTCTL = WDTPW | WDTHOLD; WDTCTL = WDTPW | WDTHOLD;
stopped = 1; stopped++;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void