summaryrefslogtreecommitdiff
path: root/firmware/target/coldfire/iriver
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/coldfire/iriver')
-rw-r--r--firmware/target/coldfire/iriver/button-target.h7
-rw-r--r--firmware/target/coldfire/iriver/h100/button-h100.c2
-rw-r--r--firmware/target/coldfire/iriver/h300/button-h300.c2
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
33bool button_hold(void);
34bool remote_button_hold(void);
35bool remote_button_hold_only(void);
36void button_init_device(void);
37int button_read_device(void);
38#ifdef IRIVER_H300_SERIES 33#ifdef IRIVER_H300_SERIES
39void button_enable_scan(bool enable); 34void button_enable_scan(bool enable);
40bool button_scan_enabled(void); 35bool 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
42bool remote_button_hold_only(void) 42static 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
58bool remote_button_hold_only(void) 58static 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 */