From 8a702b11f5fabfbcb1aff494011b7134e744be82 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Wed, 17 Mar 2021 17:35:14 +0800
Subject: [PATCH] audio: add mixer_path for call screen mode 4 and hearing aid

Test: call screen mode 2 and 4, normal voice call
Bug: 165750425
Bug: 177914228
Bug: 181924779
Bug: 165753519
Change-Id: I2373dab47e54bda8b8bb9d7d4fbcde42c2f921d0
---
 audio/oriole/config/mixer_paths.xml   | 30 +++++++++++++++++++++++++++
 audio/raven/config/mixer_paths.xml    | 30 +++++++++++++++++++++++++++
 audio/slider/config/mixer_paths.xml   | 30 +++++++++++++++++++++++++++
 audio/whitefin/config/mixer_paths.xml | 30 +++++++++++++++++++++++++++
 4 files changed, 120 insertions(+)

diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 696b1da..066eed8 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -127,6 +127,15 @@
     <ctl name="BT_RX Mixer EP7" value="0"/>
     <ctl name="BT_RX Mixer NoHost1" value="0"/>
 
+    <ctl name="INCALL_RX Mixer EP1" value="0"/>
+    <ctl name="INCALL_RX Mixer EP2" value="0"/>
+    <ctl name="INCALL_RX Mixer EP3" value="0"/>
+    <ctl name="INCALL_RX Mixer EP4" value="0"/>
+    <ctl name="INCALL_RX Mixer EP5" value="0"/>
+    <ctl name="INCALL_RX Mixer EP6" value="0"/>
+    <ctl name="INCALL_RX Mixer EP7" value="0"/>
+    <ctl name="INCALL_RX Mixer NoHost1" value="0"/>
+
     <ctl name="SINK_IDS" id="0" value="-1"/>
     <ctl name="SINK_IDS" id="1" value="-1"/>
 
@@ -171,6 +180,14 @@
     <ctl name="EP6 TX Mixer USB_TX" value="0"/>
     <ctl name="NoHost1 TX Mixer USB_TX" value="0"/>
 
+    <ctl name="EP1 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP2 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP3 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP4 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP5 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP6 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="NoHost1 TX Mixer INCALL_TX" value="0"/>
+
     <ctl name="EP4 TX Mixer I2S_2_TX" value="0"/>
 
     <!-- USB setting -->
@@ -534,6 +551,11 @@
     </path>
 
     <path name="voice-callP hearing-aid">
+        <ctl name="INCALL_RX Mixer EP5" value="1"/>
+    </path>
+
+    <path name="voice-callP call-screen">
+        <ctl name="INCALL_RX Mixer EP5" value="1"/>
     </path>
 
     <path name="voice-callC">
@@ -558,6 +580,14 @@
     <path name="voice-callC usb-tty-vco-mic">
     </path>
 
+    <path name="voice-callC hearing-aid">
+        <ctl name="EP4 TX Mixer INCALL_TX" value="1"/>
+    </path>
+
+    <path name="voice-callC call-screen">
+        <ctl name="EP4 TX Mixer INCALL_TX" value="1"/>
+    </path>
+
     <path name="hostless-ulC spk-vi">
         <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1"/>
     </path>
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 696b1da..a94dfd9 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -127,6 +127,15 @@
     <ctl name="BT_RX Mixer EP7" value="0"/>
     <ctl name="BT_RX Mixer NoHost1" value="0"/>
 
+    <ctl name="INCALL_RX Mixer EP1" value="0"/>
+    <ctl name="INCALL_RX Mixer EP2" value="0"/>
+    <ctl name="INCALL_RX Mixer EP3" value="0"/>
+    <ctl name="INCALL_RX Mixer EP4" value="0"/>
+    <ctl name="INCALL_RX Mixer EP5" value="0"/>
+    <ctl name="INCALL_RX Mixer EP6" value="0"/>
+    <ctl name="INCALL_RX Mixer EP7" value="0"/>
+    <ctl name="INCALL_RX Mixer NoHost1" value="0"/>
+
     <ctl name="SINK_IDS" id="0" value="-1"/>
     <ctl name="SINK_IDS" id="1" value="-1"/>
 
@@ -173,6 +182,14 @@
 
     <ctl name="EP4 TX Mixer I2S_2_TX" value="0"/>
 
+    <ctl name="EP1 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP2 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP3 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP4 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP5 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP6 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="NoHost1 TX Mixer INCALL_TX" value="0"/>
+
     <!-- USB setting -->
     <ctl name="USB Dev ID" value="1"/>
     <ctl name="USB Playback EP ID" value="1"/>
@@ -534,6 +551,11 @@
     </path>
 
     <path name="voice-callP hearing-aid">
+        <ctl name="INCALL_RX Mixer EP5" value="1"/>
+    </path>
+
+    <path name="voice-callP call-screen">
+        <ctl name="INCALL_RX Mixer EP5" value="1"/>
     </path>
 
     <path name="voice-callC">
@@ -558,6 +580,14 @@
     <path name="voice-callC usb-tty-vco-mic">
     </path>
 
