diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-11-08 13:05:02 +0000 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-11-08 13:05:02 +0000 |
| commit | b1ee21d45e69600c169d9269ca09252ed2dc6708 (patch) | |
| tree | 42e214048df0bc9a00d43ecc1e2bb9719ceae3e6 /firmware | |
| parent | 59b1fbce36f831e37f33bb71b0b959d8f7b1d95d (diff) | |
| download | rockbox-b1ee21d45e69600c169d9269ca09252ed2dc6708.tar.gz rockbox-b1ee21d45e69600c169d9269ca09252ed2dc6708.zip | |
zenxfi/zenmozaic: put HAVE_HEADPHONE_DETECTION in config file
Otherwise it breaks the simulator build
Change-Id: I816a34920283fc16e9c08ed6abe5fa41c0671f0a
Diffstat (limited to 'firmware')
4 files changed, 2 insertions, 4 deletions
diff --git a/firmware/export/config/creativezenmozaic.h b/firmware/export/config/creativezenmozaic.h index 329fb26c5c..cb60cd3cab 100644 --- a/firmware/export/config/creativezenmozaic.h +++ b/firmware/export/config/creativezenmozaic.h | |||
| @@ -82,6 +82,7 @@ | |||
| 82 | #define HAVE_SW_TONE_CONTROLS | 82 | #define HAVE_SW_TONE_CONTROLS |
| 83 | 83 | ||
| 84 | #define CONFIG_KEYPAD CREATIVE_ZEN_PAD | 84 | #define CONFIG_KEYPAD CREATIVE_ZEN_PAD |
| 85 | #define HAVE_HEADPHONE_DETECTION | ||
| 85 | 86 | ||
| 86 | /* Define this to enable morse code input */ | 87 | /* Define this to enable morse code input */ |
| 87 | #define HAVE_MORSE_INPUT | 88 | #define HAVE_MORSE_INPUT |
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h index b38d455e4d..8594d7088a 100644 --- a/firmware/export/config/creativezenxfi.h +++ b/firmware/export/config/creativezenxfi.h | |||
| @@ -86,6 +86,7 @@ | |||
| 86 | #define HAVE_SW_TONE_CONTROLS | 86 | #define HAVE_SW_TONE_CONTROLS |
| 87 | 87 | ||
| 88 | #define CONFIG_KEYPAD CREATIVE_ZEN_PAD | 88 | #define CONFIG_KEYPAD CREATIVE_ZEN_PAD |
| 89 | #define HAVE_HEADPHONE_DETECTION | ||
| 89 | 90 | ||
| 90 | /* Define this to enable morse code input */ | 91 | /* Define this to enable morse code input */ |
| 91 | #define HAVE_MORSE_INPUT | 92 | #define HAVE_MORSE_INPUT |
diff --git a/firmware/target/arm/imx233/creative-zen/button-target.h b/firmware/target/arm/imx233/creative-zen/button-target.h index 33ba7a9db5..cddff4d9cc 100644 --- a/firmware/target/arm/imx233/creative-zen/button-target.h +++ b/firmware/target/arm/imx233/creative-zen/button-target.h | |||
| @@ -26,9 +26,6 @@ | |||
| 26 | bool button_debug_screen(void); | 26 | bool button_debug_screen(void); |
| 27 | 27 | ||
| 28 | #define HAS_BUTTON_HOLD | 28 | #define HAS_BUTTON_HOLD |
| 29 | #ifdef CREATIVE_ZENXFI | ||
| 30 | #define HAVE_HEADPHONE_DETECTION | ||
| 31 | #endif | ||
| 32 | 29 | ||
| 33 | #define IMX233_BUTTON_LRADC_CHANNEL 0 | 30 | #define IMX233_BUTTON_LRADC_CHANNEL 0 |
| 34 | #define IMX233_BUTTON_LRADC_HOLD_DET BLH_ADC | 31 | #define IMX233_BUTTON_LRADC_HOLD_DET BLH_ADC |
diff --git a/firmware/target/arm/imx233/creative-zenmozaic/button-target.h b/firmware/target/arm/imx233/creative-zenmozaic/button-target.h index 714e9983fd..29319b2c99 100644 --- a/firmware/target/arm/imx233/creative-zenmozaic/button-target.h +++ b/firmware/target/arm/imx233/creative-zenmozaic/button-target.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | bool button_debug_screen(void); | 26 | bool button_debug_screen(void); |
| 27 | 27 | ||
| 28 | #define HAS_BUTTON_HOLD | 28 | #define HAS_BUTTON_HOLD |
| 29 | #define HAVE_HEADPHONE_DETECTION | ||
| 30 | 29 | ||
| 31 | #define IMX233_BUTTON_LRADC_CHANNEL 0 | 30 | #define IMX233_BUTTON_LRADC_CHANNEL 0 |
| 32 | #define IMX233_BUTTON_LRADC_HOLD_DET BLH_ADC | 31 | #define IMX233_BUTTON_LRADC_HOLD_DET BLH_ADC |