X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fwdt.h;h=bcea6bafb4194a09faaa15841317a242830b07af;hb=41625d1b16c8f1904c3a2a40b6972725311c66a8;hp=617cc0b9945dfa25dd6a000d94ff9b0ee27dc69b;hpb=db65f1b46869eaae3045d48c8c1af9146355afb4;p=bertos.git

diff --git a/drv/wdt.h b/drv/wdt.h
index 617cc0b9..bcea6baf 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,18 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
  *#*
@@ -21,17 +33,37 @@
 #ifndef DRV_WDT_H
 #define DRV_WDT_H
 
-#include <avr/io.h>
-#include <compiler.h>
-#include <cpu.h>
-#include <macros.h> // BV()
+#include <cfg/config.h>
+#include <cfg/compiler.h> // INLINE
+
+/* Configury sanity check */
+#if !defined(CONFIG_WATCHDOG) || (CONFIG_WATCHDOG != 0 && CONFIG_WATCHDOG != 1)
+	#error CONFIG_WATCHDOG must be defined to either 0 or 1
+#endif
+
+#if CONFIG_WATCHDOG
+	#include <cfg/cpu.h>
+
+	#if CPU_AVR
+		#include <avr/io.h>
+		#include <cfg/macros.h> // BV()
+	#else
+		#error unknown CPU
+	#endif
+#endif /* CONFIG_WATCHDOG */
 
 /*!
  * Reset the watchdog timer.
  */
 INLINE void wdt_reset(void)
 {
-	__asm__ __volatile__ ("wdr");
+#if CONFIG_WATCHDOG
+	#if CPU_AVR
+		__asm__ __volatile__ ("wdr");
+	#else
+		#error unknown CPU
+	#endif
+#endif /* CONFIG_WATCHDOG */
 }
 
 /*!
@@ -41,31 +73,39 @@ INLINE void wdt_reset(void)
  */
 INLINE void wdt_init(uint8_t timeout)
 {
-#if CPU_AVR
-	WDTCR |= BV(WDCE) | BV(WDE);
-	WDTCR = timeout;
+#if CONFIG_WATCHDOG
+	#if CPU_AVR
+		WDTCR |= BV(WDCE) | BV(WDE);
+		WDTCR = timeout;
+	#else
+		#error unknown CPU
+	#endif
 #else
-	#error unknown CPU
-#endif
+	(void)timeout;
+#endif /* CONFIG_WATCHDOG */
 }
 
 INLINE void wdt_start(void)
 {
-#if CPU_AVR
-	WDTCR |= BV(WDE);
-#else
-	#error unknown CPU
-#endif
+#if CONFIG_WATCHDOG
+	#if CPU_AVR
+		WDTCR |= BV(WDE);
+	#else
+		#error unknown CPU
+	#endif
+#endif /* CONFIG_WATCHDOG */
 }
 
 INLINE void wdt_stop(void)
 {
-#if CPU_AVR
-	WDTCR |= BV(WDCE) | BV(WDE);
-	WDTCR &= ~BV(WDE);
-#else
-	#error unknown CPU
-#endif
+#if CONFIG_WATCHDOG
+	#if CPU_AVR
+		WDTCR |= BV(WDCE) | BV(WDE);
+		WDTCR &= ~BV(WDE);
+	#else
+		#error unknown CPU
+	#endif
+#endif /* CONFIG_WATCHDOG */
 }
 
 #endif /* DRV_WDT_H */