X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fwdt.h;h=1db1053841b438c81e3490e74d43bc16caf8983b;hb=2535cb94ec2183791128f8bbd109ca69a960cf78;hp=c801757daaa2a572b9ebc7834f22f6422cbcc228;hpb=c7499a9ba17c6914f82d7ae9718fc8c9765093fa;p=bertos.git

diff --git a/drv/wdt.h b/drv/wdt.h
old mode 100755
new mode 100644
index c801757d..1db10538
--- a/drv/wdt.h
+++ b/drv/wdt.h
@@ -1,8 +1,33 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \version $Id$
@@ -12,36 +37,6 @@
  * \brief Watchdog interface
  */
 
-/*#*
- *#* $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.
- *#*
- *#* Revision 1.2  2004/11/16 21:02:07  bernie
- *#* Make driver optional; mark AVR specific parts as such.
- *#*
- *#* Revision 1.1  2004/10/26 08:34:47  bernie
- *#* New DevLib module.
- *#*
- *#*/
 #ifndef DRV_WDT_H
 #define DRV_WDT_H
 
@@ -55,7 +50,7 @@
 #endif
 
 #if CONFIG_WATCHDOG
-	#include <cfg/cpu.h>
+	#include <cpu/detect.h>
 	#include <cfg/os.h>
 
 	#if OS_QT
@@ -69,14 +64,17 @@
 	#elif CPU_AVR
 		#include <avr/io.h>
 		#include <cfg/macros.h> // BV()
-	#elif (ARCH & ARCH_FREERTOS)
+		#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)
@@ -89,7 +87,7 @@ INLINE void wdt_reset(void)
 	#elif OS_POSIX
 		static struct timeval tv = { 0, 0 };
 		select(0, NULL, NULL, NULL, &tv);
-	#elif (ARCH & ARCH_FREERTOS)
+	#elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
 		vTaskDelay(1);
 	#elif CPU_AVR
 		__asm__ __volatile__ ("wdr");
@@ -99,7 +97,7 @@ INLINE void wdt_reset(void)
 #endif /* CONFIG_WATCHDOG */
 }
 
-/*!
+/**
  * Set watchdog timer timeout.
  *
  * \param timeout  0: 16.3ms, 7: 2.1s
@@ -117,7 +115,7 @@ INLINE void wdt_init(uint8_t timeout)
 		(void)timeout;
 	#elif OS_POSIX
 		(void)timeout; // NOP
-	#elif (ARCH & ARCH_FREERTOS)
+	#elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
 		/* nop */
 	#elif CPU_AVR
 		WDTCR |= BV(WDCE) | BV(WDE);
@@ -137,7 +135,7 @@ INLINE void wdt_start(void)
 		// NOP
 	#elif OS_POSIX
 		// NOP
-	#elif (ARCH & ARCH_FREERTOS)
+	#elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
 		/* nop */
 	#elif CPU_AVR
 		WDTCR |= BV(WDE);
@@ -154,7 +152,7 @@ INLINE void wdt_stop(void)
 		// NOP
 	#elif OS_POSIX
 		// NOP
-	#elif (ARCH & ARCH_FREERTOS)
+	#elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
 		/* nop */
 	#elif CPU_AVR
 		WDTCR |= BV(WDCE) | BV(WDE);