X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fwdt.h;h=bfe3ce8891abf4c1c3b9021adab60cb56d36f5d2;hb=b25aabb82dd47404b0697e1394fd3a14963e1224;hp=29780607fb58cd840e59154c9cc55f416de723ac;hpb=f1ea65410983502e02d7ce8f249de66a9e853481;p=bertos.git

diff --git a/drv/wdt.h b/drv/wdt.h
index 29780607..bfe3ce88 100755
--- a/drv/wdt.h
+++ b/drv/wdt.h
@@ -14,6 +14,18 @@
 
 /*#*
  *#* $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.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.
  *#*
@@ -38,6 +50,7 @@
 
 #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)
@@ -49,10 +62,18 @@
 	#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 defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+		#include <task.h> /* taskYIELD() */
 	#else
 		#error unknown CPU
 	#endif
@@ -68,6 +89,11 @@ INLINE void wdt_reset(void)
 		// Let Qt handle events
 		ASSERT(qApp);
 		qApp->processEvents();
+	#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
@@ -85,12 +111,17 @@ INLINE void wdt_init(uint8_t timeout)
 {
 #if CONFIG_WATCHDOG
 	#if OS_QT
-		// create a dummy QApplication object
+		// Create a dummy QApplication object
 		if (!qApp)
 		{
 			int argc;
 			new QApplication(argc, (char **)NULL);
 		}
+		(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;
@@ -107,6 +138,10 @@ INLINE void wdt_start(void)
 #if CONFIG_WATCHDOG
 	#if OS_QT
 		// NOP
+	#elif OS_POSIX
+		// NOP
+	#elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+		/* nop */
 	#elif CPU_AVR
 		WDTCR |= BV(WDE);
 	#else
@@ -120,6 +155,10 @@ INLINE void wdt_stop(void)
 #if CONFIG_WATCHDOG
 	#if OS_QT
 		// NOP
+	#elif OS_POSIX
+		// NOP
+	#elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+		/* nop */
 	#elif CPU_AVR
 		WDTCR |= BV(WDCE) | BV(WDE);
 		WDTCR &= ~BV(WDE);