diff options
Diffstat (limited to 'firmware/target/arm/imx31/gigabeat-s')
-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 */ |