projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doxygen fix.
[bertos.git]
/
drv
/
wdt.h
diff --git
a/drv/wdt.h
b/drv/wdt.h
index 9f57618f663b26b46be162379a050e141ffb7839..c801757daaa2a572b9ebc7834f22f6422cbcc228 100755
(executable)
--- a/
drv/wdt.h
+++ b/
drv/wdt.h
@@
-14,6
+14,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* 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.7 2005/11/27 03:58:40 bernie
*#* Add POSIX timer emulator.
*#*
*#* Revision 1.7 2005/11/27 03:58:40 bernie
*#* Add POSIX timer emulator.
*#*
@@
-41,6
+47,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)
@@
-52,12
+59,18
@@
#include <cfg/os.h>
#if OS_QT
#include <cfg/os.h>
#if OS_QT
- #include <qapplication.h>
+ #if _QT < 4
+ #include <qapplication.h>
+ #else
+ #include <QtGui/QApplication>
+ #endif
#elif OS_POSIX
#include <sys/select.h>
#elif CPU_AVR
#include <avr/io.h>
#include <cfg/macros.h> // BV()
#elif OS_POSIX
#include <sys/select.h>
#elif CPU_AVR
#include <avr/io.h>
#include <cfg/macros.h> // BV()
+ #elif (ARCH & ARCH_FREERTOS)
+ #include <task.h> /* taskYIELD() */
#else
#error unknown CPU
#endif
#else
#error unknown CPU
#endif
@@
-76,6
+89,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 (ARCH & ARCH_FREERTOS)
+ vTaskDelay(1);
#elif CPU_AVR
__asm__ __volatile__ ("wdr");
#else
#elif CPU_AVR
__asm__ __volatile__ ("wdr");
#else
@@
-102,6
+117,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 (ARCH & ARCH_FREERTOS)
+ /* nop */
#elif CPU_AVR
WDTCR |= BV(WDCE) | BV(WDE);
WDTCR = timeout;
#elif CPU_AVR
WDTCR |= BV(WDCE) | BV(WDE);
WDTCR = timeout;
@@
-120,6
+137,8
@@
INLINE void wdt_start(void)
// NOP
#elif OS_POSIX
// NOP
// NOP
#elif OS_POSIX
// NOP
+ #elif (ARCH & ARCH_FREERTOS)
+ /* nop */
#elif CPU_AVR
WDTCR |= BV(WDE);
#else
#elif CPU_AVR
WDTCR |= BV(WDE);
#else
@@
-135,6
+154,8
@@
INLINE void wdt_stop(void)
// NOP
#elif OS_POSIX
// NOP
// NOP
#elif OS_POSIX
// NOP
+ #elif (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);