diff options
| author | Uday Kishore Pasupuleti <upasupul@codeaurora.org> | 2015-09-21 08:33:55 -0700 |
|---|---|---|
| committer | Prashant Malani <pmalani@google.com> | 2015-09-21 16:26:17 -0700 |
| commit | e9ef478adc4690c9d074c2dc063f9dc40ef81451 (patch) | |
| tree | 5c9b81423abe41b277e7b0f845ac93f176e5a75e | |
| parent | 7629719778eab7ca3729f26f2e5ad5120faa9c71 (diff) | |
| download | hardware_qcom_audio-e9ef478adc4690c9d074c2dc063f9dc40ef81451.tar.gz hardware_qcom_audio-e9ef478adc4690c9d074c2dc063f9dc40ef81451.tar.bz2 hardware_qcom_audio-e9ef478adc4690c9d074c2dc063f9dc40ef81451.zip | |
hal: Use default acdb id for hfp
Use default acdb id same as speaker and speaker-mic which will be present
on platforms. overwrite the acdb ids through device specific config file
audio_platform_info.xml if required.
Change-Id: I732dcdea691a1ae74b553964f349f1312d300da1
Signed-off-by: Uday Kishore Pasupuleti <upasupul@codeaurora.org>
| -rw-r--r-- | hal/msm8974/platform.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c index 061aa811..b2d6fa2d 100644 --- a/hal/msm8974/platform.c +++ b/hal/msm8974/platform.c @@ -288,7 +288,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { [SND_DEVICE_OUT_VOICE_TX] = 45, [SND_DEVICE_OUT_SPEAKER_PROTECTED] = 124, [SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED] = 101, - [SND_DEVICE_OUT_VOICE_SPEAKER_HFP] = 92, + [SND_DEVICE_OUT_VOICE_SPEAKER_HFP] = ACDB_ID_VOICE_SPEAKER, [SND_DEVICE_IN_HANDSET_MIC] = 4, [SND_DEVICE_IN_HANDSET_MIC_AEC] = 106, @@ -323,7 +323,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { [SND_DEVICE_IN_VOICE_DMIC] = 41, [SND_DEVICE_IN_VOICE_DMIC_TMUS] = ACDB_ID_VOICE_DMIC_EF_TMUS, [SND_DEVICE_IN_VOICE_SPEAKER_MIC] = 11, - [SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP] = 91, + [SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP] = 11, [SND_DEVICE_IN_VOICE_SPEAKER_DMIC] = 43, [SND_DEVICE_IN_VOICE_HEADSET_MIC] = 8, [SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC] = 16, @@ -366,6 +366,7 @@ static const struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_SAFE_AND_LINE)}, {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HANDSET)}, {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER)}, + {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_HFP)}, {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HEADPHONES)}, {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_LINE)}, {TO_NAME_INDEX(SND_DEVICE_OUT_HDMI)}, @@ -414,6 +415,7 @@ static const struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_DMIC)}, {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_DMIC_TMUS)}, {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_SPEAKER_MIC)}, + {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP)}, {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_SPEAKER_DMIC)}, {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_HEADSET_MIC)}, {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC)}, |