Sistema l'errore da me commesso in fase di conversione...

[bertos.git] / drv / wdt.h

diff --git a/drv/wdt.h b/drv/wdt.h
old mode 100755 (executable)
new mode 100644 (file)
index c801757..8abba47
--- 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,15 @@
 
 /*#*
  *#* $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.
  *#*
@@ -69,14 +78,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 +101,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 +111,7 @@ INLINE void wdt_reset(void)
 #endif /* CONFIG_WATCHDOG */
 }
 
-/*!
+/**
  * Set watchdog timer timeout.
  *
  * \param timeout  0: 16.3ms, 7: 2.1s
@@ -117,7 +129,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 +149,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 +166,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);