From 6d877b3f669179638a3bf152bcf8b7b548157e86 Mon Sep 17 00:00:00 2001
From: vincenttew <vincenttew@google.com>
Date: Thu, 12 Oct 2023 15:10:46 +0800
Subject: [PATCH] audio: correct usb mfg playback/capture config

Bug: 300638975
Test: playback/capture/loopback cmd
Change-Id: Icf24017f0a61f2a9a5388d44c9bec5572a9513a6
Signed-off-by: vincenttew <vincenttew@google.com>
---
 audio/comet/config/mixer_paths_factory.xml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/audio/comet/config/mixer_paths_factory.xml b/audio/comet/config/mixer_paths_factory.xml
index 6cc52e9..7610255 100644
--- a/audio/comet/config/mixer_paths_factory.xml
+++ b/audio/comet/config/mixer_paths_factory.xml
@@ -22,6 +22,11 @@
     <ctl name="ASPRX1 Slot Position" value="0"/>
     <ctl name="R ASPRX1 Slot Position" 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="0" />
+
     <path name="mfg-playback">
     </path>
 
@@ -36,12 +41,14 @@
 
     <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 EP ID v2" value="1" />
         <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>
 
@@ -330,8 +337,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" />
@@ -339,6 +344,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>