diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2009-01-23 22:45:33 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2009-01-23 22:45:33 +0000 |
commit | ef8413eb4fd7fead45d33b3ecae003210978b85d (patch) | |
tree | aef037e05b55c3c1600b08222a67962341158788 /firmware/target/arm/imx31 | |
parent | f8816724112cf035fc18889235ce84a76bb34803 (diff) | |
download | rockbox-ef8413eb4fd7fead45d33b3ecae003210978b85d.tar.gz rockbox-ef8413eb4fd7fead45d33b3ecae003210978b85d.zip |
Gigabeat S: Make sure the hold button on the remote is independent of the main one.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19833 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/imx31')
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/button-imx31.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c b/firmware/target/arm/imx31/gigabeat-s/button-imx31.c index dec0aa108f..9c35fb13da 100644 --- a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c +++ b/firmware/target/arm/imx31/gigabeat-s/button-imx31.c | |||
@@ -150,8 +150,14 @@ int button_read_device(void) | |||
150 | * first key down event. */ | 150 | * first key down event. */ |
151 | KPP_KPSR |= KPP_KPSR_KDIE; | 151 | KPP_KPSR |= KPP_KPSR_KDIE; |
152 | 152 | ||
153 | /* If hold, ignore any pressed button */ | 153 | #ifdef HAVE_HEADPHONE_DETECTION |
154 | /* If hold, ignore any pressed button. Remote has its own hold | ||
155 | * switch, so return state regardless. */ | ||
156 | return hold_button ? (int_btn & BUTTON_REMOTE) : int_btn; | ||
157 | #else | ||
158 | /* If hold, ignore any pressed button. */ | ||
154 | return hold_button ? BUTTON_NONE : int_btn; | 159 | return hold_button ? BUTTON_NONE : int_btn; |
160 | #endif | ||
155 | } | 161 | } |
156 | 162 | ||
157 | /* This is called from the mc13783 interrupt thread */ | 163 | /* This is called from the mc13783 interrupt thread */ |