From ef8413eb4fd7fead45d33b3ecae003210978b85d Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 23 Jan 2009 22:45:33 +0000 Subject: 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 --- firmware/target/arm/imx31/gigabeat-s/button-imx31.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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) * first key down event. */ KPP_KPSR |= KPP_KPSR_KDIE; - /* If hold, ignore any pressed button */ +#ifdef HAVE_HEADPHONE_DETECTION + /* If hold, ignore any pressed button. Remote has its own hold + * switch, so return state regardless. */ + return hold_button ? (int_btn & BUTTON_REMOTE) : int_btn; +#else + /* If hold, ignore any pressed button. */ return hold_button ? BUTTON_NONE : int_btn; +#endif } /* This is called from the mc13783 interrupt thread */ -- cgit v1.2.3