projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add whence parameter to seek; change from char * to void * read/write input buffers.
[bertos.git]
/
drv
/
wdt.h
diff --git
a/drv/wdt.h
b/drv/wdt.h
index bfe3ce8891abf4c1c3b9021adab60cb56d36f5d2..8abba4791f9accaaf5f9193a62398c06add9c55e 100755
(executable)
--- a/
drv/wdt.h
+++ b/
drv/wdt.h
@@
-1,4
+1,4
@@
-/*
!
+/*
*
* \file
* <!--
* Copyright 2004 Develer S.r.l. (http://www.develer.com/)
* \file
* <!--
* Copyright 2004 Develer S.r.l. (http://www.develer.com/)
@@
-14,6
+14,12
@@
/*#*
*#* $Log$
/*#*
*#* $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.10 2006/05/18 00:38:42 bernie
*#* Work around missing ARCH_FREERTOS symbol.
*#*
@@
-72,6
+78,9
@@
#elif CPU_AVR
#include <avr/io.h>
#include <cfg/macros.h> // BV()
#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
#elif defined(ARCH_FREERTOS) && (ARCH & ARCH_FREERTOS)
#include <task.h> /* taskYIELD() */
#else
@@
-79,7
+88,7
@@
#endif
#endif /* CONFIG_WATCHDOG */
#endif
#endif /* CONFIG_WATCHDOG */
-/*
!
+/*
*
* Reset the watchdog timer.
*/
INLINE void wdt_reset(void)
* Reset the watchdog timer.
*/
INLINE void wdt_reset(void)
@@
-102,7
+111,7
@@
INLINE void wdt_reset(void)
#endif /* CONFIG_WATCHDOG */
}
#endif /* CONFIG_WATCHDOG */
}
-/*
!
+/*
*
* Set watchdog timer timeout.
*
* \param timeout 0: 16.3ms, 7: 2.1s
* Set watchdog timer timeout.
*
* \param timeout 0: 16.3ms, 7: 2.1s