diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2014-02-04 00:25:24 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2014-02-10 23:14:25 +0100 |
commit | 965c268e5f486ea9fc564c31bcdb2391ed2fb2b6 (patch) | |
tree | e684f8b80d490b3d272f01d011f46142f9d79f8b /firmware/target/arm | |
parent | 0324bf59a8810cadf35d67f71f5ee409834ec4ee (diff) | |
download | rockbox-965c268e5f486ea9fc564c31bcdb2391ed2fb2b6.tar.gz rockbox-965c268e5f486ea9fc564c31bcdb2391ed2fb2b6.zip |
imx233: handle jack detect inversion on some devices
Change-Id: I6e8644d8dc410f275c7c7580fa9bcbd2fa26a041
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/imx233/creative-zen/button-zen.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/firmware/target/arm/imx233/creative-zen/button-zen.c b/firmware/target/arm/imx233/creative-zen/button-zen.c index c0e7205675..fa01e9370e 100644 --- a/firmware/target/arm/imx233/creative-zen/button-zen.c +++ b/firmware/target/arm/imx233/creative-zen/button-zen.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #if defined(CREATIVE_ZENXFI) || defined(CREATIVE_ZENMOZAIC) | 28 | #if defined(CREATIVE_ZENXFI) || defined(CREATIVE_ZENMOZAIC) |
29 | #define JACK_DET_BANK 2 | 29 | #define JACK_DET_BANK 2 |
30 | #define JACK_DET_PIN 8 | 30 | #define JACK_DET_PIN 8 |
31 | #define JACK_DET_INVERTED | ||
31 | #elif defined(CREATIVE_ZENXFISTYLE) | 32 | #elif defined(CREATIVE_ZENXFISTYLE) |
32 | #define JACK_DET_BANK 2 | 33 | #define JACK_DET_BANK 2 |
33 | #define JACK_DET_PIN 7 | 34 | #define JACK_DET_PIN 7 |
@@ -134,7 +135,11 @@ bool button_hold(void) | |||
134 | #ifdef HAVE_HEADPHONE_DETECTION | 135 | #ifdef HAVE_HEADPHONE_DETECTION |
135 | bool headphones_inserted(void) | 136 | bool headphones_inserted(void) |
136 | { | 137 | { |
137 | return !imx233_pinctrl_get_gpio(JACK_DET_BANK, JACK_DET_PIN); | 138 | bool det = imx233_pinctrl_get_gpio(JACK_DET_BANK, JACK_DET_PIN); |
139 | #ifdef JACK_DET_INVERTED | ||
140 | det = !det; | ||
141 | #endif | ||
142 | return det; | ||
138 | } | 143 | } |
139 | #endif | 144 | #endif |
140 | 145 | ||