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 2978060..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,24 @@
 
 /*#*
  *#* $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.
+ *#*
  *#* Revision 1.6  2005/11/27 03:03:08  bernie
  *#* Add Qt support hack.
  *#*
@@ -38,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)
@@ -49,16 +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)
@@ -68,6 +98,11 @@ INLINE void wdt_reset(void)
                // Let Qt handle events
                ASSERT(qApp);
                qApp->processEvents();
+       #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
@@ -76,7 +111,7 @@ INLINE void wdt_reset(void)
 #endif /* CONFIG_WATCHDOG */
 }
 
-/*!
+/**
  * Set watchdog timer timeout.
  *
  * \param timeout  0: 16.3ms, 7: 2.1s
@@ -85,12 +120,17 @@ INLINE void wdt_init(uint8_t timeout)
 {
 #if CONFIG_WATCHDOG
        #if OS_QT
-               // create a dummy QApplication object
+               // Create a dummy QApplication object
                if (!qApp)
                {
                        int argc;
                        new QApplication(argc, (char **)NULL);
                }
+               (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;
@@ -107,6 +147,10 @@ INLINE void wdt_start(void)
 #if CONFIG_WATCHDOG
        #if OS_QT
                // NOP
+       #elif OS_POSIX
+               // NOP
+       #elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+               /* nop */
        #elif CPU_AVR
                WDTCR |= BV(WDE);
        #else
@@ -120,6 +164,10 @@ INLINE void wdt_stop(void)
 #if CONFIG_WATCHDOG
        #if OS_QT
                // NOP
+       #elif OS_POSIX
+               // NOP
+       #elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
+               /* nop */
        #elif CPU_AVR
                WDTCR |= BV(WDCE) | BV(WDE);
                WDTCR &= ~BV(WDE);