diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2009-06-29 14:29:46 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-06-29 14:29:46 +0000 |
commit | 89ccd5c145e45ad541a02f38e2ad07fb916f7135 (patch) | |
tree | 5fc32e78d793022246e3893f7c420f52d624c96e /firmware/target/sh | |
parent | b955dff268005d3d55ee3f38af0875718ab6021a (diff) | |
download | rockbox-89ccd5c145e45ad541a02f38e2ad07fb916f7135.tar.gz rockbox-89ccd5c145e45ad541a02f38e2ad07fb916f7135.zip |
Remove int_prio argument from timer_register, and move the only use for it into alpine_cdc plugin, since this plugin is only built on SH7034
Also remove it from TIMER_START()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21558 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/sh')
-rw-r--r-- | firmware/target/sh/archos/timer-archos.c | 4 | ||||
-rw-r--r-- | firmware/target/sh/archos/timer-target.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/sh/archos/timer-archos.c b/firmware/target/sh/archos/timer-archos.c index e7526a8409..c61318f721 100644 --- a/firmware/target/sh/archos/timer-archos.c +++ b/firmware/target/sh/archos/timer-archos.c | |||
@@ -71,9 +71,9 @@ bool __timer_set(long cycles, bool start) | |||
71 | return true; | 71 | return true; |
72 | } | 72 | } |
73 | 73 | ||
74 | bool __timer_start(int int_prio) | 74 | bool __timer_start(void) |
75 | { | 75 | { |
76 | IPRD = (IPRD & 0xFF0F) | int_prio << 4; /* interrupt priority */ | 76 | IPRD = (IPRD & 0xFF0F) | 1 << 4; /* interrupt priority */ |
77 | or_b(0x10, &TSTR); /* start timer 4 */ | 77 | or_b(0x10, &TSTR); /* start timer 4 */ |
78 | return true; | 78 | return true; |
79 | } | 79 | } |
diff --git a/firmware/target/sh/archos/timer-target.h b/firmware/target/sh/archos/timer-target.h index 08fcae1156..89dfe57eb3 100644 --- a/firmware/target/sh/archos/timer-target.h +++ b/firmware/target/sh/archos/timer-target.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #include "config.h" | 24 | #include "config.h" |
25 | 25 | ||
26 | bool __timer_set(long cycles, bool start); | 26 | bool __timer_set(long cycles, bool start); |
27 | bool __timer_start(int int_prio); | 27 | bool __timer_start(void); |
28 | void __timer_stop(void); | 28 | void __timer_stop(void); |
29 | 29 | ||
30 | #define TIMER_FREQ CPU_FREQ | 30 | #define TIMER_FREQ CPU_FREQ |
@@ -32,8 +32,8 @@ void __timer_stop(void); | |||
32 | #define __TIMER_SET(cycles, set) \ | 32 | #define __TIMER_SET(cycles, set) \ |
33 | __timer_set(cycles, set) | 33 | __timer_set(cycles, set) |
34 | 34 | ||
35 | #define __TIMER_START(int_prio) \ | 35 | #define __TIMER_START() \ |
36 | __timer_start(int_prio) | 36 | __timer_start() |
37 | 37 | ||
38 | #define __TIMER_STOP(...) \ | 38 | #define __TIMER_STOP(...) \ |
39 | __timer_stop() | 39 | __timer_stop() |