projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid unnecessary rendering.
[bertos.git]
/
drv
/
wdt.h
diff --git
a/drv/wdt.h
b/drv/wdt.h
index 85b37ebf5c235cf9aaf80e4124a56f16c547e07a..bfe3ce8891abf4c1c3b9021adab60cb56d36f5d2 100755
(executable)
--- a/
drv/wdt.h
+++ b/
drv/wdt.h
@@
-14,6
+14,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.10 2006/05/18 00:38:42 bernie
+ *#* Work around missing ARCH_FREERTOS symbol.
+ *#*
+ *#* Revision 1.9 2006/03/22 09:49:09 bernie
+ *#* Add FreeRTOS support.
+ *#*
*#* Revision 1.8 2006/02/20 02:02:29 bernie
*#* Port to Qt 4.1.
*#*
*#* Revision 1.8 2006/02/20 02:02:29 bernie
*#* Port to Qt 4.1.
*#*
@@
-44,6
+50,7
@@
#include <appconfig.h>
#include <cfg/compiler.h> // INLINE
#include <appconfig.h>
#include <cfg/compiler.h> // INLINE
+#include <cfg/arch_config.h>
/* Configury sanity check */
#if !defined(CONFIG_WATCHDOG) || (CONFIG_WATCHDOG != 0 && CONFIG_WATCHDOG != 1)
/* Configury sanity check */
#if !defined(CONFIG_WATCHDOG) || (CONFIG_WATCHDOG != 0 && CONFIG_WATCHDOG != 1)
@@
-65,6
+72,8
@@
#elif CPU_AVR
#include <avr/io.h>
#include <cfg/macros.h> // BV()
#elif CPU_AVR
#include <avr/io.h>
#include <cfg/macros.h> // BV()
+ #elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+ #include <task.h> /* taskYIELD() */
#else
#error unknown CPU
#endif
#else
#error unknown CPU
#endif
@@
-83,6
+92,8
@@
INLINE void wdt_reset(void)
#elif OS_POSIX
static struct timeval tv = { 0, 0 };
select(0, NULL, NULL, NULL, &tv);
#elif OS_POSIX
static struct timeval tv = { 0, 0 };
select(0, NULL, NULL, NULL, &tv);
+ #elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+ vTaskDelay(1);
#elif CPU_AVR
__asm__ __volatile__ ("wdr");
#else
#elif CPU_AVR
__asm__ __volatile__ ("wdr");
#else
@@
-109,6
+120,8
@@
INLINE void wdt_init(uint8_t timeout)
(void)timeout;
#elif OS_POSIX
(void)timeout; // NOP
(void)timeout;
#elif OS_POSIX
(void)timeout; // NOP
+ #elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+ /* nop */
#elif CPU_AVR
WDTCR |= BV(WDCE) | BV(WDE);
WDTCR = timeout;
#elif CPU_AVR
WDTCR |= BV(WDCE) | BV(WDE);
WDTCR = timeout;
@@
-127,6
+140,8
@@
INLINE void wdt_start(void)
// NOP
#elif OS_POSIX
// NOP
// NOP
#elif OS_POSIX
// NOP
+ #elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+ /* nop */
#elif CPU_AVR
WDTCR |= BV(WDE);
#else
#elif CPU_AVR
WDTCR |= BV(WDE);
#else
@@
-142,6
+157,8
@@
INLINE void wdt_stop(void)
// NOP
#elif OS_POSIX
// NOP
// NOP
#elif OS_POSIX
// NOP
+ #elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+ /* nop */
#elif CPU_AVR
WDTCR |= BV(WDCE) | BV(WDE);
WDTCR &= ~BV(WDE);
#elif CPU_AVR
WDTCR |= BV(WDCE) | BV(WDE);
WDTCR &= ~BV(WDE);