diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2008-12-02 17:37:23 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2008-12-02 17:37:23 +0000 |
commit | 6840cd12779dcdca1dc0f3f351c4920e3a0b6ad7 (patch) | |
tree | 985d75df0bac6d9100b931dc3d8e572d4000b14c | |
parent | 6eae16ae826a8c9f390dc33e8fbf47bcfe40f78b (diff) | |
download | rockbox-6840cd12779dcdca1dc0f3f351c4920e3a0b6ad7.tar.gz rockbox-6840cd12779dcdca1dc0f3f351c4920e3a0b6ad7.zip |
Sansa Clip: Do not return HOLD status in button_read_device()
It is read separately, and so backlight/buttonlight can be disabled
while hold switch is on
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19302 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/arm/as3525/sansa-clip/button-clip.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sansa-clip/button-target.h | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/firmware/target/arm/as3525/sansa-clip/button-clip.c b/firmware/target/arm/as3525/sansa-clip/button-clip.c index 65e72f51b6..d29d5afd2d 100644 --- a/firmware/target/arm/as3525/sansa-clip/button-clip.c +++ b/firmware/target/arm/as3525/sansa-clip/button-clip.c | |||
@@ -41,9 +41,6 @@ int button_read_device(void) | |||
41 | if (GPIOA_PIN(7)) | 41 | if (GPIOA_PIN(7)) |
42 | result |= BUTTON_POWER; | 42 | result |= BUTTON_POWER; |
43 | 43 | ||
44 | if (GPIOA_PIN(3)) | ||
45 | result |= BUTTON_HOLD; | ||
46 | |||
47 | /* This is a keypad using C4-C6 as columns and B0-B2 as rows */ | 44 | /* This is a keypad using C4-C6 as columns and B0-B2 as rows */ |
48 | GPIOC_PIN(4) = (1<<4); | 45 | GPIOC_PIN(4) = (1<<4); |
49 | 46 | ||
diff --git a/firmware/target/arm/as3525/sansa-clip/button-target.h b/firmware/target/arm/as3525/sansa-clip/button-target.h index 2e1e93dec0..e309a7275b 100644 --- a/firmware/target/arm/as3525/sansa-clip/button-target.h +++ b/firmware/target/arm/as3525/sansa-clip/button-target.h | |||
@@ -45,11 +45,10 @@ bool button_hold(void); | |||
45 | #define BUTTON_SELECT 0x00000080 | 45 | #define BUTTON_SELECT 0x00000080 |
46 | 46 | ||
47 | #define BUTTON_POWER 0x00000100 | 47 | #define BUTTON_POWER 0x00000100 |
48 | #define BUTTON_HOLD 0x00000200 | ||
49 | 48 | ||
50 | #define BUTTON_MAIN (BUTTON_HOME|BUTTON_VOL_UP|BUTTON_VOL_DOWN\ | 49 | #define BUTTON_MAIN (BUTTON_HOME|BUTTON_VOL_UP|BUTTON_VOL_DOWN\ |
51 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ | 50 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ |
52 | |BUTTON_SELECT|BUTTON_POWER|BUTTON_HOLD) | 51 | |BUTTON_SELECT|BUTTON_POWER) |
53 | 52 | ||
54 | #define BUTTON_REMOTE 0 | 53 | #define BUTTON_REMOTE 0 |
55 | 54 | ||