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

diff --git a/drv/wdt.h b/drv/wdt.h
index a0982950..29780607 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,15 @@
 
 /*#*
  *#* $Log$
+ *#* 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,7 +36,7 @@
 #ifndef DRV_WDT_H
 #define DRV_WDT_H
 
-#include <cfg/config.h>
+#include <appconfig.h>
 #include <cfg/compiler.h> // INLINE
 
 /* Configury sanity check */
@@ -37,8 +46,11 @@
 
 #if CONFIG_WATCHDOG
 	#include <cfg/cpu.h>
+	#include <cfg/os.h>
 
-	#if CPU_AVR
+	#if OS_QT
+		#include <qapplication.h>
+	#elif CPU_AVR
 		#include <avr/io.h>
 		#include <cfg/macros.h> // BV()
 	#else
@@ -52,7 +64,11 @@
 INLINE void wdt_reset(void)
 {
 #if CONFIG_WATCHDOG
-	#if CPU_AVR
+	#if OS_QT
+		// Let Qt handle events
+		ASSERT(qApp);
+		qApp->processEvents();
+	#elif CPU_AVR
 		__asm__ __volatile__ ("wdr");
 	#else
 		#error unknown CPU
@@ -68,19 +84,30 @@ 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);
+		}
+	#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 CPU_AVR
 		WDTCR |= BV(WDE);
 	#else
 		#error unknown CPU
@@ -91,7 +118,9 @@ INLINE void wdt_start(void)
 INLINE void wdt_stop(void)
 {
 #if CONFIG_WATCHDOG
-	#if CPU_AVR
+	#if OS_QT
+		// NOP
+	#elif CPU_AVR
 		WDTCR |= BV(WDCE) | BV(WDE);
 		WDTCR &= ~BV(WDE);
 	#else