summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-04-01 17:24:14 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-04-01 17:24:14 +0000
commiteef7f343c24ecd4597f6fd7e9b16ea81d38dab52 (patch)
tree02d0078f2602c51971b76bbeaf089a20ae16494d
parent2831acd538fa1f3f3a14c5674da88b89f3ee57cf (diff)
downloadrockbox-eef7f343c24ecd4597f6fd7e9b16ea81d38dab52.tar.gz
rockbox-eef7f343c24ecd4597f6fd7e9b16ea81d38dab52.zip
Clip+: remove button_hold() : we use software hold
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25428 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/as3525/sansa-clipplus/button-clip.c11
-rw-r--r--firmware/target/arm/as3525/sansa-clipplus/button-target.h1
2 files changed, 0 insertions, 12 deletions
diff --git a/firmware/target/arm/as3525/sansa-clipplus/button-clip.c b/firmware/target/arm/as3525/sansa-clipplus/button-clip.c
index 5b4af70c80..6514346654 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/button-clip.c
+++ b/firmware/target/arm/as3525/sansa-clipplus/button-clip.c
@@ -33,21 +33,10 @@ void button_init_device(void)
33 GPIOB_DIR |= (1<<0); /* Pin B0 set output */ 33 GPIOB_DIR |= (1<<0); /* Pin B0 set output */
34} 34}
35 35
36bool button_hold(void)
37{
38 /* TODO OF uses long home(A1) press. Just return false for now */
39 return false;
40}
41
42int button_read_device(void) 36int button_read_device(void)
43{ 37{
44 int buttons = 0; 38 int buttons = 0;
45 39
46 /* TODO No hold button Hold toggled by long home(A1) press in OF */
47 if(button_hold())
48 {
49 return 0;
50 }
51 /* Buttons do not appear to need reset */ 40 /* Buttons do not appear to need reset */
52 /* D6 needs special handling though */ 41 /* D6 needs special handling though */
53 42
diff --git a/firmware/target/arm/as3525/sansa-clipplus/button-target.h b/firmware/target/arm/as3525/sansa-clipplus/button-target.h
index 69f5d984ba..c341a94220 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/button-target.h
+++ b/firmware/target/arm/as3525/sansa-clipplus/button-target.h
@@ -27,7 +27,6 @@
27 27
28void button_init_device(void); 28void button_init_device(void);
29int button_read_device(void); 29int button_read_device(void);
30bool button_hold(void);
31 30
32/* Main unit's buttons */ 31/* Main unit's buttons */
33#define BUTTON_HOME 0x00000001 32#define BUTTON_HOME 0x00000001