X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fwdt.h;h=8abba4791f9accaaf5f9193a62398c06add9c55e;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=9f57618f663b26b46be162379a050e141ffb7839;hpb=bbc33efb70a0062b36cc415452922e7ba69c748f;p=bertos.git

diff --git a/drv/wdt.h b/drv/wdt.h
old mode 100755
new mode 100644
index 9f57618f..8abba479
--- a/drv/wdt.h
+++ b/drv/wdt.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
@@ -14,6 +14,21 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.12  2007/06/07 14:35:12  batt
+ *#* Merge from project_ks.
+ *#*
+ *#* Revision 1.11  2006/07/19 12:56:26  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* 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.
  *#*
@@ -41,6 +56,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)
@@ -52,18 +68,27 @@
 	#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()
+		#if CPU_AVR_ATMEGA1281  // Name is different in atmega1281
+			#define WDTCR WDTCSR
+		#endif
+	#elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+		#include <task.h> /* taskYIELD() */
 	#else
 		#error unknown CPU
 	#endif
 #endif /* CONFIG_WATCHDOG */
 
-/*!
+/**
  * Reset the watchdog timer.
  */
 INLINE void wdt_reset(void)
@@ -76,6 +101,8 @@ INLINE void wdt_reset(void)
 	#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
@@ -84,7 +111,7 @@ INLINE void wdt_reset(void)
 #endif /* CONFIG_WATCHDOG */
 }
 
-/*!
+/**
  * Set watchdog timer timeout.
  *
  * \param timeout  0: 16.3ms, 7: 2.1s
@@ -102,6 +129,8 @@ INLINE void wdt_init(uint8_t timeout)
 		(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;
@@ -120,6 +149,8 @@ INLINE void wdt_start(void)
 		// NOP
 	#elif OS_POSIX
 		// NOP
+	#elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+		/* nop */
 	#elif CPU_AVR
 		WDTCR |= BV(WDE);
 	#else
@@ -135,6 +166,8 @@ INLINE void wdt_stop(void)
 		// NOP
 	#elif OS_POSIX
 		// NOP
+	#elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+		/* nop */
 	#elif CPU_AVR
 		WDTCR |= BV(WDCE) | BV(WDE);
 		WDTCR &= ~BV(WDE);