diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-08 00:07:19 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-08 00:07:19 +0000 |
commit | 95cf63b294f3cbe2d4da60f32a35c7b07c4b74a3 (patch) | |
tree | 26527cbd96f62ff5a26d46e8b63be40e0a306084 /firmware/target/coldfire/iriver | |
parent | 63ead774d534db1e07cdae3edb56655d43b19902 (diff) | |
download | rockbox-95cf63b294f3cbe2d4da60f32a35c7b07c4b74a3.tar.gz rockbox-95cf63b294f3cbe2d4da60f32a35c7b07c4b74a3.zip |
button-target.h : move prototypes to button.h
no need to define BUTTON_REMOTE anymore
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31620 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/coldfire/iriver')
-rw-r--r-- | firmware/target/coldfire/iriver/button-target.h | 7 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h100/button-h100.c | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h300/button-h300.c | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/firmware/target/coldfire/iriver/button-target.h b/firmware/target/coldfire/iriver/button-target.h index 4c15630e34..a677d042b3 100644 --- a/firmware/target/coldfire/iriver/button-target.h +++ b/firmware/target/coldfire/iriver/button-target.h | |||
@@ -24,17 +24,12 @@ | |||
24 | #ifndef _BUTTON_TARGET_H_ | 24 | #ifndef _BUTTON_TARGET_H_ |
25 | #define _BUTTON_TARGET_H_ | 25 | #define _BUTTON_TARGET_H_ |
26 | 26 | ||
27 | #include <stdbool.h> | ||
28 | #include "config.h" | 27 | #include "config.h" |
28 | #include <stdbool.h> | ||
29 | 29 | ||
30 | #define HAS_BUTTON_HOLD | 30 | #define HAS_BUTTON_HOLD |
31 | #define HAS_REMOTE_BUTTON_HOLD | 31 | #define HAS_REMOTE_BUTTON_HOLD |
32 | 32 | ||
33 | bool button_hold(void); | ||
34 | bool remote_button_hold(void); | ||
35 | bool remote_button_hold_only(void); | ||
36 | void button_init_device(void); | ||
37 | int button_read_device(void); | ||
38 | #ifdef IRIVER_H300_SERIES | 33 | #ifdef IRIVER_H300_SERIES |
39 | void button_enable_scan(bool enable); | 34 | void button_enable_scan(bool enable); |
40 | bool button_scan_enabled(void); | 35 | bool button_scan_enabled(void); |
diff --git a/firmware/target/coldfire/iriver/h100/button-h100.c b/firmware/target/coldfire/iriver/h100/button-h100.c index c32b979a00..dbaefdcf2a 100644 --- a/firmware/target/coldfire/iriver/h100/button-h100.c +++ b/firmware/target/coldfire/iriver/h100/button-h100.c | |||
@@ -39,7 +39,7 @@ bool button_hold(void) | |||
39 | return (GPIO1_READ & 0x00000002)?true:false; | 39 | return (GPIO1_READ & 0x00000002)?true:false; |
40 | } | 40 | } |
41 | 41 | ||
42 | bool remote_button_hold_only(void) | 42 | static bool remote_button_hold_only(void) |
43 | { | 43 | { |
44 | if(remote_type() == REMOTETYPE_H300_NONLCD) | 44 | if(remote_type() == REMOTETYPE_H300_NONLCD) |
45 | return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */ | 45 | return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */ |
diff --git a/firmware/target/coldfire/iriver/h300/button-h300.c b/firmware/target/coldfire/iriver/h300/button-h300.c index 43f5250191..74c14fb144 100644 --- a/firmware/target/coldfire/iriver/h300/button-h300.c +++ b/firmware/target/coldfire/iriver/h300/button-h300.c | |||
@@ -55,7 +55,7 @@ bool button_hold(void) | |||
55 | return (GPIO1_READ & 0x00000002)?true:false; | 55 | return (GPIO1_READ & 0x00000002)?true:false; |
56 | } | 56 | } |
57 | 57 | ||
58 | bool remote_button_hold_only(void) | 58 | static bool remote_button_hold_only(void) |
59 | { | 59 | { |
60 | if(remote_type() == REMOTETYPE_H300_NONLCD) | 60 | if(remote_type() == REMOTETYPE_H300_NONLCD) |
61 | return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */ | 61 | return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */ |