projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable kernel and fix Doxygen markup.
[bertos.git]
/
drv
/
wdt.h
diff --git
a/drv/wdt.h
b/drv/wdt.h
index 29780607fb58cd840e59154c9cc55f416de723ac..85b37ebf5c235cf9aaf80e4124a56f16c547e07a 100755
(executable)
--- a/
drv/wdt.h
+++ b/
drv/wdt.h
@@
-14,6
+14,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* 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.6 2005/11/27 03:03:08 bernie
*#* Add Qt support hack.
*#*
*#* Revision 1.6 2005/11/27 03:03:08 bernie
*#* Add Qt support hack.
*#*
@@
-49,7
+55,13
@@
#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 CPU_AVR
#include <avr/io.h>
#include <cfg/macros.h> // BV()
@@
-68,6
+80,9
@@
INLINE void wdt_reset(void)
// Let Qt handle events
ASSERT(qApp);
qApp->processEvents();
// Let Qt handle events
ASSERT(qApp);
qApp->processEvents();
+ #elif OS_POSIX
+ static struct timeval tv = { 0, 0 };
+ select(0, NULL, NULL, NULL, &tv);
#elif CPU_AVR
__asm__ __volatile__ ("wdr");
#else
#elif CPU_AVR
__asm__ __volatile__ ("wdr");
#else
@@
-85,12
+100,15
@@
INLINE void wdt_init(uint8_t timeout)
{
#if CONFIG_WATCHDOG
#if OS_QT
{
#if CONFIG_WATCHDOG
#if OS_QT
- //
c
reate a dummy QApplication object
+ //
C
reate a dummy QApplication object
if (!qApp)
{
int argc;
new QApplication(argc, (char **)NULL);
}
if (!qApp)
{
int argc;
new QApplication(argc, (char **)NULL);
}
+ (void)timeout;
+ #elif OS_POSIX
+ (void)timeout; // NOP
#elif CPU_AVR
WDTCR |= BV(WDCE) | BV(WDE);
WDTCR = timeout;
#elif CPU_AVR
WDTCR |= BV(WDCE) | BV(WDE);
WDTCR = timeout;
@@
-107,6
+125,8
@@
INLINE void wdt_start(void)
#if CONFIG_WATCHDOG
#if OS_QT
// NOP
#if CONFIG_WATCHDOG
#if OS_QT
// NOP
+ #elif OS_POSIX
+ // NOP
#elif CPU_AVR
WDTCR |= BV(WDE);
#else
#elif CPU_AVR
WDTCR |= BV(WDE);
#else
@@
-120,6
+140,8
@@
INLINE void wdt_stop(void)
#if CONFIG_WATCHDOG
#if OS_QT
// NOP
#if CONFIG_WATCHDOG
#if OS_QT
// NOP
+ #elif OS_POSIX
+ // NOP
#elif CPU_AVR
WDTCR |= BV(WDCE) | BV(WDE);
WDTCR &= ~BV(WDE);
#elif CPU_AVR
WDTCR |= BV(WDCE) | BV(WDE);
WDTCR &= ~BV(WDE);