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

Merge pull request #1092 from g-oikonomou/contrib/remote_watchdog_stop

Browse source 
Remove CC2530 and CC2538 dummy watchdog_stop()
This commit is contained in:
Benoît Thébaudeau 2015-06-18 21:56:13 +02:00
parent d36e8adbdd d28eb023ef
commit 0b1a0d2bd9
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cpu/cc2538/dev/watchdog.c
View file

@ -88,15 +88,6 @@ watchdog_periodic(void)
REG(SMWDTHROSC_WDCTL) = (SMWDTHROSC_WDCTL_CLR_2 | SMWDTHROSC_WDCTL_CLR_0); REG(SMWDTHROSC_WDCTL) = (SMWDTHROSC_WDCTL_CLR_2 | SMWDTHROSC_WDCTL_CLR_0);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** \brief In watchdog mode, the WDT can not be stopped. This function is
* defined here to satisfy API requirements.
*/
void
watchdog_stop(void)
{
return;
}
/*---------------------------------------------------------------------------*/
/** \brief Keeps control until the WDT throws a reset signal. Starts the WDT /** \brief Keeps control until the WDT throws a reset signal. Starts the WDT
* if not already started. */ * if not already started. */
void void

5
cpu/cc253x/8051def.h
View file

@ -14,11 +14,6 @@
#include <stdint.h> #include <stdint.h>
/* In watchdog mode, our WDT can't be stopped once started
* Include watchdog_stop()'s declaration and then trash it */
#include "dev/watchdog.h"
#define watchdog_stop() watchdog_periodic()
/* This port no longer implements the legacy clock_delay. Hack its usages /* This port no longer implements the legacy clock_delay. Hack its usages
* outta the way till it gets phased out completely * outta the way till it gets phased out completely
* NB: This also overwrites the prototype so delay_usec() is declared twice */ * NB: This also overwrites the prototype so delay_usec() is declared twice */