X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fwdt.h;h=f13935ff312feb16e46ee4aefee0cad504227962;hb=27fef4ed34eb237817defa14242e726ccad70948;hp=7ff3e8f693c192c37f1c903bf2d9b6996587ae7d;hpb=bcf38f772b397e7a8ba781a69aacb9380e54b32a;p=bertos.git

diff --git a/drv/wdt.h b/drv/wdt.h
old mode 100755
new mode 100644
index 7ff3e8f6..f13935ff
--- 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$
@@ -14,6 +39,9 @@
 
 /*#*
  *#* $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.
  *#*
@@ -61,7 +89,7 @@
 #endif
 
 #if CONFIG_WATCHDOG
-	#include <cfg/cpu.h>
+	#include <cpu/cpu.h>
 	#include <cfg/os.h>
 
 	#if OS_QT
@@ -75,6 +103,9 @@
 	#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