summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Bukat <marcin.bukat@gmail.com>2011-03-15 07:30:29 +0000
committerMarcin Bukat <marcin.bukat@gmail.com>2011-03-15 07:30:29 +0000
commit55e75866422aabbe927a52fb2ddaccc2525061a1 (patch)
treefa4f9e1478aeeefd66fc7d719f3f665b350ef89d
parentf056669dcd1cc030e1d6206bda9a50beccbc8fc1 (diff)
downloadrockbox-55e75866422aabbe927a52fb2ddaccc2525061a1.zip
rockbox-55e75866422aabbe927a52fb2ddaccc2525061a1.tar.gz
rockbox-55e75866422aabbe927a52fb2ddaccc2525061a1.tar.bz2
rockbox-55e75866422aabbe927a52fb2ddaccc2525061a1.tar.xz
MPIO HD300: Enable line-in recording. Thanks Andriej Azariev for pointing out such capability of this DAP.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29590 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/audio/wm8751.c3
-rw-r--r--firmware/export/config/mpiohd300.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/firmware/drivers/audio/wm8751.c b/firmware/drivers/audio/wm8751.c
index 30c3b0d..d2d7f8f 100644
--- a/firmware/drivers/audio/wm8751.c
+++ b/firmware/drivers/audio/wm8751.c
@@ -635,7 +635,10 @@ void audiohw_set_recsrc(int source, bool recording)
wmcodec_clear_bits(RIGHTMIX2, RIGHTMIX2_RI2RO);
wmcodec_set_bits(RIGHTMIX2, RIGHTMIX2_RD2RO);
+#if !defined(MPIO_HD300)
+ /* HD300 uses the same socket for headphones and line-in */
audiohw_mute(false);
+#endif
break;
#endif
#if (INPUT_SRC_CAPS & SRC_CAP_MIC)
diff --git a/firmware/export/config/mpiohd300.h b/firmware/export/config/mpiohd300.h
index 72ffb06..6728d5c 100644
--- a/firmware/export/config/mpiohd300.h
+++ b/firmware/export/config/mpiohd300.h
@@ -19,7 +19,7 @@
/* Define bitmask of input sources - recordable bitmask can be defined
* explicitly if different
*/
-#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO)
+#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO)
/* define the bitmask of hardware sample rates */
#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11)