projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add -fomit-frame-pointer when we are not in debug mode.
[bertos.git]
/
bertos
/
cpu
/
avr
/
drv
/
timer_avr.c
diff --git
a/bertos/cpu/avr/drv/timer_avr.c
b/bertos/cpu/avr/drv/timer_avr.c
index 4920934756467a5b271be1c04610ce0cb80060b4..1ef5caec801ee67ae7dec43a9ec0d4ecc7fcabee 100644
(file)
--- a/
bertos/cpu/avr/drv/timer_avr.c
+++ b/
bertos/cpu/avr/drv/timer_avr.c
@@
-26,7
+26,7
@@
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*
- * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2005
, 2010
Develer S.r.l. (http://www.develer.com/)
*
* -->
*
*
* -->
*
@@
-34,6
+34,7
@@
*
* \author Bernie Innocenti <bernie@codewiz.org>
* \author Francesco Sacchi <batt@develer.com>
*
* \author Bernie Innocenti <bernie@codewiz.org>
* \author Francesco Sacchi <batt@develer.com>
+ * \author Luca Ottaviano <lottaviano@develer.com>
*
* \brief Low-level timer module for AVR (implementation).
*
*
* \brief Low-level timer module for AVR (implementation).
*
@@
-48,10
+49,9
@@
#include <cpu/types.h>
#include <cpu/irq.h>
#include <cpu/types.h>
#include <cpu/irq.h>
-#include <avr/interrupt.h>
#include <avr/io.h>
#include <avr/io.h>
-#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168
+#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168
|| CPU_AVR_ATMEGA328P
#define REG_TIFR0 TIFR0
#define REG_TIFR1 TIFR1
#define REG_TIFR2 TIFR2
#define REG_TIFR0 TIFR0
#define REG_TIFR1 TIFR1
#define REG_TIFR2 TIFR2
@@
-118,7
+118,7
@@
/** HW dependent timer initialization */
#if (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE0)
/** HW dependent timer initialization */
#if (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE0)
-
static
void timer_hw_init(void)
+ void timer_hw_init(void)
{
cpu_flags_t flags;
IRQ_SAVE_DISABLE(flags);
{
cpu_flags_t flags;
IRQ_SAVE_DISABLE(flags);
@@
-149,14
+149,9
@@
IRQ_RESTORE(flags);
}
IRQ_RESTORE(flags);
}
- INLINE hptime_t timer_hw_hpread(void)
- {
- return TCNT0;
- }
-
#elif (CONFIG_TIMER == TIMER_ON_OVERFLOW1)
#elif (CONFIG_TIMER == TIMER_ON_OVERFLOW1)
-
static
void timer_hw_init(void)
+ void timer_hw_init(void)
{
cpu_flags_t flags;
IRQ_SAVE_DISABLE(flags);
{
cpu_flags_t flags;
IRQ_SAVE_DISABLE(flags);
@@
-188,13
+183,8
@@
IRQ_RESTORE(flags);
}
IRQ_RESTORE(flags);
}
- INLINE hptime_t timer_hw_hpread(void)
- {
- return TCNT1;
- }
-
#elif (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE2)
#elif (CONFIG_TIMER == TIMER_ON_OUTPUT_COMPARE2)
-
static
void timer_hw_init(void)
+ void timer_hw_init(void)
{
cpu_flags_t flags;
IRQ_SAVE_DISABLE(flags);
{
cpu_flags_t flags;
IRQ_SAVE_DISABLE(flags);
@@
-225,13
+215,9
@@
IRQ_RESTORE(flags);
}
IRQ_RESTORE(flags);
}
- INLINE hptime_t timer_hw_hpread(void)
- {
- return TCNT2;
- }
#elif (CONFIG_TIMER == TIMER_ON_OVERFLOW3)
#elif (CONFIG_TIMER == TIMER_ON_OVERFLOW3)
-
static
void timer_hw_init(void)
+ void timer_hw_init(void)
{
cpu_flags_t flags;
IRQ_SAVE_DISABLE(flags);
{
cpu_flags_t flags;
IRQ_SAVE_DISABLE(flags);
@@
-264,11
+250,6
@@
IRQ_RESTORE(flags);
}
IRQ_RESTORE(flags);
}
- INLINE hptime_t timer_hw_hpread(void)
- {
- return TCNT3;
- }
-
#else
#error Unimplemented value for CONFIG_TIMER
#endif /* CONFIG_TIMER */
#else
#error Unimplemented value for CONFIG_TIMER
#endif /* CONFIG_TIMER */