From 4485a24b4c937f4570d7c5a04c16513fce1adbb5 Mon Sep 17 00:00:00 2001
From: vincenttew <vincenttew@google.com>
Date: Wed, 23 Aug 2023 11:29:14 +0800
Subject: [PATCH] factory: correct usb mfg playback/capture config

Bug: 295291511
Test: playback/capture/loopback cmd
Change-Id: Icde54d0d25e0f71c569054f5e2886a11c7c2103f
Signed-off-by: vincenttew <vincenttew@google.com>
---
 audio/caiman/config/mixer_paths_factory.xml      | 16 ++++++++++++----
 audio/komodo/config/mixer_paths_factory.xml      | 16 ++++++++++++----
 .../ripcurrentpro/config/mixer_paths_factory.xml | 16 ++++++++++++----
 audio/tokay/config/mixer_paths_factory.xml       | 16 ++++++++++++----
 4 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/audio/caiman/config/mixer_paths_factory.xml b/audio/caiman/config/mixer_paths_factory.xml
index 5b9ef7b7..769dba9e 100644
--- a/audio/caiman/config/mixer_paths_factory.xml
+++ b/audio/caiman/config/mixer_paths_factory.xml
@@ -23,6 +23,10 @@
     <ctl name="R ASPRX1 Slot Position" value="1"/>
 
     <ctl name="HAC AMP EN" value="0" />
+    <ctl name="USB Card" value="1"/>
+    <ctl name="USB Device" value="0"/>
+    <ctl name="USB Direction" value="0" />
+    <ctl name="USB Memory Config" value="0" />
 
     <path name="mfg-playback">
     </path>
@@ -38,11 +42,13 @@
 
     <path name="mfg-record usb-headset-mic">
         <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
-        <ctl name="USB Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
         <ctl name="USB Playback EP ID v2" value="0" />
         <ctl name="USB Capture FORMAT v2" value="1" />
         <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="1" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="EP1 TX Mixer USB_TX" value="1"/>
     </path>
 
@@ -323,8 +329,6 @@
 
     <path name="mfg-playback usb-headphones">
         <ctl name="USB Dev ID v2" value="2" />
-        <ctl name="USB Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
         <ctl name="USB Playback EP ID v2" value="1" />
         <ctl name="USB Capture EP ID v2" value="0" />
         <ctl name="USB Playback FORMAT v2" value="6" />
@@ -332,6 +336,10 @@
         <ctl name="USB Playback CH v2" value="2" />
         <ctl name="USB Playback BW v2" value="16" />
         <ctl name="USB Config To AoC v2" value="1" />
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="0" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="USB_RX Mixer EP3" value="1" />
     </path>
 
diff --git a/audio/komodo/config/mixer_paths_factory.xml b/audio/komodo/config/mixer_paths_factory.xml
index 5b9ef7b7..769dba9e 100644
--- a/audio/komodo/config/mixer_paths_factory.xml
+++ b/audio/komodo/config/mixer_paths_factory.xml
@@ -23,6 +23,10 @@
     <ctl name="R ASPRX1 Slot Position" value="1"/>
 
     <ctl name="HAC AMP EN" value="0" />
+    <ctl name="USB Card" value="1"/>
+    <ctl name="USB Device" value="0"/>
+    <ctl name="USB Direction" value="0" />
+    <ctl name="USB Memory Config" value="0" />
 
     <path name="mfg-playback">
     </path>
@@ -38,11 +42,13 @@
 
     <path name="mfg-record usb-headset-mic">
         <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
-        <ctl name="USB Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
         <ctl name="USB Playback EP ID v2" value="0" />
         <ctl name="USB Capture FORMAT v2" value="1" />
         <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="1" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="EP1 TX Mixer USB_TX" value="1"/>
     </path>
 
@@ -323,8 +329,6 @@
 
     <path name="mfg-playback usb-headphones">
         <ctl name="USB Dev ID v2" value="2" />
-        <ctl name="USB Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
         <ctl name="USB Playback EP ID v2" value="1" />
         <ctl name="USB Capture EP ID v2" value="0" />
         <ctl name="USB Playback FORMAT v2" value="6" />
