From 6840cd12779dcdca1dc0f3f351c4920e3a0b6ad7 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Tue, 2 Dec 2008 17:37:23 +0000 Subject: 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 --- firmware/target/arm/as3525/sansa-clip/button-clip.c | 3 --- firmware/target/arm/as3525/sansa-clip/button-target.h | 3 +-- 2 files changed, 1 insertion(+), 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) if (GPIOA_PIN(7)) result |= BUTTON_POWER; - if (GPIOA_PIN(3)) - result |= BUTTON_HOLD; - /* This is a keypad using C4-C6 as columns and B0-B2 as rows */ GPIOC_PIN(4) = (1<<4); 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); #define BUTTON_SELECT 0x00000080 #define BUTTON_POWER 0x00000100 -#define BUTTON_HOLD 0x00000200 #define BUTTON_MAIN (BUTTON_HOME|BUTTON_VOL_UP|BUTTON_VOL_DOWN\ |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ - |BUTTON_SELECT|BUTTON_POWER|BUTTON_HOLD) + |BUTTON_SELECT|BUTTON_POWER) #define BUTTON_REMOTE 0 -- cgit v1.2.3