+    <path name="voice-callC hearing-aid">
+        <ctl name="EP4 TX Mixer INCALL_TX" value="1"/>
+    </path>
+
+    <path name="voice-callC call-screen">
+        <ctl name="EP4 TX Mixer INCALL_TX" value="1"/>
+    </path>
+
     <path name="hostless-ulC spk-vi">
         <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1"/>
     </path>
diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml
index ed7c2fe..d2c10f4 100644
--- a/audio/slider/config/mixer_paths.xml
+++ b/audio/slider/config/mixer_paths.xml
@@ -114,6 +114,15 @@
     <ctl name="BT_RX Mixer EP7" value="0"/>
     <ctl name="BT_RX Mixer NoHost1" value="0"/>
 
+    <ctl name="INCALL_RX Mixer EP1" value="0"/>
+    <ctl name="INCALL_RX Mixer EP2" value="0"/>
+    <ctl name="INCALL_RX Mixer EP3" value="0"/>
+    <ctl name="INCALL_RX Mixer EP4" value="0"/>
+    <ctl name="INCALL_RX Mixer EP5" value="0"/>
+    <ctl name="INCALL_RX Mixer EP6" value="0"/>
+    <ctl name="INCALL_RX Mixer EP7" value="0"/>
+    <ctl name="INCALL_RX Mixer NoHost1" value="0"/>
+
     <ctl name="EP1 TX Mixer TDM_0_TX" value="0"/>
     <ctl name="EP2 TX Mixer TDM_0_TX" value="0"/>
     <ctl name="EP4 TX Mixer TDM_0_TX" value="0"/>
@@ -137,6 +146,14 @@
     <ctl name="EP6 TX Mixer USB_TX" value="0"/>
     <ctl name="NoHost1 TX Mixer USB_TX" value="0"/>
 
+    <ctl name="EP1 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP2 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP3 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP4 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP5 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP6 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="NoHost1 TX Mixer INCALL_TX" value="0"/>
+
     <ctl name="NoHost1 TX Mixer TDM_0_TX" value="0"/>
 
     <ctl name="SINK_IDS" id="0" value="-1"/>
@@ -498,6 +515,11 @@
     </path>
 
     <path name="voice-callP hearing-aid">
+        <ctl name="INCALL_RX Mixer EP5" value="1"/>
+    </path>
+
+    <path name="voice-callP call-screen">
+        <ctl name="INCALL_RX Mixer EP5" value="1"/>
     </path>
 
     <path name="voice-callC">
@@ -522,6 +544,14 @@
     <path name="voice-callC usb-tty-vco-mic">
     </path>
 
+    <path name="voice-callC hearing-aid">
+        <ctl name="EP4 TX Mixer INCALL_TX" value="1"/>
+    </path>
+
+    <path name="voice-callC call-screen">
+        <ctl name="EP4 TX Mixer INCALL_TX" value="1"/>
+    </path>
+
     <path name="hostless-ulC spk-vi">
         <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1"/>
     </path>
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index ee676eb..86c8a85 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -128,6 +128,15 @@
     <ctl name="BT_RX Mixer EP7" value="0"/>
     <ctl name="BT_RX Mixer NoHost1" value="0"/>
 
+    <ctl name="INCALL_RX Mixer EP1" value="0"/>
+    <ctl name="INCALL_RX Mixer EP2" value="0"/>
+    <ctl name="INCALL_RX Mixer EP3" value="0"/>
+    <ctl name="INCALL_RX Mixer EP4" value="0"/>
+    <ctl name="INCALL_RX Mixer EP5" value="0"/>
+    <ctl name="INCALL_RX Mixer EP6" value="0"/>
+    <ctl name="INCALL_RX Mixer EP7" value="0"/>
+    <ctl name="INCALL_RX Mixer NoHost1" value="0"/>
+
     <ctl name="SINK_IDS" id="0" value="-1"/>
     <ctl name="SINK_IDS" id="1" value="-1"/>
 
@@ -172,6 +181,14 @@
     <ctl name="EP6 TX Mixer USB_TX" value="0"/>
     <ctl name="NoHost1 TX Mixer USB_TX" value="0"/>
 
+    <ctl name="EP1 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP2 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP3 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP4 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP5 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="EP6 TX Mixer INCALL_TX" value="0"/>
+    <ctl name="NoHost1 TX Mixer INCALL_TX" value="0"/>
+
     <ctl name="EP4 TX Mixer I2S_2_TX" value="0"/>
 
     <!-- USB setting -->
@@ -535,6 +552,11 @@
     </path>
 
     <path name="voice-callP hearing-aid">
+        <ctl name="INCALL_RX Mixer EP5" value="1"/>
+    </path>
+
+    <path name="voice-callP call-screen">
+        <ctl name="INCALL_RX Mixer EP5" value="1"/>
     </path>
 
     <path name="voice-callC">
@@ -559,6 +581,14 @@
     <path name="voice-callC usb-tty-vco-mic">
     </path>
 
+    <path name="voice-callC hearing-aid">
+        <ctl name="EP4 TX Mixer INCALL_TX" value="1"/>
+    </path>
+
+    <path name="voice-callC call-screen">
+        <ctl name="EP4 TX Mixer INCALL_TX" value="1"/>
+    </path>
+
     <path name="hostless-ulC spk-vi">
         <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1"/>
     </path>