hal: add bus device support for hfp/voice dev selection
Add BUS device support for HFP and voice call usecase
on snd device selection.
Add max target channel definition for capture to four
on 6150 auto platform.
Change-Id: I453bb638cabaa14458cb9e8c3b501bc4e5c6f966
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 0321714..1dfbf86 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -5866,7 +5866,8 @@
snd_device = SND_DEVICE_OUT_BT_SCO_WB;
else
snd_device = SND_DEVICE_OUT_BT_SCO;
- } else if (devices & (AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {
+ } else if ((devices & (AUDIO_DEVICE_OUT_SPEAKER | AUDIO_DEVICE_OUT_SPEAKER_SAFE)) ||
+ (devices & AUDIO_DEVICE_OUT_BUS)) {
if (my_data->is_vbat_speaker || my_data->is_bcl_speaker) {
if (hw_info_is_stereo_spkr(my_data->hw_info)) {
if (my_data->mono_speaker == SPKR_1)
@@ -6418,7 +6419,8 @@
} else if (out_device & AUDIO_DEVICE_OUT_SPEAKER ||
out_device & AUDIO_DEVICE_OUT_SPEAKER_SAFE ||
out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||
- out_device & AUDIO_DEVICE_OUT_LINE) {
+ out_device & AUDIO_DEVICE_OUT_LINE ||
+ out_device & AUDIO_DEVICE_OUT_BUS) {
if (my_data->fluence_type != FLUENCE_NONE &&
(my_data->fluence_in_voice_call ||
my_data->fluence_in_hfp_call) &&
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 7b4647a..6e33cb8 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -444,7 +444,12 @@
#define MULTIMEDIA9_PCM_DEVICE 32
#define FM_PLAYBACK_PCM_DEVICE 5
#define FM_CAPTURE_PCM_DEVICE 6
+
+#ifdef PLATFORM_AUTO
+#define HFP_PCM_RX 36
+#else
#define HFP_PCM_RX 5
+#endif
#define INCALL_MUSIC_UPLINK_PCM_DEVICE 1