projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add constants at the beginning of the mk file
[bertos.git]
/
bertos
/
cpu
/
avr
/
drv
/
timer_avr.h
diff --git
a/bertos/cpu/avr/drv/timer_avr.h
b/bertos/cpu/avr/drv/timer_avr.h
index de46d1b7fb124f65b4fb2de15ee881a7541fe46e..1eccd0efcd501abc7f6e256b635aa2ad0711c3b7 100644
(file)
--- a/
bertos/cpu/avr/drv/timer_avr.h
+++ b/
bertos/cpu/avr/drv/timer_avr.h
@@
-27,7
+27,7
@@
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bern
ardo Innocenti <bernie@develer.com
>
+ * Copyright 2000 Bern
ie Innocenti <bernie@codewiz.org
>
*
* -->
*
*
* -->
*
@@
-35,7
+35,7
@@
*
* \version $Id$
*
*
* \version $Id$
*
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
* \author Francesco Sacchi <batt@develer.com>
*
*/
* \author Francesco Sacchi <batt@develer.com>
*
*/
@@
-43,9
+43,9
@@
#ifndef DRV_TIMER_AVR_H
#define DRV_TIMER_AVR_H
#ifndef DRV_TIMER_AVR_H
#define DRV_TIMER_AVR_H
-#include "hw_cpu.h" /* CLOCK_FREQ */
+#include "hw
/hw
_cpu.h" /* CLOCK_FREQ */
-#include
<cfg/cfg_timer.h>
/* CONFIG_TIMER */
+#include
"cfg/cfg_timer.h"
/* CONFIG_TIMER */
#include <cfg/compiler.h> /* uint8_t */
#include <cfg/macros.h> /* DIV_ROUND */
#include <cfg/compiler.h> /* uint8_t */
#include <cfg/macros.h> /* DIV_ROUND */
@@
-55,8
+55,7
@@
*
* Select which hardware timer interrupt to use for system clock and softtimers.
* \note The timer 1 overflow mode set the timer as a 24 kHz PWM.
*
* Select which hardware timer interrupt to use for system clock and softtimers.
* \note The timer 1 overflow mode set the timer as a 24 kHz PWM.
- *
- * \{
+ * $WIZ$ timer_select = "TIMER_ON_OUTPUT_COMPARE0", "TIMER_ON_OVERFLOW1", "TIMER_ON_OUTPUT_COMPARE2", "TIMER_ON_OVERFLOW3", "TIMER_DEFAULT"
*/
#define TIMER_ON_OUTPUT_COMPARE0 1
#define TIMER_ON_OVERFLOW1 2
*/
#define TIMER_ON_OUTPUT_COMPARE0 1
#define TIMER_ON_OVERFLOW1 2
@@
-64,7
+63,6
@@
#define TIMER_ON_OVERFLOW3 4
#define TIMER_DEFAULT TIMER_ON_OUTPUT_COMPARE0 ///< Default system timer
#define TIMER_ON_OVERFLOW3 4
#define TIMER_DEFAULT TIMER_ON_OUTPUT_COMPARE0 ///< Default system timer
-/* \} */
/*
* Hardware dependent timer initialization.
/*
* Hardware dependent timer initialization.
@@
-73,7
+71,11
@@
#define TIMER_PRESCALER 64
#define TIMER_HW_BITS 8
#define TIMER_PRESCALER 64
#define TIMER_HW_BITS 8
- #define DEFINE_TIMER_ISR SIGNAL(SIG_OUTPUT_COMPARE0)
+ #if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168
+ #define DEFINE_TIMER_ISR SIGNAL(SIG_OUTPUT_COMPARE0A)
+ #else
+ #define DEFINE_TIMER_ISR SIGNAL(SIG_OUTPUT_COMPARE0)
+ #endif
#define TIMER_TICKS_PER_SEC 1000
#define TIMER_HW_CNT OCR_DIVISOR
#define TIMER_TICKS_PER_SEC 1000
#define TIMER_HW_CNT OCR_DIVISOR