commit 95bc261f8f14404c14d2d1865f78cd25d57827a1
author qctecmdr <qctecmdr@localhost> Fri Apr 17 23:29:07 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 17 23:29:07 2020 -0700
tree e825e222f123c02cd6c44747122d6f4bf055ac09
parent 993ab67cd2529c86167588c527bcdf0375cee69c
parent 3bfd98b391fb7e59351cf3ccc5f9e9b5a4d8bbdd

Merge "hal: Update pcm_open flag for compress voip tx"

configs/msmnile/mixer_paths_pcie.xml

diff --git a/configs/msmnile/mixer_paths_pcie.xml b/configs/msmnile/mixer_paths_pcie.xml
index 4515cb2..01e275d 100755
--- a/configs/msmnile/mixer_paths_pcie.xml
+++ b/configs/msmnile/mixer_paths_pcie.xml
@@ -1878,11 +1878,11 @@
     <path name="voicemmode1-call">
         <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
         <ctl name="PCM_RX_DL_HL Switch" value="1" />
-        <ctl name="Voice Stub Tx Mixer SLIM_0_TX" value="1" />
+        <ctl name="Voice Stub Tx Mixer SLIM_1_TX" value="1" />
         <ctl name="AFE_PCM_RX_Voice Mixer Voice Stub" value="1" />
         <ctl name="Voice Stub Tx Mixer AFE_PCM_TX" value="1" />
         <ctl name="SLIM_6_RX_Voice Mixer Voice Stub" value="1" />
-        <ctl name="AFE_PCM_RX Port Mixer SLIM_0_TX" value="1" />
+        <ctl name="AFE_PCM_RX Port Mixer SLIM_1_TX" value="1" />
         <ctl name="SLIMBUS_6_RX Port Mixer AFE_PCM_TX" value="1" />
     </path>
 
@@ -1946,33 +1946,33 @@
     <path name="voicemmode2-call">
         <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
         <ctl name="PCM_RX_DL_HL Switch" value="1" />
-        <ctl name="Voice Stub Tx Mixer SLIM_0_TX" value="1" />
+        <ctl name="Voice Stub Tx Mixer SLIM_1_TX" value="1" />
         <ctl name="AFE_PCM_RX_Voice Mixer Voice Stub" value="1" />
         <ctl name="Voice Stub Tx Mixer AFE_PCM_TX" value="1" />
         <ctl name="SLIM_6_RX_Voice Mixer Voice Stub" value="1" />
-        <ctl name="AFE_PCM_RX Port Mixer SLIM_0_TX" value="1" />
+        <ctl name="AFE_PCM_RX Port Mixer SLIM_1_TX" value="1" />
         <ctl name="SLIMBUS_6_RX Port Mixer AFE_PCM_TX" value="1" />
     </path>
 
     <path name="voicemmode2-call headphones">
         <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
         <ctl name="PCM_RX_DL_HL Switch" value="1" />
-        <ctl name="Voice Stub Tx Mixer SLIM_0_TX" value="1" />
+        <ctl name="Voice Stub Tx Mixer SLIM_1_TX" value="1" />
         <ctl name="AFE_PCM_RX_Voice Mixer Voice Stub" value="1" />
         <ctl name="Voice Stub Tx Mixer AFE_PCM_TX" value="1" />
         <ctl name="SLIM_6_RX_Voice Mixer Voice Stub" value="1" />
-        <ctl name="AFE_PCM_RX Port Mixer SLIM_0_TX" value="1" />
+        <ctl name="AFE_PCM_RX Port Mixer SLIM_1_TX" value="1" />
         <ctl name="SLIMBUS_6_RX Port Mixer AFE_PCM_TX" value="1" />
     </path>
 
     <path name="voicemmode2-call headset">
         <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
         <ctl name="PCM_RX_DL_HL Switch" value="1" />
-        <ctl name="Voice Stub Tx Mixer SLIM_0_TX" value="1" />
+        <ctl name="Voice Stub Tx Mixer SLIM_1_TX" value="1" />
         <ctl name="AFE_PCM_RX_Voice Mixer Voice Stub" value="1" />
         <ctl name="Voice Stub Tx Mixer AFE_PCM_TX" value="1" />
         <ctl name="SLIM_6_RX_Voice Mixer Voice Stub" value="1" />
-        <ctl name="AFE_PCM_RX Port Mixer SLIM_0_TX" value="1" />
+        <ctl name="AFE_PCM_RX Port Mixer SLIM_1_TX" value="1" />
         <ctl name="SLIMBUS_6_RX Port Mixer AFE_PCM_TX" value="1" />
     </path>
 

hal/msm8974/platform.h

diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index da33147..7c807b4 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -627,6 +627,13 @@
 #define HOST_LESS_TX_ID -1
 #endif
 
+#ifndef PCIE_HOST_LESS_RX_ID
+#define PCIE_HOST_LESS_RX_ID -1
+#endif
+#ifndef PCIE_HOST_LESS_TX_ID
+#define PCIE_HOST_LESS_TX_ID -1
+#endif
+
 #ifdef PLATFORM_MSM8996
 #define VOICEMMODE1_CALL_PCM_DEVICE 2
 #define VOICEMMODE2_CALL_PCM_DEVICE 22