X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fwdt.h;h=9f57618f663b26b46be162379a050e141ffb7839;hb=8e431405692569d59b74509919eaec2f23df407f;hp=3f356cbbcb519f03c179a0b48403f060b4e6a1f5;hpb=3c11bc1916410f8325135265b1c2e8e3c21436b8;p=bertos.git

diff --git a/drv/wdt.h b/drv/wdt.h
index 3f356cbb..9f57618f 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,21 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
+ *#*
  *#* Revision 1.2  2004/11/16 21:02:07  bernie
  *#* Make driver optional; mark AVR specific parts as such.
  *#*
@@ -24,8 +39,8 @@
 #ifndef DRV_WDT_H
 #define DRV_WDT_H
 
-#include <config.h>
-#include <compiler.h> // INLINE
+#include <appconfig.h>
+#include <cfg/compiler.h> // INLINE
 
 /* Configury sanity check */
 #if !defined(CONFIG_WATCHDOG) || (CONFIG_WATCHDOG != 0 && CONFIG_WATCHDOG != 1)
@@ -33,11 +48,16 @@
 #endif
 
 #if CONFIG_WATCHDOG
-	#include <cpu.h>
+	#include <cfg/cpu.h>
+	#include <cfg/os.h>
 
-	#if CPU_AVR
+	#if OS_QT
+		#include <qapplication.h>
+	#elif OS_POSIX
+		#include <sys/select.h>
+	#elif CPU_AVR
 		#include <avr/io.h>
-		#include <macros.h> // BV()
+		#include <cfg/macros.h> // BV()
 	#else
 		#error unknown CPU
 	#endif
@@ -49,7 +69,14 @@
 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 CPU_AVR
 		__asm__ __volatile__ ("wdr");
 	#else
 		#error unknown CPU
@@ -65,19 +92,35 @@ 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 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 CPU_AVR
 		WDTCR |= BV(WDE);
 	#else
 		#error unknown CPU
@@ -88,7 +131,11 @@ 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 CPU_AVR
 		WDTCR |= BV(WDCE) | BV(WDE);
 		WDTCR &= ~BV(WDE);
 	#else