@@ -332,6 +336,10 @@
         <ctl name="USB Playback CH v2" value="2" />
         <ctl name="USB Playback BW v2" value="16" />
         <ctl name="USB Config To AoC v2" value="1" />
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="0" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="USB_RX Mixer EP3" value="1" />
     </path>
 
diff --git a/audio/ripcurrentpro/config/mixer_paths_factory.xml b/audio/ripcurrentpro/config/mixer_paths_factory.xml
index 14457738..b70172fe 100644
--- a/audio/ripcurrentpro/config/mixer_paths_factory.xml
+++ b/audio/ripcurrentpro/config/mixer_paths_factory.xml
@@ -25,6 +25,10 @@
     <ctl name="E ASPRX1 Slot Position" value="0"/>
 
     <ctl name="HAC AMP EN" value="0" />
+    <ctl name="USB Card" value="1"/>
+    <ctl name="USB Device" value="0"/>
+    <ctl name="USB Direction" value="0" />
+    <ctl name="USB Memory Config" value="0" />
 
     <path name="mfg-playback">
     </path>
@@ -40,11 +44,13 @@
 
     <path name="mfg-record usb-headset-mic">
         <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
-        <ctl name="USB Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
         <ctl name="USB Playback EP ID v2" value="0" />
         <ctl name="USB Capture FORMAT v2" value="1" />
         <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="1" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="EP1 TX Mixer USB_TX" value="1"/>
     </path>
 
@@ -475,8 +481,6 @@
 
     <path name="mfg-playback usb-headphones">
         <ctl name="USB Dev ID v2" value="2" />
-        <ctl name="USB Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
         <ctl name="USB Playback EP ID v2" value="1" />
         <ctl name="USB Capture EP ID v2" value="0" />
         <ctl name="USB Playback FORMAT v2" value="6" />
@@ -484,6 +488,10 @@
         <ctl name="USB Playback CH v2" value="2" />
         <ctl name="USB Playback BW v2" value="16" />
         <ctl name="USB Config To AoC v2" value="1" />
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="0" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="USB_RX Mixer EP3" value="1" />
     </path>
 
diff --git a/audio/tokay/config/mixer_paths_factory.xml b/audio/tokay/config/mixer_paths_factory.xml
index 5b9ef7b7..769dba9e 100644
--- a/audio/tokay/config/mixer_paths_factory.xml
+++ b/audio/tokay/config/mixer_paths_factory.xml
@@ -23,6 +23,10 @@
     <ctl name="R ASPRX1 Slot Position" value="1"/>
 
     <ctl name="HAC AMP EN" value="0" />
+    <ctl name="USB Card" value="1"/>
+    <ctl name="USB Device" value="0"/>
+    <ctl name="USB Direction" value="0" />
+    <ctl name="USB Memory Config" value="0" />
 
     <path name="mfg-playback">
     </path>
@@ -38,11 +42,13 @@
 
     <path name="mfg-record usb-headset-mic">
         <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
-        <ctl name="USB Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
         <ctl name="USB Playback EP ID v2" value="0" />
         <ctl name="USB Capture FORMAT v2" value="1" />
         <ctl name="USB Config To AoC v2" value="1"/>
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="1" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="EP1 TX Mixer USB_TX" value="1"/>
     </path>
 
@@ -323,8 +329,6 @@
 
     <path name="mfg-playback usb-headphones">
         <ctl name="USB Dev ID v2" value="2" />
-        <ctl name="USB Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
         <ctl name="USB Playback EP ID v2" value="1" />
         <ctl name="USB Capture EP ID v2" value="0" />
         <ctl name="USB Playback FORMAT v2" value="6" />
@@ -332,6 +336,10 @@
         <ctl name="USB Playback CH v2" value="2" />
         <ctl name="USB Playback BW v2" value="16" />
         <ctl name="USB Config To AoC v2" value="1" />
+        <ctl name="USB Card" value="1"/>
+        <ctl name="USB Device" value="0"/>
+        <ctl name="USB Direction" value="0" />
+        <ctl name="USB Memory Config" value="1" />
         <ctl name="USB_RX Mixer EP3" value="1" />
     </path>