X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fwdt.h;h=c801757daaa2a572b9ebc7834f22f6422cbcc228;hb=6b2099c56772961182353617a8d4b839f6a1a6db;hp=a0982950f0c4b621a4c2b5eb0af62bf99d15262b;hpb=af9c555446161016fdd76c1cdff96ce76bb6cba2;p=bertos.git

diff --git a/drv/wdt.h b/drv/wdt.h
index a0982950..c801757d 100755
--- a/drv/wdt.h
+++ b/drv/wdt.h
@@ -2,7 +2,7 @@
  * \file
  * <!--
  * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \version $Id$
@@ -14,6 +14,24 @@
 
 /*#*
  *#* $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.6  2005/11/27 03:03:08  bernie
+ *#* Add Qt support hack.
+ *#*
+ *#* Revision 1.5  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.4  2005/04/12 01:37:17  bernie
+ *#* Prevent warning when watchdog is disabled.
+ *#*
  *#* Revision 1.3  2005/04/11 19:10:28  bernie
  *#* Include top-level headers from cfg/ subdir.
  *#*
@@ -27,8 +45,9 @@
 #ifndef DRV_WDT_H
 #define DRV_WDT_H
 
-#include <cfg/config.h>
+#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)
@@ -37,10 +56,21 @@
 
 #if CONFIG_WATCHDOG
 	#include <cfg/cpu.h>
+	#include <cfg/os.h>
 
-	#if CPU_AVR
+	#if OS_QT
+		#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 (ARCH & ARCH_FREERTOS)
+		#include <task.h> /* taskYIELD() */
 	#else
 		#error unknown CPU
 	#endif
@@ -52,7 +82,16 @@
 INLINE void wdt_reset(void)
 {
 #if CONFIG_WATCHDOG
-	#if CPU_AVR
+	#if OS_QT
+		// Let Qt handle events
+		ASSERT(qApp);
+		qApp->processEvents();
+	#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
 		#error unknown CPU
@@ -68,19 +107,39 @@ INLINE void wdt_reset(void)
 INLINE void wdt_init(uint8_t timeout)
 {
 #if CONFIG_WATCHDOG
-	#if CPU_AVR
+	#if OS_QT
+		// Create a dummy QApplication object
+		if (!qApp)
+		{
+			int argc;
+			new QApplication(argc, (char **)NULL);
+		}
+		(void)timeout;
+	#elif OS_POSIX
+		(void)timeout; // NOP
+	#elif (ARCH & ARCH_FREERTOS)
+		/* nop */
+	#elif CPU_AVR
 		WDTCR |= BV(WDCE) | BV(WDE);
 		WDTCR = timeout;
 	#else
 		#error unknown CPU
 	#endif
+#else
+	(void)timeout;
 #endif /* CONFIG_WATCHDOG */
 }
 
 INLINE void wdt_start(void)
 {
 #if CONFIG_WATCHDOG
-	#if CPU_AVR
+	#if OS_QT
+		// NOP
+	#elif OS_POSIX
+		// NOP
+	#elif (ARCH & ARCH_FREERTOS)
+		/* nop */
+	#elif CPU_AVR
 		WDTCR |= BV(WDE);
 	#else
 		#error unknown CPU
@@ -91,7 +150,13 @@ INLINE void wdt_start(void)
 INLINE void wdt_stop(void)
 {
 #if CONFIG_WATCHDOG
-	#if CPU_AVR
+	#if OS_QT
+		// NOP
+	#elif OS_POSIX
+		// NOP
+	#elif (ARCH & ARCH_FREERTOS)
+		/* nop */
+	#elif CPU_AVR
 		WDTCR |= BV(WDCE) | BV(WDE);
 		WDTCR &= ~BV(WDE);
 	#else