diff options
Diffstat (limited to 'firmware/target/arm/at91sam')
-rw-r--r-- | firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/at91sam/lyre_proto1/timer-target.h | 13 |
2 files changed, 3 insertions, 16 deletions
diff --git a/firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c b/firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c index ef5c91169d..1b620e9c4f 100644 --- a/firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c +++ b/firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c | |||
@@ -48,7 +48,7 @@ void pitc_handler(void) | |||
48 | } | 48 | } |
49 | } | 49 | } |
50 | 50 | ||
51 | bool __timer_set(long cycles, bool start) | 51 | bool timer_set(long cycles, bool start) |
52 | { | 52 | { |
53 | if (cycles < 1000) /* Max value on PITC?? */ | 53 | if (cycles < 1000) /* Max value on PITC?? */ |
54 | { | 54 | { |
@@ -67,7 +67,7 @@ bool __timer_set(long cycles, bool start) | |||
67 | return false; | 67 | return false; |
68 | } | 68 | } |
69 | 69 | ||
70 | bool __timer_start(void) | 70 | bool timer_start(void) |
71 | { | 71 | { |
72 | bool retval = true; | 72 | bool retval = true; |
73 | volatile unsigned long pimr = 0; | 73 | volatile unsigned long pimr = 0; |
@@ -101,7 +101,7 @@ bool __timer_start(void) | |||
101 | return retval; | 101 | return retval; |
102 | } | 102 | } |
103 | 103 | ||
104 | void __timer_stop(void) | 104 | void timer_stop(void) |
105 | { | 105 | { |
106 | volatile unsigned long pimr = 0; | 106 | volatile unsigned long pimr = 0; |
107 | 107 | ||
diff --git a/firmware/target/arm/at91sam/lyre_proto1/timer-target.h b/firmware/target/arm/at91sam/lyre_proto1/timer-target.h index b8298d3d77..d0773130bf 100644 --- a/firmware/target/arm/at91sam/lyre_proto1/timer-target.h +++ b/firmware/target/arm/at91sam/lyre_proto1/timer-target.h | |||
@@ -25,17 +25,4 @@ | |||
25 | /* timer is based on PCLK and minimum division is 2 */ | 25 | /* timer is based on PCLK and minimum division is 2 */ |
26 | #define TIMER_FREQ (49156800/2) | 26 | #define TIMER_FREQ (49156800/2) |
27 | 27 | ||
28 | bool __timer_set(long cycles, bool set); | ||
29 | bool __timer_start(void); | ||
30 | void __timer_stop(void); | ||
31 | |||
32 | #define __TIMER_SET(cycles, set) \ | ||
33 | __timer_set(cycles, set) | ||
34 | |||
35 | #define __TIMER_START() \ | ||
36 | __timer_start() | ||
37 | |||
38 | #define __TIMER_STOP(...) \ | ||
39 | __timer_stop() | ||
40 | |||
41 | #endif /* TIMER_TARGET_H */ | 28 | #endif /* TIMER_TARGET_H */ |