summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisael Lopez Cruz2014-01-27 17:43:56 -0600
committerGerrit Code Review2014-02-02 21:32:43 -0600
commit4a54e3f96b410df1206ab55f8e142fbe46cabe99 (patch)
treeeaa5e652f59b9fe1d105d6f6c6486b05fb86688c /audio/multizone/AudioHw.cpp
parent3e7221e16ebf33969e00b804532fc2ead8d31fbd (diff)
downloaddevice-ti-jacinto6evm-4a54e3f96b410df1206ab55f8e142fbe46cabe99.tar.gz
device-ti-jacinto6evm-4a54e3f96b410df1206ab55f8e142fbe46cabe99.tar.xz
device-ti-jacinto6evm-4a54e3f96b410df1206ab55f8e142fbe46cabe99.zip
audio: Multizone: Add support for auxiliary input
Add support for the auxiliary input available in the JAMR3 board in the Jacinto6 EVMs. The auxiliary input is a stereo analog port. Change-Id: I815dbcad3ea3ec47c57580a3243a631abdcbf4b9 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Diffstat (limited to 'audio/multizone/AudioHw.cpp')
-rw-r--r--audio/multizone/AudioHw.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/audio/multizone/AudioHw.cpp b/audio/multizone/AudioHw.cpp
index 7b237a0..d323139 100644
--- a/audio/multizone/AudioHw.cpp
+++ b/audio/multizone/AudioHw.cpp
@@ -735,6 +735,7 @@ uint32_t AudioHwDevice::getSupportedDevices() const
735 devices = AUDIO_DEVICE_IN_BUILTIN_MIC | 735 devices = AUDIO_DEVICE_IN_BUILTIN_MIC |
736 AUDIO_DEVICE_IN_BACK_MIC | 736 AUDIO_DEVICE_IN_BACK_MIC |
737 AUDIO_DEVICE_IN_VOICE_CALL | 737 AUDIO_DEVICE_IN_VOICE_CALL |
738 AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET |
738 AUDIO_DEVICE_OUT_SPEAKER | 739 AUDIO_DEVICE_OUT_SPEAKER |
739 AUDIO_DEVICE_OUT_WIRED_HEADPHONE | 740 AUDIO_DEVICE_OUT_WIRED_HEADPHONE |
740 AUDIO_DEVICE_OUT_WIRED_HEADSET | 741 AUDIO_DEVICE_OUT_WIRED_HEADSET |
@@ -1114,6 +1115,14 @@ AudioStreamIn* AudioHwDevice::openInputStream(audio_io_handle_t handle,
1114 srcSlot1 = 1; 1115 srcSlot1 = 1;
1115 } 1116 }
1116 break; 1117 break;
1118 case AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET:
1119 if (!usesJAMR3()) {
1120 ALOGE("AudioHwDevice: device 0x%08x requires JAMR3", devices);
1121 return NULL;
1122 }
1123 srcSlot0 = 0;
1124 srcSlot1 = 1;
1125 break;
1117 default: 1126 default:
1118 ALOGE("AudioHwDevice: device 0x%08x is not supported", devices); 1127 ALOGE("AudioHwDevice: device 0x%08x is not supported", devices);
1119 return NULL; 1128 return NULL;