summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2013-11-08 13:05:02 +0000
committerAmaury Pouly <amaury.pouly@gmail.com>2013-11-08 13:05:02 +0000
commitb1ee21d45e69600c169d9269ca09252ed2dc6708 (patch)
tree42e214048df0bc9a00d43ecc1e2bb9719ceae3e6
parent59b1fbce36f831e37f33bb71b0b959d8f7b1d95d (diff)
downloadrockbox-b1ee21d.tar.gz
rockbox-b1ee21d.zip
zenxfi/zenmozaic: put HAVE_HEADPHONE_DETECTION in config file
Otherwise it breaks the simulator build Change-Id: I816a34920283fc16e9c08ed6abe5fa41c0671f0a
-rw-r--r--firmware/export/config/creativezenmozaic.h1
-rw-r--r--firmware/export/config/creativezenxfi.h1
-rw-r--r--firmware/target/arm/imx233/creative-zen/button-target.h3
-rw-r--r--firmware/target/arm/imx233/creative-zenmozaic/button-target.h1
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 @@
#define HAVE_SW_TONE_CONTROLS
#define CONFIG_KEYPAD CREATIVE_ZEN_PAD
+#define HAVE_HEADPHONE_DETECTION
/* Define this to enable morse code input */
#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 @@
#define HAVE_SW_TONE_CONTROLS
#define CONFIG_KEYPAD CREATIVE_ZEN_PAD
+#define HAVE_HEADPHONE_DETECTION
/* Define this to enable morse code input */
#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 @@
bool button_debug_screen(void);
#define HAS_BUTTON_HOLD
-#ifdef CREATIVE_ZENXFI
-#define HAVE_HEADPHONE_DETECTION
-#endif
#define IMX233_BUTTON_LRADC_CHANNEL 0
#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 @@
bool button_debug_screen(void);
#define HAS_BUTTON_HOLD
-#define HAVE_HEADPHONE_DETECTION
#define IMX233_BUTTON_LRADC_CHANNEL 0
#define IMX233_BUTTON_LRADC_HOLD_DET BLH_ADC