Snap for 11400057 from aadca75653fd9e19f63b204e58776af383c9a7f5 to simpleperf-releasesimpleperf-release

Change-Id: I240b76e882113a420df050a3311b4debe9ca10c0
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2024-02-02 23:45:21 +0000
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2024-02-02 23:45:21 +0000
commit: 0802adc6143f41f4264a2905109cd07bf1d55475 (patch)
tree: db60944b14041160211272bf34fb33acb9cbf28c
parent: ef3fef51595f8ef1a4f1295da38699dfebd19ab0 (diff)
parent: aadca75653fd9e19f63b204e58776af383c9a7f5 (diff)
download: lynx-simpleperf-release.tar.gz
27 files changed, 1212 insertions, 1232 deletions
diff --git a/audio/lynx/aidl_config/audio_platform_configuration.xml b/audio/lynx/aidl_config/audio_platform_configuration.xml
new file mode 100644
index 0000000..35c059d
--- /dev/null
+++ b/audio/lynx/aidl_config/audio_platform_configuration.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<audioPlatformConfiguration xmlns:xi="http://www.w3.org/2001/XInclude">
+  <features>
+    <feature name="ThermalThrottle">
+      <argument name="Type" value="SKIN" />
+      <argument name="Name" value="VIRTUAL-SKIN" />
+    </feature>
+    <feature name="BatteryThrottle">
+      <argument name="Type" value="BCL_VOLTAGE" />
+      <argument name="Name" value="BCL_AUDIO_BAACL" />
+      <argument name="Strategy" value="MediaSpeakerAndScreenOn" />
+    </feature>
+    <feature name="PlaybackThermalThrottle">
+      <argument name="PollWaitMs" value="20000" />
+      <argument name="ThermistorName" value="VIRTUAL-SKIN" />
+      <argument name="ThermistorType" value="SKIN" />
+      <argument name="ThrottlingSeverity" value="MODERATE" />
+    </feature>
+  </features>
+
+  <voipVolume>
+    <path voipDevice="VoipDevice::kUsb">
+      <gain>0.01</gain>
+      <gain>0.02</gain>
+      <gain>0.04</gain>
+      <gain>0.10</gain>
+      <gain>0.21</gain>
+      <gain>0.47</gain>
+      <gain>1.00</gain>
+    </path>
+  </voipVolume>
+
+  <devices>
+    <device name="bluetooth" />
+    <device name="usb">
+      <argument name="MaxSamplingRate" value="192000" />
+      <argument name="UnsupportedFormat" value="S24_LE" />
+      <argument name="MaxCapPacketInterval" value="125" />
+      <argument name="MaxCapSampleRate" value="192000" />
+      <argument name="MaxCapBitWidth" value="32" />
+      <argument name="MaxCapChannel" value="2" />
+      <argument name="EnableHifi192kMultichannel" value="0" />
+    </device>
+    <device name="speaker" codec="cs35l41">
+      <argument name="SpeakerNum" value="2" />
+      <argument name="Rotation" />
+      <argument name="AcousticShockProtection" />
+    </device>
+  </devices>
+
+  <tuners>
+    <tuner type="playback" name="waves">
+      <argument name="Sink" value="SPK" />
+      <argument name="ThermistorsName" value="VIRTUAL-SKIN" />
+    </tuner>
+    <tuner type="telephony" name="fortemedia">
+      <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
+      <argument name="VoIP_Rate" value="32000" />
+      <argument name="BOOST_USB_SWB_CLK" value="y" />
+      <argument name="CCA" value="y" />
+    </tuner>
+    <tuner type="capture" name="gs_capture" />
+  </tuners>
+
+  <latencies>
+    <latency source="primary-playback" sink="speaker" milliseconds="20" />
+    <latency source="primary-playback" sink="usb-device" milliseconds="10" />
+    <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-a2dp-device"
+      milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-low-energy-speaker"
+      milliseconds="10" />
+
+    <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
+    <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
+    <latency source="deep-buffer-playback" sink="usb-headset" milliseconds="70" />
+    <latency source="deep-buffer-playback" sink="bluetooth-a2dp-device"
+      milliseconds="180" />
+
+    <latency source="compress-offload-playback" sink="speaker" milliseconds="40" />
+    <latency source="compress-offload-playback" sink="usb-device"
+      milliseconds="40" />
+    <latency source="compress-offload-playback" sink="usb-headset"
+      milliseconds="40" />
+    <latency source="compress-offload-playback" sink="bluetooth-a2dp-device"
+      milliseconds="70" />
+
+    <latency source="immersive-playback" sink="bluetooth-a2dp-device"
+      milliseconds="100" />
+
+    <latency source="microphones" sink="primary-capture" milliseconds="160" />
+    <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
+    <latency source="bluetooth-sco-headset" sink="primary-capture"
+      milliseconds="40" />
+  </latencies>
+
+  <spatialCapture>
+    <enablement useCase="primary-capture" deviceInterface="microphones">
+      <source>MIC</source>
+      <source>CAMCORDER</source>
+      <source>VOICE_RECOGNITION</source>
+    </enablement>
+    <enablement useCase="primary-capture" deviceInterface="back-microphones">
+      <source>MIC</source>
+      <source>CAMCORDER</source>
+      <source>VOICE_RECOGNITION</source>
+    </enablement>
+  </spatialCapture>
+
+  <xi:include href="audio_policy_volumes.xml" />
+  <xi:include href="default_volume_tables.xml" />
+</audioPlatformConfiguration>
diff --git a/audio/lynx/aidl_config/audio_platform_configuration_aidl.xml b/audio/lynx/aidl_config/audio_platform_configuration_aidl.xml
deleted file mode 100644
index 912b4aa..0000000
--- a/audio/lynx/aidl_config/audio_platform_configuration_aidl.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2023, The Linux Foundation. All rights reserved.         -->
-<!--                                                                        -->
-<!-- Redistribution and use in source and binary forms, with or without     -->
-<!-- modification, are permitted provided that the following conditions are -->
-<!-- met:                                                                   -->
-<!--     * Redistributions of source code must retain the above copyright   -->
-<!--       notice, this list of conditions and the following disclaimer.    -->
-<!--     * Redistributions in binary form must reproduce the above          -->
-<!--       copyright notice, this list of conditions and the following      -->
-<!--       disclaimer in the documentation and/or other materials provided  -->
-<!--       with the distribution.                                           -->
-<!--     * Neither the name of The Linux Foundation nor the names of its    -->
-<!--       contributors may be used to endorse or promote products derived  -->
-<!--       from this software without specific prior written permission.    -->
-<!--                                                                        -->
-<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED           -->
-<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF   -->
-<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
-<!-- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
-<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
-<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF   -->
-<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR        -->
-<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  -->
-<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
-<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->
-<audio_platform_configuration>
-  <product_lists>
-    <product name="Blackbird">
-      <id value="18d1:5033" />
-    </product>
-    <product name="Condor">
-      <id value="18d1:5034" />
-    </product>
-    <product name="Condor_Sprint">
-      <id value="18d1:5038" />
-    </product>
-    <product name="Condor_Sprint2">
-      <id value="18d1:5036" />
-    </product>
-  </product_lists>
-
-  <features>
-    <feature name="ThermalThrottle=Type:SKIN,Name:VIRTUAL-SKIN" />
-    <feature
-      name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn" />
-    <feature
-      name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN,ThermistorType:SKIN,ThrottlingSeverity:MODERATE" />
-  </features>
-
-  <!-- The voip_db_mapping: format is "device="x" value="f1,f2..." -->
-  <!-- device should be "handset","speaker","usb","bt","bt_hearing_aid" or "digital_dock" -->
-  <voip_db_mapping>
-    <voip_path device="usb" value="0.01,0.02,0.04,0.1,0.21,0.47,1.0" />
-  </voip_db_mapping>
-
-  <!-- The device_builder: format is "type="x" codec_name="y" argu="z". name and argu are optional. -->
-  <device_builder>
-    <device type="bt" />
-    <device type="usb" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE" />
-    <device type="speaker" codec_name="cs35l41" argu="SpeakerNum=4,Rotation,AcousticShockProtection" />
-  </device_builder>
-
-  <!-- The spatial_capture_conditions: format is "use_case="x" audio_source="y" -->
-  <!-- use_case defines in aidl/audio/usecase/use_case.h, audio_source is definied in aidl interfaces. -->
-  <spatial_capture_conditions>
-    <conditions use_case="primary-capture" audio_source="MIC,CAMCORDER,VOICE_RECOGNITION" />
-  </spatial_capture_conditions>
-
-  <!-- The tuner_builder: format is "type="x" codec_name="y" argu="z". argu is optional. -->
-  <tuner_builder>
-    <tuner type="playback" name="waves" argu="Sink=SPK ThermistorsName=VIRTUAL-SKIN" />
-    <tuner type="telephony" name="fortemedia" argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y CCA=y" />
-    <tuner type="capture" name="gs_capture" />
-  </tuner_builder>
-</audio_platform_configuration>
diff --git a/audio/lynx/aidl_config/audio_policy_configuration.xml b/audio/lynx/aidl_config/audio_policy_configuration.xml
deleted file mode 100644
index dfc8577..0000000
--- a/audio/lynx/aidl_config/audio_policy_configuration.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <globalConfiguration speaker_drc_enabled="false" call_screen_mode_supported="true" />
-  <modules>
-    <!-- Primary Audio HAL -->
-    <module name="primary" halVersion="2.0">
-      <attachedDevices>
-        <item>Speaker</item>
-        <item>Speaker Safe</item>
-        <item>Earpiece</item>
-        <item>Built-In Mic</item>
-        <item>Built-In Back Mic</item>
-        <item>Telephony Tx</item>
-        <item>Voice Call And Telephony Rx</item>
-        <item>Echo Ref In</item>
-      </attachedDevices>
-      <defaultOutputDevice>Speaker</defaultOutputDevice>
-      <mixPorts>
-        <mixPort name="primary output" role="source"
-          flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST"
-          recommendedMuteDurationMs="40">
-          <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </mixPort>
-        <mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
-          <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </mixPort>
-        <mixPort name="compressed offload" role="source"
-          flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
-          <profile name="" format="AUDIO_FORMAT_MP3"
-            samplingRates="8000 16000 24000 32000 44100 48000"
-            channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" />
-          <profile name="" format="AUDIO_FORMAT_AAC_LC"
-            samplingRates="8000 16000 24000 32000 44100 48000"
-            channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" />
-          <profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
-            samplingRates="8000 16000 24000 32000 44100 48000"
-            channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" />
-          <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
-            samplingRates="8000 16000 24000 32000 44100 48000"
-            channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" />
-        </mixPort>
-        <mixPort name="haptic" role="source">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="48000"
-            channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" />
-        </mixPort>
-        <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
-          <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </mixPort>
-        <mixPort name="incall playback" role="source"
-          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="48000"
-            channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </mixPort>
-        <mixPort name="voip_rx" role="source"
-          flags="AUDIO_OUTPUT_FLAG_VOIP_RX">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </mixPort>
-        <!-- <mixPort name="mmap playback" role="source"
-          flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
-          <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </mixPort>
-        <mixPort name="raw" role="source"
-          flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
-          <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </mixPort> -->
-
-        <mixPort name="primary input" role="sink">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="48000"
-            channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3" />
-        </mixPort>
-        <mixPort name="voip_tx" role="sink"
-          flags="AUDIO_INPUT_FLAG_VOIP_TX">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO" />
-        </mixPort>
-        <mixPort name="fast input" role="sink"
-          flags="AUDIO_INPUT_FLAG_RAW AUDIO_INPUT_FLAG_FAST">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="48000"
-            channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" />
-        </mixPort>
-        <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="16000"
-            channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" />
-        </mixPort>
-        <!-- <mixPort name="mmap capture" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
-          <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-            samplingRates="48000"
-            channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" />
-        </mixPort> -->
-
-      </mixPorts>
-      <devicePorts>
-        <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
-        <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink" />
-        <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink" />
-        <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink" />
-        <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET"
-          role="sink" />
-        <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE"
-          role="sink" />
-        <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink" />
-        <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET"
-          role="sink" />
-        <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT"
-          role="sink" />
-        <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink" />
-        <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET"
-          role="sink" />
-        <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink" />
-        <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink" />
-        <!-- Input devices declaration, i.e. Source DEVICE PORT -->
-        <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source" />
-        <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC"
-          role="source" />
-        <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET"
-          role="source" />
-        <devicePort tagName="BT SCO Headset Mic"
-          type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source" />
-        <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
-          encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </devicePort>
-        <devicePort tagName="BT A2DP Headphones"
-          type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
-          encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </devicePort>
-        <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER"
-          role="sink"
-          encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </devicePort>
-        <devicePort tagName="BT BLE Headset" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"
-          encodedFormats="AUDIO_FORMAT_LC3">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </devicePort>
-        <devicePort tagName="BT BLE Speaker" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"
-          encodedFormats="AUDIO_FORMAT_LC3">
-          <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-        </devicePort>
-        <devicePort tagName="BLE Headset Mic" type="AUDIO_DEVICE_IN_BLE_HEADSET"
-          role="source">
-        </devicePort>
-        <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source" />
-        <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET"
-          role="source" />
-        <!-- AUDIO_DEVICE_IN_VOICE_CALL and AUDIO_DEVICE_IN_TELEPHONY_RX are in the same
-                value -->
-        <devicePort tagName="Voice Call And Telephony Rx" type="AUDIO_DEVICE_IN_VOICE_CALL"
-          role="source" />
-        <devicePort tagName="Echo Ref In" type="AUDIO_DEVICE_IN_ECHO_REFERENCE"
-          role="source" />
-      </devicePorts>
-      <!-- route declaration, i.e. list all available sources for a given sink -->
-      <routes>
-        <route type="mix" sink="Earpiece"
-          sources="primary output,deep buffer,haptic,voip_rx,compressed offload" />
-        <route type="mix" sink="Speaker"
-          sources="primary output,deep buffer,haptic,voip_rx,compressed offload" />
-        <route type="mix" sink="Telephony Tx" sources="incall playback" />
-        <route type="mix" sink="primary input"
-          sources="Built-In Mic,Built-In Back Mic" />
-        <route type="mix" sink="voip_tx"
-          sources="Built-In Mic,Built-In Back Mic" />
-        <route type="mix" sink="fast input"
-          sources="Built-In Mic,Built-In Back Mic" />
-        <route type="mix" sink="hotword input" sources="Built-In Mic" />
-      </routes>
-    </module>
-  </modules>
-  <!-- End of Modules section -->
-  <!-- Volume section -->
-  <xi:include href="audio_policy_volumes.xml" />
-  <xi:include href="default_volume_tables.xml" />
-  <!-- End of Volume section -->
-</audioPolicyConfiguration>
diff --git a/audio/lynx/aidl_config/mixer_paths_aidl.xml b/audio/lynx/aidl_config/mixer_paths_aidl.xml
index 894ef4e..2628227 100644
--- a/audio/lynx/aidl_config/mixer_paths_aidl.xml
+++ b/audio/lynx/aidl_config/mixer_paths_aidl.xml
@@ -79,8 +79,8 @@
   <!-- Cirrus Booster Amp Output Gain -->
   <ctl name="AMP PCM Gain" value="17" />
   <ctl name="R AMP PCM Gain" value="17" />
-  <ctl name="Digital PCM Volume" value="817" />
-  <ctl name="R Digital PCM Volume" value="817" />
+  <ctl name="Digital PCM Volume" value="0" />
+  <ctl name="R Digital PCM Volume" value="0" />
 
   <!-- Cirrus Booster Amp Power -->
   <ctl name="Main AMP Enable Switch" value="0" />
@@ -97,6 +97,8 @@
   <ctl name="R DSP RX2 Source" value="ASPRX1" />
   <ctl name="Boost Peak Current Limit" value="3.50A" />
   <ctl name="R Boost Peak Current Limit" value="3.50A" />
+  <ctl name="PCM Soft Ramp" value=".5ms" />
+  <ctl name="R PCM Soft Ramp" value=".5ms" />
 
   <!-- Cirrus ASP TX source -->
   <ctl name="ASP TX1 Source" value="VMON" />
@@ -254,7 +256,9 @@
 
   <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON" />
   <ctl name="Voice Call Mic Source" value="Builtin_MIC" />
+  <ctl name="Mic Spatial Module Enable" value="0" />
   <ctl name="Audio Capture Eraser Enable" value="0" />
+  <ctl name="Hotword Tap Enable" value="0" />
 
   <!-- audio PDM mic default state -->
   <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
@@ -372,10 +376,46 @@
     <ctl name="BT_RX Mixer EP2" value="1" />
   </path>
 
-  <path name="primary-playback -> usb-headset">
+  <path name="primary-playback-0 -> bt">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-a2dp-device">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-sco-default">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-sco-headset">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> bluetooth-sco-car-kit">
+    <path name="primary-playback -> bt" />
+  </path>
+
+  <path name="primary-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP2" value="1" />
   </path>
 
+  <path name="primary-playback-0 -> usb-headset">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
+  <path name="primary-playback-0 -> usb-device">
+    <path name="primary-playback-0 -> usb" />
+  </path>
+
   <path name="raw-playback -> speaker">
     <ctl name="TDM_0_RX Mixer RAW" value="1" />
   </path>
@@ -396,10 +436,46 @@
     <ctl name="BT_RX Mixer RAW" value="1" />
   </path>
 
-  <path name="raw-playback -> usb-headset">
+  <path name="raw-playback-0 -> bt">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-a2dp-device">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-sco-default">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-sco-headset">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> bluetooth-sco-car-kit">
+    <path name="raw-playback -> bt" />
+  </path>
+
+  <path name="raw-playback-0 -> usb">
     <ctl name="USB_RX Mixer RAW" value="1" />
   </path>
 
+  <path name="raw-playback-0 -> usb-headset">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
+  <path name="raw-playback-0 -> usb-device">
+    <path name="raw-playback-0 -> usb" />
+  </path>
+
   <path name="deep-buffer-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP6" value="1" />
   </path>
@@ -420,10 +496,46 @@
     <ctl name="BT_RX Mixer EP6" value="1" />
   </path>
 
-  <path name="deep-buffer-playback -> usb-headset">
+  <path name="deep-buffer-playback-0 -> bt">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-a2dp-device">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-sco-default">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-sco-headset">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> bluetooth-sco-car-kit">
+    <path name="deep-buffer-playback -> bt" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP6" value="1" />
   </path>
 
+  <path name="deep-buffer-playback-0 -> usb-headset">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
+  <path name="deep-buffer-playback-0 -> usb-device">
+    <path name="deep-buffer-playback-0 -> usb" />
+  </path>
+
   <path name="compress-offload-playback">
     <ctl name="LVM Enable" value="1" />
   </path>
@@ -449,10 +561,46 @@
     <ctl name="BT_RX Mixer EP7" value="1" />
   </path>
 
-  <path name="compress-offload-playback -> usb-headset">
+  <path name="compress-offload-playback-0 -> bt">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-a2dp-device">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-sco-default">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-sco-headset">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> bluetooth-sco-car-kit">
+    <path name="compress-offload-playback -> bt" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP7" value="1" />
   </path>
 
+  <path name="compress-offload-playback-0 -> usb-headset">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
+  <path name="compress-offload-playback-0 -> usb-device">
+    <path name="compress-offload-playback-0 -> usb" />
+  </path>
+
   <path name="mmap-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP1" value="1" />
   </path>
@@ -473,14 +621,58 @@
     <ctl name="BT_RX Mixer EP1" value="1" />
   </path>
 
-  <path name="mmap-playback -> usb-headset">
+  <path name="mmap-playback-0 -> bt">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-a2dp-device">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-sco-default">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-sco-headset">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> bluetooth-sco-car-kit">
+    <path name="mmap-playback -> bt" />
+  </path>
+
+  <path name="mmap-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP1" value="1" />
   </path>
 
-  <path name="hifi-playback -> usb-headset">
+  <path name="mmap-playback-0 -> usb-headset">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
+  <path name="mmap-playback-0 -> usb-device">
+    <path name="mmap-playback-0 -> usb" />
+  </path>
+
+  <path name="hifi-playback-0 -> usb">
     <ctl name="USB_RX Mixer HIFI" value="1" />
   </path>
 
+  <path name="hifi-playback-0 -> usb-headset">
+    <path name="hifi-playback-0 -> usb" />
+  </path>
+
+  <path name="hifi-playback-0 -> usb-device">
+    <path name="hifi-playback-0 -> usb" />
+  </path>
+
   <path name="voip-playback -> speaker">
     <ctl name="TDM_0_RX Mixer VOIP" value="1" />
   </path>
@@ -501,10 +693,46 @@
     <ctl name="BT_RX Mixer VOIP" value="1" />
   </path>
 
-  <path name="voip-playback -> usb-headset">
+  <path name="voip-playback-0 -> bt">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-a2dp-device">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-sco-default">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-sco-headset">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> bluetooth-sco-car-kit">
+    <path name="voip-playback -> bt" />
+  </path>
+
+  <path name="voip-playback-0 -> usb">
     <ctl name="USB_RX Mixer VOIP" value="1" />
   </path>
 
+  <path name="voip-playback-0 -> usb-headset">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
+  <path name="voip-playback-0 -> usb-device">
+    <path name="voip-playback-0 -> usb" />
+  </path>
+
   <path name="immersive-playback -> speaker">
     <ctl name="TDM_0_RX Mixer IMSV" value="1" />
   </path>
@@ -525,10 +753,34 @@
     <ctl name="BT_RX Mixer IMSV" value="1" />
   </path>
 
-  <path name="immersive-playback -> usb-headset">
+  <path name="immersive-playback-0 -> bt">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-device">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> usb">
     <ctl name="USB_RX Mixer IMSV" value="1" />
   </path>
 
+  <path name="immersive-playback-0 -> usb-headset">
+    <path name="immersive-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-playback-0 -> usb-device">
+    <path name="immersive-playback-0 -> usb" />
+  </path>
+
   <path name="haptic-playback -> speaker">
     <ctl name="TDM_0_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -551,11 +803,47 @@
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
-  <path name="haptic-playback -> usb-headset">
+  <path name="haptic-playback-0 -> bt">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-a2dp-device">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-sco-default">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-sco-headset">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> bluetooth-sco-car-kit">
+    <path name="haptic-playback -> bt" />
+  </path>
+
+  <path name="haptic-playback-0 -> usb">
     <ctl name="USB_RX Mixer EP3" value="1" />
     <ctl name="TDM_0_RX Mixer EP8" value="1" />
   </path>
 
+  <path name="haptic-playback-0 -> usb-headset">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
+  <path name="haptic-playback-0 -> usb-device">
+    <path name="haptic-playback-0 -> usb" />
+  </path>
+
   <!-- audio capture dynamic route -->
   <path name="microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
@@ -565,10 +853,18 @@
     <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> primary-capture-0">
+  <path name="usb-microphones -> primary-capture-0">
     <ctl name="EP1 TX Mixer USB_TX" value="1" />
   </path>
 
+  <path name="usb-headset-microphones -> primary-capture-0">
+    <path name="usb-microphones -> primary-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> primary-capture-0">
+    <path name="usb-microphones -> primary-capture-0" />
+  </path>
+
   <path name="microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
@@ -577,11 +873,19 @@
     <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> voip-capture-0">
+  <path name="usb-microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer USB_TX" value="1" />
   </path>
 
-  <path name="bt-mic -> voip-capture-0">
+  <path name="usb-headset-microphones -> voip-capture-0">
+    <path name="usb-microphones -> voip-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voip-capture-0">
+    <path name="usb-microphones -> voip-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> voip-capture-0">
     <ctl name="VOIP TX Mixer BT_TX" value="1" />
   </path>
 
@@ -593,17 +897,31 @@
     <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> fast-capture-0">
+  <path name="usb-microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer USB_TX" value="1" />
   </path>
 
-  <path name="bt-mic -> fast-capture-0">
+  <path name="usb-headset-microphones -> fast-capture-0">
+    <path name="usb-microphones -> fast-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> fast-capture-0">
+    <path name="usb-microphones -> fast-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> fast-capture-0">
     <ctl name="EP3 TX Mixer BT_TX" value="1" />
   </path>
 
   <path name="microphones -> sound-trigger-capture-0">
   </path>
 
+  <path name="microphones -> sound-trigger-tap-capture-0">
+  </path>
+
+  <path name="microphones -> hotword-lookback-capture-0">
+  </path>
+
   <!-- voice-call dynamic route -->
   <path name="voice-call-downlink-0 -> speaker">
     <ctl name="TDM_0_RX Mixer EP5" value="1" />
@@ -617,10 +935,30 @@
     <ctl name="BT_RX Mixer EP5" value="1" />
   </path>
 
-  <path name="voice-call-downlink-0 -> usb-headphone">
+  <path name="voice-call-downlink-0 -> bluetooth-sco-default">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> bluetooth-sco-headset">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> bluetooth-sco-car-kit">
+    <path name="voice-call-downlink-0 -> bt" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> usb">
     <ctl name="USB_RX Mixer EP5" value="1" />
   </path>
 
+  <path name="voice-call-downlink-0 -> usb-headset">
+    <path name="voice-call-downlink-0 -> usb" />
+  </path>
+
+  <path name="voice-call-downlink-0 -> usb-device">
+    <path name="voice-call-downlink-0 -> usb" />
+  </path>
+
   <path name="voice-call-downlink-0 -> null-sink">
     <ctl name="INCALL_RX Mixer EP5" value="1" />
   </path>
@@ -633,11 +971,19 @@
     <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> voice-call-uplink-0">
+  <path name="usb-microphones -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer USB_TX" value="1" />
   </path>
 
-  <path name="bt-mic -> voice-call-uplink-0">
+  <path name="usb-headset-microphones -> voice-call-uplink-0">
+    <path name="usb-microphones -> voice-call-uplink-0" />
+  </path>
+
+  <path name="usb-device-microphones -> voice-call-uplink-0">
+    <path name="usb-microphones -> voice-call-uplink-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> voice-call-uplink-0">
     <ctl name="EP4 TX Mixer BT_TX" value="1" />
   </path>
 
@@ -649,19 +995,59 @@
     <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
   </path>
 
-  <path name="telephony-rx -> in-call-capture-0" />
-  <path name="telephony-rx -> in-call-capture-1" />
-  <path name="telephony-rx -> in-call-capture-2" />
+  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
+    <ctl name="Incall Capture Stream0" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
+    <ctl name="Incall Capture Stream0" value="UL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
+    <ctl name="Incall Capture Stream0" value="UL_DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
+    <ctl name="Incall Capture Stream1" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
+    <ctl name="Incall Capture Stream1" value="UL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
+    <ctl name="Incall Capture Stream1" value="UL_DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="UL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="UL_DL" />
+  </path>
 
   <path name="microphones -> mmap-capture-0">
     <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
   </path>
 
-  <path name="usb-headset-mic -> mmap-capture-0">
+  <path name="usb-microphones -> mmap-capture-0">
     <ctl name="EP2 TX Mixer USB_TX" value="1" />
   </path>
 
-  <path name="bt-mic -> mmap-capture-0">
+  <path name="usb-headset-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
     <ctl name="EP2 TX Mixer BT_TX" value="1" />
   </path>
 
@@ -674,15 +1060,12 @@
   </path>
 
   <path name="speaker-earpiece (VOICE)">
-    <ctl name="Boost Peak Current Limit" value="3.50A" />
     <ctl name="PCM Source" value="ASP" />
     <ctl name="AMP PCM Gain" value="7" />
     <ctl name="Main AMP Enable Switch" value="1" />
   </path>
 
   <path name="speaker">
-    <ctl name="Boost Peak Current Limit" value="2.50A" />
-    <ctl name="R Boost Peak Current Limit" value="2.50A" />
     <ctl name="Main AMP Enable Switch" value="1" />
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
@@ -692,12 +1075,9 @@
   </path>
 
   <path name="speaker (VOICE)">
-    <ctl name="R Boost Peak Current Limit" value="3.50A" />
-    <ctl name="Boost Peak Current Limit" value="3.50A" />
     <ctl name="ASPTX1 Slot Position" value="1" />
     <ctl name="R ASPTX1 Slot Position" value="0" />
-    <!--<ctl
-    name="R DSP RX2 Source" value="ASPRX2"/>-->
+    <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />-->
     <ctl name="R Main AMP Enable Switch" value="1" />
     <ctl name="Main AMP Enable Switch" value="1" />
     <!-- load Enable FIR -->
@@ -705,11 +1085,9 @@
     <ctl name="Fast Use Case Switch Enable" value="1" />
     <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
     <ctl name="R Fast Use Case Switch Enable" value="1" />
-    <ctl name="Digital PCM Volume" value="800" />
   </path>
 
   <path name="speaker-safe">
-    <ctl name="R Boost Peak Current Limit" value="3.50A" />
     <ctl name="R Main AMP Enable Switch" value="1" />
     <!-- load Bypass FIR -->
     <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
@@ -736,7 +1114,7 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="back-microphones">
+  <path name="microphones (VOICE_RECOGNITION)">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
@@ -745,55 +1123,63 @@
     <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
 
-  <path name="back-microphones (VOICE)">
+  <path name="microphones (VOICE_RECOGNITION,SOUND_TRIGGER_TAP)">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
+    <ctl name="Hotword Tap Enable" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
+  </path>
+
+  <path name="microphones (SOUND_TRIGGER_AEC)">
+    <ctl name="Audio Capture Eraser Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
+    <ctl name="Audio Capture Mic Source" value="ERASER" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="microphones (CAMCORDER)">
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-    <ctl name="MIC DC Blocker" value="1"/>
-    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
-  </path>
-
-  <path name="back-microphones (CAMCORDER)">
-    <path name="microphones (CAMCORDER)" />
+  <path name="back-microphones">
+    <ctl name="Mic Spatial Module Enable" value="1" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="22" />
   </path>
 
-  <path name="camcorder-mic">
+  <path name="back-microphones (VOICE)">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="voice-recog-mic">
+  <path name="microphones (CAMCORDER)">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="22" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="voice-recog-aec-mic">
-    <ctl name="Audio Capture Eraser Enable" value="1" />
+  <path name="back-microphones (CAMCORDER)">
+    <path name="microphones (CAMCORDER)" />
+  </path>
+
+  <path name="camcorder-mic">
+    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
     <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="Audio Capture Mic Source" value="ERASER" />
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
@@ -824,7 +1210,7 @@
     <ctl name="MIC Record Soft Gain (dB)" value="5" />
   </path>
 
-  <path name="bt-mic">
+  <path name="bluetooth-sco-headset-microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
@@ -834,7 +1220,7 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
-  <path name="usb-headset-mic">
+  <path name="usb-headset-microphones">
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
@@ -859,4 +1245,68 @@
     <ctl name="R DSP1 Preload Switch" value="1" />
   </path>
   <!-- cs35l41 specific path to load firmware in cs35l41.c end-->
+  <!-- cs35l41 specific path for adated feature in cs35l41_route_control.cc  -->
+  <!-- Which is controlled by speaker module and path name format is fixed.  -->
+  <!-- Path name format: adapted-{type}{-battery-throttled}{-acoustic-shock} -->
+  <!-- Battery throttle and acoustic shock are disabled: "adapted-speaker"   -->
+  <!-- Battery throttle enabled: "adapted-speaker-battery-throttled"         -->
+  <!-- Acoustic shock enabled: "adapted-speaker-acoustic-shock"              -->
+  <!-- Both are enabled: "adapted-speaker-battery-throttled-acoustic-shock"  -->
+  <path name="adapted-speaker">
+    <ctl name="Boost Peak Current Limit" value="2.50A" />
+    <ctl name="R Boost Peak Current Limit" value="2.50A" />
+    <ctl name="Digital PCM Volume" value="817" />
+    <ctl name="R Digital PCM Volume" value="817" />
+  </path>
+  <path name="adapted-speaker-battery-throttled">
+    <ctl name="Boost Peak Current Limit" value="1.80A" />
+    <ctl name="R Boost Peak Current Limit" value="1.80A" />
+    <ctl name="Digital PCM Volume" value="817" />
+    <ctl name="R Digital PCM Volume" value="817" />
+  </path>
+
+  <path name="adapted-speaker-safe">
+    <ctl name="R Boost Peak Current Limit" value="3.50A" />
+    <ctl name="R Digital PCM Volume" value="817" />
+  </path>
+  <path name="adapted-speaker-safe-battery-throttled">
+    <path name="adapted-speaker-safe" />
+  </path>
+
+  <path name="adapted-earpiece">
+    <ctl name="Digital PCM Volume" value="817" />
+  </path>
+  <path name="adapted-earpiece-battery-throttled">
+    <path name="adapted-earpiece" />
+  </path>
+
+  <path name="adapted-voice-speaker">
+    <ctl name="R Boost Peak Current Limit" value="3.50A" />
+    <ctl name="Boost Peak Current Limit" value="3.50A" />
+    <ctl name="Digital PCM Volume" value="800" />
+    <ctl name="R Digital PCM Volume" value="817" />
+  </path>
+  <path name="adapted-voice-speaker-battery-throttled">
+    <path name="adapted-voice-speaker" />
+  </path>
+  <path name="adapted-voice-speaker-acoustic-shock">
+    <ctl name="R Boost Peak Current Limit" value="3.50A" />
+    <ctl name="Boost Peak Current Limit" value="3.50A" />
+    <ctl name="PCM Soft Ramp" value="2ms" />
+    <ctl name="Digital PCM Volume" value="0" />
+    <ctl name="R Digital PCM Volume" value="817" />
+  </path>
+
+  <path name="adapted-voice-speaker-battery-throttled-acoustic-shock">
+    <path name="adapted-voice-speaker-acoustic-shock" />
+  </path>
+
+  <path name="adapted-voice-earpiece">
+      <ctl name="Boost Peak Current Limit" value="3.50A" />
+      <ctl name="Digital PCM Volume" value="817" />
+  </path>
+  <path name="adapted-voice-earpiece-battery-throttled">
+    <path name="adapted-voice-earpiece" />
+  </path>
+  <!-- cs35l41 specific path for adated feature in cs35l41_route_control.cc end -->
 </mixer>
diff --git a/audio/lynx/audio-tables.mk b/audio/lynx/audio-tables.mk
index f8c1da5..d935322 100644
--- a/audio/lynx/audio-tables.mk
+++ b/audio/lynx/audio-tables.mk
@@ -21,8 +21,7 @@ AUDIO_TABLE_FOLDER := lynx
 
 ifeq ($(BUILD_AUDIO_AIDL_VERSION),true)
 PRODUCT_COPY_FILES += \
-    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
-    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \
+    device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
     device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
     device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml
 else
diff --git a/audio/lynx/config/audio_platform_configuration.xml b/audio/lynx/config/audio_platform_configuration.xml
index 5443432..92b39f8 100644
--- a/audio/lynx/config/audio_platform_configuration.xml
+++ b/audio/lynx/config/audio_platform_configuration.xml
@@ -293,7 +293,7 @@
         <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN"/>
         <module libname="audio_cca_aoc.so"/>
-        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y SHARED_MODULE=1130578253"/>
+        <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y SHARED_MODULE=1130578253"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/lynx/tuning/fortemedia/BLUETOOTH.dat b/audio/lynx/tuning/fortemedia/BLUETOOTH.dat
index 4c24529..4c6db73 100644
--- a/audio/lynx/tuning/fortemedia/BLUETOOTH.dat
+++ b/audio/lynx/tuning/fortemedia/BLUETOOTH.dat
diff --git a/audio/lynx/tuning/fortemedia/BLUETOOTH.mods b/audio/lynx/tuning/fortemedia/BLUETOOTH.mods
index 06401da..594c59b 100644
--- a/audio/lynx/tuning/fortemedia/BLUETOOTH.mods
+++ b/audio/lynx/tuning/fortemedia/BLUETOOTH.mods
@@ -1,12 +1,13 @@
 #PLATFORM_NAME  gChip
-#EXPORT_FLAG  BLUETOOTH
 #SINGLE_API_VER  1.2.1
-#SAVE_TIME  2023-04-18 16:05:27
+#EXPORT_FLAG  BLUETOOTH
+#PARAM_MODE   FULL
+#SAVE_MODE  3
+#SAVE_TIME  2023-08-15 15:10:51
 
 #CASE_NAME  BLUETOOTH-BT_HAC-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -534,8 +535,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -2674,9 +2675,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BT_HAC-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -3204,8 +3204,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -5344,9 +5344,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BT_HAC-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -5874,8 +5873,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -8014,9 +8013,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BT_HAC-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -8544,8 +8542,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -10684,9 +10682,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BT_HAC-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -11214,8 +11211,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -13354,9 +13351,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTNB-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0008    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -13884,8 +13880,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -16024,9 +16020,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTNB-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0008    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -16554,8 +16549,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -18694,9 +18689,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTNB-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -19224,8 +19218,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -19683,7 +19677,7 @@
 19    0x0020    //RX_PP_RESRV_1
 20    0x0400    //RX_N_SN_EST
 21    0x000C    //RX_N2_SN_EST
-22    0x0003    //RX_NS_LVL_CTRL
+22    0x0006    //RX_NS_LVL_CTRL
 23    0x9000    //RX_THR_SN_EST
 24    0x7CCD    //RX_LAMBDA_PFILT
 25    0x000A    //RX_FENS_RESRV_0
@@ -20534,7 +20528,7 @@
 176    0x0020    //RX_PP_RESRV_1
 177    0x0400    //RX_N_SN_EST
 178    0x000C    //RX_N2_SN_EST
-179    0x0003    //RX_NS_LVL_CTRL
+179    0x0006    //RX_NS_LVL_CTRL
 180    0x9000    //RX_THR_SN_EST
 181    0x7CCD    //RX_LAMBDA_PFILT
 182    0x000A    //RX_FENS_RESRV_0
@@ -21364,9 +21358,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTNB-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0009    //TX_OPERATION_MODE_1
@@ -21894,8 +21887,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -24034,9 +24027,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTNB-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -24564,8 +24556,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -25001,7 +24993,7 @@
 960    0x0000    //TX_AMS_RESRV_18
 961    0x0000    //TX_AMS_RESRV_19
 #RX
-0    0xA064    //RX_RECVFUNC_MODE_0
+0    0x8064    //RX_RECVFUNC_MODE_0
 1    0x0000    //RX_RECVFUNC_MODE_1
 2    0x0003    //RX_SAMPLINGFREQ_SIG
 3    0x0003    //RX_SAMPLINGFREQ_PROC
@@ -25023,7 +25015,7 @@
 19    0x0020    //RX_PP_RESRV_1
 20    0x0400    //RX_N_SN_EST
 21    0x000C    //RX_N2_SN_EST
-22    0x0003    //RX_NS_LVL_CTRL
+22    0x0006    //RX_NS_LVL_CTRL
 23    0x9000    //RX_THR_SN_EST
 24    0x7CCD    //RX_LAMBDA_PFILT
 25    0x000A    //RX_FENS_RESRV_0
@@ -25852,7 +25844,7 @@
 129    0x0100    //RX_SPK_VOL
 130    0x0000    //RX_VOL_RESRV_0
 #RX 2
-157    0xA064    //RX_RECVFUNC_MODE_0
+157    0x8064    //RX_RECVFUNC_MODE_0
 158    0x0000    //RX_RECVFUNC_MODE_1
 159    0x0003    //RX_SAMPLINGFREQ_SIG
 160    0x0003    //RX_SAMPLINGFREQ_PROC
@@ -26704,9 +26696,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTNB_NREC-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0008    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -27234,8 +27225,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -29374,9 +29365,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTNB_NREC-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0008    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -29904,8 +29894,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -32044,9 +32034,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTNB_NREC-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -32574,8 +32563,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -34714,9 +34703,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTNB_NREC-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0009    //TX_OPERATION_MODE_1
@@ -35244,8 +35232,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -37384,9 +37372,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTNB_NREC-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -37914,8 +37901,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -38351,7 +38338,7 @@
 960    0x0000    //TX_AMS_RESRV_18
 961    0x0000    //TX_AMS_RESRV_19
 #RX
-0    0xA064    //RX_RECVFUNC_MODE_0
+0    0x8064    //RX_RECVFUNC_MODE_0
 1    0x0000    //RX_RECVFUNC_MODE_1
 2    0x0003    //RX_SAMPLINGFREQ_SIG
 3    0x0003    //RX_SAMPLINGFREQ_PROC
@@ -38373,7 +38360,7 @@
 19    0x0020    //RX_PP_RESRV_1
 20    0x0400    //RX_N_SN_EST
 21    0x000C    //RX_N2_SN_EST
-22    0x0003    //RX_NS_LVL_CTRL
+22    0x0006    //RX_NS_LVL_CTRL
 23    0x9000    //RX_THR_SN_EST
 24    0x7CCD    //RX_LAMBDA_PFILT
 25    0x000A    //RX_FENS_RESRV_0
@@ -39224,7 +39211,7 @@
 176    0x0020    //RX_PP_RESRV_1
 177    0x0400    //RX_N_SN_EST
 178    0x000C    //RX_N2_SN_EST
-179    0x0003    //RX_NS_LVL_CTRL
+179    0x0006    //RX_NS_LVL_CTRL
 180    0x9000    //RX_THR_SN_EST
 181    0x7CCD    //RX_LAMBDA_PFILT
 182    0x000A    //RX_FENS_RESRV_0
@@ -40054,9 +40041,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTWB-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0008    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -40584,8 +40570,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -42724,9 +42710,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTWB-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0008    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -43254,8 +43239,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -45394,9 +45379,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTWB-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -45924,8 +45908,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -48064,9 +48048,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTWB-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0009    //TX_OPERATION_MODE_1
@@ -48594,8 +48577,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -50734,9 +50717,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTWB-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -51264,8 +51246,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -51701,7 +51683,7 @@
 960    0x0000    //TX_AMS_RESRV_18
 961    0x0000    //TX_AMS_RESRV_19
 #RX
-0    0xA064    //RX_RECVFUNC_MODE_0
+0    0x8064    //RX_RECVFUNC_MODE_0
 1    0x0000    //RX_RECVFUNC_MODE_1
 2    0x0003    //RX_SAMPLINGFREQ_SIG
 3    0x0003    //RX_SAMPLINGFREQ_PROC
@@ -51723,7 +51705,7 @@
 19    0x0020    //RX_PP_RESRV_1
 20    0x0400    //RX_N_SN_EST
 21    0x000C    //RX_N2_SN_EST
-22    0x0003    //RX_NS_LVL_CTRL
+22    0x0006    //RX_NS_LVL_CTRL
 23    0x9000    //RX_THR_SN_EST
 24    0x7CCD    //RX_LAMBDA_PFILT
 25    0x000A    //RX_FENS_RESRV_0
@@ -52574,7 +52556,7 @@
 176    0x0020    //RX_PP_RESRV_1
 177    0x0400    //RX_N_SN_EST
 178    0x000C    //RX_N2_SN_EST
-179    0x0003    //RX_NS_LVL_CTRL
+179    0x0006    //RX_NS_LVL_CTRL
 180    0x9000    //RX_THR_SN_EST
 181    0x7CCD    //RX_LAMBDA_PFILT
 182    0x000A    //RX_FENS_RESRV_0
@@ -53404,9 +53386,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTWB_NREC-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0008    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -53934,8 +53915,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -56074,9 +56055,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTWB_NREC-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0008    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -56604,8 +56584,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -58744,9 +58724,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTWB_NREC-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -59274,8 +59253,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -61414,9 +61393,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTWB_NREC-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0009    //TX_OPERATION_MODE_1
@@ -61944,8 +61922,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -64084,9 +64062,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-BTWB_NREC-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -64614,8 +64591,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -65051,7 +65028,7 @@
 960    0x0000    //TX_AMS_RESRV_18
 961    0x0000    //TX_AMS_RESRV_19
 #RX
-0    0xA064    //RX_RECVFUNC_MODE_0
+0    0x8064    //RX_RECVFUNC_MODE_0
 1    0x0000    //RX_RECVFUNC_MODE_1
 2    0x0003    //RX_SAMPLINGFREQ_SIG
 3    0x0003    //RX_SAMPLINGFREQ_PROC
@@ -65073,7 +65050,7 @@
 19    0x0020    //RX_PP_RESRV_1
 20    0x0400    //RX_N_SN_EST
 21    0x000C    //RX_N2_SN_EST
-22    0x0003    //RX_NS_LVL_CTRL
+22    0x0006    //RX_NS_LVL_CTRL
 23    0x9000    //RX_THR_SN_EST
 24    0x7CCD    //RX_LAMBDA_PFILT
 25    0x000A    //RX_FENS_RESRV_0
@@ -65924,7 +65901,7 @@
 176    0x0020    //RX_PP_RESRV_1
 177    0x0400    //RX_N_SN_EST
 178    0x000C    //RX_N2_SN_EST
-179    0x0003    //RX_NS_LVL_CTRL
+179    0x0006    //RX_NS_LVL_CTRL
 180    0x9000    //RX_THR_SN_EST
 181    0x7CCD    //RX_LAMBDA_PFILT
 182    0x000A    //RX_FENS_RESRV_0
@@ -66754,9 +66731,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  BLUETOOTH-RESERVE1-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -67284,8 +67260,8 @@
 523    0x0000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x0000    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0028    //TX_SNR_THR
diff --git a/audio/lynx/tuning/fortemedia/HANDSET.dat b/audio/lynx/tuning/fortemedia/HANDSET.dat
index 1506700..0e62c25 100644
--- a/audio/lynx/tuning/fortemedia/HANDSET.dat
+++ b/audio/lynx/tuning/fortemedia/HANDSET.dat
diff --git a/audio/lynx/tuning/fortemedia/HANDSET.mods b/audio/lynx/tuning/fortemedia/HANDSET.mods
index 273f37f..861d251 100644
--- a/audio/lynx/tuning/fortemedia/HANDSET.mods
+++ b/audio/lynx/tuning/fortemedia/HANDSET.mods
@@ -1,12 +1,13 @@
 #PLATFORM_NAME  gChip
-#EXPORT_FLAG  HANDSET
 #SINGLE_API_VER  1.2.1
-#SAVE_TIME  2023-03-01 17:49:41
+#EXPORT_FLAG  HANDSET
+#PARAM_MODE   FULL
+#SAVE_MODE  3
+#SAVE_TIME  2023-08-15 15:09:46
 
 #CASE_NAME  HANDSET-HANDSET-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -534,8 +535,8 @@
 523    0x6000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -2674,9 +2675,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -3204,8 +3204,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -5344,9 +5344,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -5874,8 +5873,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -8014,9 +8013,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -8544,8 +8542,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -10684,9 +10682,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-TMOBILE_US-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -11214,8 +11211,8 @@
 523    0x6000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -13354,9 +13351,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-TMOBILE_US-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -13884,8 +13880,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -16024,9 +16020,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-TMOBILE_US-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -16554,8 +16549,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -18694,9 +18689,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-TMOBILE_US-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -19224,8 +19218,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -21364,9 +21358,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-CUSTOM1-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -21894,8 +21887,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -24034,9 +24027,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-CUSTOM1-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -24564,8 +24556,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -26704,9 +26696,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-CUSTOM2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -27234,8 +27225,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -29374,9 +29365,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-CUSTOM2-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -29904,8 +29894,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -32044,9 +32034,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-RESERVE1-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -32574,8 +32563,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -34714,9 +34703,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-RESERVE1-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -35244,8 +35232,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -37384,9 +37372,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -37914,8 +37901,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -40054,9 +40041,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET_HAC-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -40584,8 +40570,8 @@
 523    0x6000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -42724,9 +42710,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET_HAC-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -43254,8 +43239,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -45394,9 +45379,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET_HAC-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -45924,8 +45908,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -48064,9 +48048,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET_HAC-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -48594,8 +48577,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -50734,9 +50717,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET_HAC-TMOBILE_US-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -51264,8 +51246,8 @@
 523    0x6000    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -53404,9 +53386,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET_HAC-TMOBILE_US-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -53934,8 +53915,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -56074,9 +56055,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET_HAC-TMOBILE_US-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -56604,8 +56584,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -58744,9 +58724,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET_HAC-TMOBILE_US-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -59274,8 +59253,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -61414,9 +61393,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSET-HANDSET_HAC-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0000    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -61944,8 +61922,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
diff --git a/audio/lynx/tuning/fortemedia/HANDSFREE.dat b/audio/lynx/tuning/fortemedia/HANDSFREE.dat
index f6f5afb..cdc79dc 100644
--- a/audio/lynx/tuning/fortemedia/HANDSFREE.dat
+++ b/audio/lynx/tuning/fortemedia/HANDSFREE.dat
diff --git a/audio/lynx/tuning/fortemedia/HANDSFREE.mods b/audio/lynx/tuning/fortemedia/HANDSFREE.mods
index dc42412..3521b0d 100644
--- a/audio/lynx/tuning/fortemedia/HANDSFREE.mods
+++ b/audio/lynx/tuning/fortemedia/HANDSFREE.mods
@@ -1,12 +1,13 @@
 #PLATFORM_NAME  gChip
-#EXPORT_FLAG  HANDSFREE
 #SINGLE_API_VER  1.2.1
-#SAVE_TIME  2023-04-18 16:04:40
+#EXPORT_FLAG  HANDSFREE
+#PARAM_MODE   FULL
+#SAVE_MODE  3
+#SAVE_TIME  2023-08-15 15:10:19
 
 #CASE_NAME  HANDSFREE-HANDSFREE-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -534,8 +535,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -2674,9 +2675,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSFREE-HANDSFREE-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -3204,8 +3204,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -5344,9 +5344,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSFREE-HANDSFREE-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -5874,8 +5873,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -8014,9 +8013,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSFREE-HANDSFREE-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -8544,8 +8542,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -10684,9 +10682,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSFREE-HANDSFREE-CUSTOM1-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -11214,8 +11211,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -13354,9 +13351,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSFREE-HANDSFREE-CUSTOM1-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -13884,8 +13880,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -16024,9 +16020,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSFREE-HANDSFREE-CUSTOM2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -16554,8 +16549,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -18694,9 +18689,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSFREE-HANDSFREE-CUSTOM2-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -19224,8 +19218,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -21364,9 +21358,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSFREE-HANDSFREE-RESERVE1-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -21894,8 +21887,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -24034,9 +24027,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSFREE-HANDSFREE-RESERVE1-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -24564,8 +24556,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -26704,9 +26696,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HANDSFREE-HANDSFREE-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -27234,8 +27225,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0064    //TX_DR_RESRV_5
 525    0x1000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
diff --git a/audio/lynx/tuning/fortemedia/HEADSET.dat b/audio/lynx/tuning/fortemedia/HEADSET.dat
index 5ff7a8e..b31b449 100644
--- a/audio/lynx/tuning/fortemedia/HEADSET.dat
+++ b/audio/lynx/tuning/fortemedia/HEADSET.dat
diff --git a/audio/lynx/tuning/fortemedia/HEADSET.mods b/audio/lynx/tuning/fortemedia/HEADSET.mods
index 7ce97f0..5d2fe7e 100644
--- a/audio/lynx/tuning/fortemedia/HEADSET.mods
+++ b/audio/lynx/tuning/fortemedia/HEADSET.mods
@@ -1,12 +1,13 @@
 #PLATFORM_NAME  gChip
-#EXPORT_FLAG  HEADSET
 #SINGLE_API_VER  1.2.1
-#SAVE_TIME  2023-04-18 16:05:05
+#EXPORT_FLAG  HEADSET
+#PARAM_MODE   FULL
+#SAVE_MODE  3
+#SAVE_TIME  2023-08-15 15:11:19
 
 #CASE_NAME  HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0009    //TX_OPERATION_MODE_1
@@ -534,8 +535,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -2674,9 +2675,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-USB_BLACKBIRD-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0009    //TX_OPERATION_MODE_1
@@ -3204,8 +3204,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -5344,9 +5344,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-USB_BLACKBIRD-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -5874,8 +5873,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -8014,9 +8013,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-USB_BLACKBIRD-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0009    //TX_OPERATION_MODE_1
@@ -8544,8 +8542,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -10684,9 +10682,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-USB_BLACKBIRD-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -11214,8 +11211,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -13354,9 +13351,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -13884,8 +13880,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -16024,9 +16020,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -16554,8 +16549,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -18694,9 +18689,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -19224,8 +19218,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -21364,9 +21358,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0009    //TX_OPERATION_MODE_1
@@ -21894,8 +21887,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -24034,9 +24027,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -24564,8 +24556,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -26704,9 +26696,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR_HEADPHONE-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -27234,8 +27225,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -29374,9 +29365,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR_HEADPHONE-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -29904,8 +29894,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -32044,9 +32034,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR_HEADPHONE-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -32574,8 +32563,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -34714,9 +34703,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR_HEADPHONE-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -35244,8 +35232,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -37384,9 +37372,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR_HEADPHONE-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -37914,8 +37901,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -40054,9 +40041,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR_CERTIFICATION1-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -40584,8 +40570,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -42724,9 +42710,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR_CERTIFICATION1-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -43254,8 +43239,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -45394,9 +45379,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR_CERTIFICATION1-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -45924,8 +45908,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -48064,9 +48048,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR_CERTIFICATION1-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0009    //TX_OPERATION_MODE_1
@@ -48594,8 +48577,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -50734,9 +50717,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-GOOGLE_CONDOR_CERTIFICATION1-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -51264,8 +51246,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -53404,9 +53386,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_HCO-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -53934,8 +53915,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x0000    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0028    //TX_SNR_THR
@@ -56074,9 +56055,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_HCO-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -56604,8 +56584,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x0000    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0028    //TX_SNR_THR
@@ -58744,9 +58724,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_HCO-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -59274,8 +59253,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x0000    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0028    //TX_SNR_THR
@@ -61414,9 +61393,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_HCO-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -61944,8 +61922,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x0000    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0028    //TX_SNR_THR
@@ -64084,9 +64062,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_HCO-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -64614,8 +64591,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x0000    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0028    //TX_SNR_THR
@@ -66754,9 +66731,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_VCO-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -67284,8 +67260,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -69424,9 +69400,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_VCO-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -69954,8 +69929,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -72094,9 +72069,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_VCO-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -72624,8 +72598,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -74764,9 +74738,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_VCO-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -75294,8 +75267,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -77434,9 +77407,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_VCO-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -77964,8 +77936,8 @@
 523    0x7E2C    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -80104,9 +80076,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_FULL-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -80634,8 +80605,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x0000    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0028    //TX_SNR_THR
@@ -82774,9 +82745,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_FULL-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -83304,8 +83274,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x0000    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0028    //TX_SNR_THR
@@ -85444,9 +85414,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_FULL-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -85974,8 +85943,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x0000    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0028    //TX_SNR_THR
@@ -88114,9 +88083,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_FULL-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -88644,8 +88612,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x0000    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0028    //TX_SNR_THR
@@ -90784,9 +90752,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-TTY_FULL-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0001    //TX_OPERATION_MODE_0
 1    0x0000    //TX_OPERATION_MODE_1
@@ -91314,8 +91281,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x0000    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0028    //TX_SNR_THR
@@ -93454,9 +93421,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-RESERVE1-VOICE_GENERIC-NB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -93984,8 +93950,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -96124,9 +96090,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-RESERVE1-VOICE_GENERIC-WB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0008    //TX_OPERATION_MODE_1
@@ -96654,8 +96619,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -98794,9 +98759,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-RESERVE1-VOICE_GENERIC-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -99324,8 +99288,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -101464,9 +101428,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-RESERVE1-VOICE_GENERIC-FB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0009    //TX_OPERATION_MODE_1
@@ -101994,8 +101957,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
@@ -104134,9 +104097,8 @@
 287    0x0000    //RX_VOL_RESRV_0
 
 #CASE_NAME  HEADSET-RESERVE1-RESERVE2-SWB
-#PARAM_MODE  FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE  TX+2RX
+#TOTAL_CUSTOM_STEP  7+7
 #TX
 0    0x0009    //TX_OPERATION_MODE_0
 1    0x0001    //TX_OPERATION_MODE_1
@@ -104664,8 +104626,8 @@
 523    0x0064    //TX_WIDE2_MEANHTH
 524    0x0000    //TX_DR_RESRV_5
 525    0x0000    //TX_DR_RESRV_6
-526    0x0000    //TX_DR_RESRV_7
-527    0x0000    //TX_DR_RESRV_8
+526    0x122E    //TX_DR_RESRV_7
+527    0x1100    //TX_DR_RESRV_8
 528    0x1333    //TX_WIND_MARK_TH
 529    0x399A    //TX_CORR_THR
 530    0x0004    //TX_SNR_THR
diff --git a/bluetooth/qti_default.mk b/bluetooth/qti_default.mk
index 5158663..5da4e3b 100644
--- a/bluetooth/qti_default.mk
+++ b/bluetooth/qti_default.mk
@@ -40,6 +40,14 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
 	persist.bluetooth.leaudio.notify.idle.during.call=true
 
+# Not support LE Audio dual mic SWB call based on the current launch strategy
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.leaudio.dual_bidirection_swb.supported=false
+
+# LE Audio Lunch Config for Phase 1 (LE audio toggle hidden by default)
+PRODUCT_PRODUCT_PROPERTIES += \
+    persist.bluetooth.leaudio.toggle_visible=false
+
 # LE Auido Offload Capabilities setting
 PRODUCT_COPY_FILES += \
 	device/google/lynx/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml
diff --git a/device-lynx.mk b/device-lynx.mk
index ac90b11..242a6ba 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -78,9 +78,10 @@ PRODUCT_COPY_FILES += \
     device/google/lynx/nfc/libnfc-nci-lynx.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	NfcNci \
+	$(RELEASE_PACKAGE_NFC_STACK) \
 	Tag \
-	android.hardware.nfc-service.st
+	android.hardware.nfc-service.st \
+	NfcOverlayLynx
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -206,7 +207,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=16
+    ro.vendor.build.svn=22
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -282,3 +283,12 @@ PRODUCT_PACKAGES += \
     SettingsOverlayG0DZQ \
     SettingsOverlayGHL1X \
     SettingsOverlayGWKK3
+
+# Enable DeviceAsWebcam support
+PRODUCT_VENDOR_PROPERTIES += \
+    ro.usb.uvc.enabled=true
+
+# Quick Start device-specific settings
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.quick_start.oem_id=00e0 \
+    ro.quick_start.device_id=lynx
diff --git a/location/gps.xml.l10 b/location/gps.xml.l10
index c51fd4d..4feeafd 100644
--- a/location/gps.xml.l10
+++ b/location/gps.xml.l10
@@ -58,16 +58,19 @@
        AssertEnabled="true"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        PpsDevice="/sys/class/pps/pps0/assert_elapsed"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
   />
 
   <gll
        PpsEnable="true"
        LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
        FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
        MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1"
        MultiCarrLnaMask="L1_EXT_ON"
@@ -86,6 +89,7 @@
        PowerMode="3"
        MinGpsWeekNumber="2216"
        OnChipAccMask="50"
+       EnableB1C="false"
   />
 
   <gll_features
diff --git a/location/gps_user.xml.l10 b/location/gps_user.xml.l10
index b996bf0..142675c 100644
--- a/location/gps_user.xml.l10
+++ b/location/gps_user.xml.l10
@@ -57,10 +57,13 @@
        AssertEnabled="false"
        CpLppeCancelDbhOnAgnssProvideLoc="true"
        CpLppeUseAgnssLocForEmptyDbh="true"
+       CpLppHighAccuracyShapeMode="1"
        ReAidingOnHotStart="false"
        ReAidingIntervalSec="1200"
        RuntimeSwLteFilterEnable="true"
        PpsDevice="/sys/class/pps/pps0/assert_elapsed"
+       SensorsMask="0x244"
+       MaxThreadNum="13"
   />
 
   <gll
@@ -85,6 +88,7 @@
        PowerMode="3"
        MinGpsWeekNumber="2216"
        OnChipAccMask="50"
+       EnableB1C="false"
   />
 
   <gll_features
diff --git a/lynx/overlay/frameworks/base/core/res/res/values/config.xml b/lynx/overlay/frameworks/base/core/res/res/values/config.xml
index c122acf..07118d2 100644
--- a/lynx/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/lynx/overlay/frameworks/base/core/res/res/values/config.xml
@@ -309,4 +309,8 @@
          Note: If the display supports multiple resolutions, please define the path config based on
          the highest resolution so that it can be scaled correctly in each resolution. -->
     <string name="config_mainDisplayShape">M 50 0 C 42.768298 0.20918843 40.38325 0.67140492 36.839844 1.4492188 C 32.88207 2.499408 31.55228 2.9412067 27.529297 4.6933594 C 22.757243 6.7717586 20.051023 9.0487475 17.677734 10.873047 C 14.896398 13.14348 12.520098 15.642526 10.375 18.316406 C 7.8943843 21.48606 6.0935469 24.386022 4.3515625 28.15625 C 1.8145748 33.95665 1.4214109 36.446413 0.90625 38.939453 C 0.29310087 41.906691 0.090606668 43.961689 0 50 L 0 2350 C 0.083036414 2356.0047 0.27049146 2357.7278 0.70507812 2360.4961 C 1.0552946 2362.727 1.7787856 2366.4728 4.1152344 2372.0391 C 5.8274884 2375.87 7.608122 2378.6647 10.011719 2381.8281 C 12.156817 2384.5019 14.6796 2387.128 17.460938 2389.3984 C 19.82277 2391.2952 22.788288 2393.4515 27.306641 2395.5898 C 30.772461 2397.23 33.05157 2397.9241 37.181641 2398.8828 C 41.654968 2399.8035 43.840728 2399.9069 50 2400 L 1030 2400 C 1036.1593 2399.9069 1038.345 2399.8035 1042.8184 2398.8828 C 1046.9485 2397.9241 1049.2276 2397.23 1052.6934 2395.5898 C 1057.2118 2393.4515 1060.1773 2391.2952 1062.5391 2389.3984 C 1065.3205 2387.128 1067.8432 2384.5019 1069.9883 2381.8281 C 1072.3919 2378.6647 1074.1725 2375.87 1075.8848 2372.0391 C 1078.2212 2366.4728 1078.9466 2362.727 1079.2969 2360.4961 C 1079.7314 2357.7278 1079.917 2356.0047 1080 2350 L 1080 50 C 1079.909 43.961692 1079.7068 41.906687 1079.0938 38.939453 C 1078.5787 36.446409 1078.1854 33.956648 1075.6484 28.15625 C 1073.9064 24.386028 1072.1057 21.48606 1069.625 18.316406 C 1067.4799 15.642522 1065.1037 13.143473 1062.3223 10.873047 C 1059.949 9.0487399 1057.2428 6.7717652 1052.4707 4.6933594 C 1048.4477 2.9412128 1047.118 2.4994066 1043.1602 1.4492188 C 1039.6168 0.67140026 1037.2317 0.20918958 1030 0 L 50 0 z</string>
+
+    <!-- Boolean indicating whether allow sending null to modem to clear the previous initial attach
+         data profile -->
+    <bool name="allow_clear_initial_attach_data_profile">true</bool>
 </resources>
diff --git a/lynx/overlay/frameworks/base/packages/SystemUI/res/values-h800dp/dimens.xml b/lynx/overlay/frameworks/base/packages/SystemUI/customization/res/values-h800dp/dimens.xml
index b906765..b906765 100644
--- a/lynx/overlay/frameworks/base/packages/SystemUI/res/values-h800dp/dimens.xml
+++ b/lynx/overlay/frameworks/base/packages/SystemUI/customization/res/values-h800dp/dimens.xml
diff --git a/lynx/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/lynx/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index c916756..bbd9a26 100644
--- a/lynx/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/lynx/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -40,11 +40,11 @@
     <dimen name="config_rounded_mask_size_bottom">46px</dimen>
 
     <!-- Location on the screen of the center of the physical power button. -->
-    <dimen name="physical_power_button_center_screen_location_y">650px</dimen>
+    <dimen name="physical_power_button_center_screen_location_y">730px</dimen>
 
     <!-- Location on the screen of the center of the physical volume up/down buttons. -->
-    <dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen>
-    <dimen name="physical_volume_down_button_center_screen_location_y">1110px</dimen>
+    <dimen name="physical_volume_up_button_center_screen_location_y">1064px</dimen>
+    <dimen name="physical_volume_down_button_center_screen_location_y">1232px</dimen>
 
   </resources>
 
diff --git a/manifest.xml b/manifest.xml
index 982c345..38a4af5 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -90,16 +90,6 @@
         <fqname>@1.2::IBootControl/default</fqname>
     </hal>
     <hal format="hidl">
-        <name>android.hardware.neuralnetworks</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>armnn</instance>
-        </interface>
-        <fqname>@1.2::IDevice/armnn</fqname>
-    </hal>
-    <hal format="hidl">
        <name>android.hardware.neuralnetworks</name>
        <transport>hwbinder</transport>
        <fqname>@1.3::IDevice/google-edgetpu</fqname>
diff --git a/powerhint.json b/powerhint.json
index 5a7b1f9..9ce84eb 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -295,6 +295,14 @@
       "ResetOnInit": true
     },
     {
+      "Name": "NewlyIdleBalancer",
+      "Path": "/proc/vendor_sched/idle_balancer",
+      "Values": [
+        "0",
+        "1"
+      ],
+    },
+    {
       "Name": "DisplayWakeup",
       "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
       "Values": [
@@ -697,30 +705,6 @@
     {
       "PowerHint": "LAUNCH",
       "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDCPUSET_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDHIGHCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
-      "EnableProperty": "vendor.powerhal.camerarunning",
-      "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
-    },
-    {
-      "PowerHint": "LAUNCH",
-      "Type": "DoHint",
       "Value": "LAUNCH_EXTEND"
     },
     {
@@ -1084,6 +1068,12 @@
       "Value": "0"
     },
     {
+      "PowerHint": "CAMERA_STREAMING_EXTREME",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "PMU_POLL",
       "Duration": 0,
@@ -1192,6 +1182,12 @@
       "Value": "0"
     },
     {
+      "PowerHint": "CAMERA_STREAMING_HIGH",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
       "Duration": 0,
@@ -1246,6 +1242,12 @@
       "Value": "0"
     },
     {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
       "Duration": 0,
@@ -1306,6 +1308,12 @@
       "Value": "0"
     },
     {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "NewlyIdleBalancer",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
       "PowerHint": "CAMERA_VIDEO_RECORDING",
       "Type": "MaskHint",
       "Value": "CDCPUSET_RESTRICTED"
@@ -1685,264 +1693,12 @@
       "Value": "0"
     },
     {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "PMU_POLL",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "BigControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "MidControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "LittleControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "G3dControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "TpuControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "BigSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "MidSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "LittleSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "G3dSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "TpuSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "Dex2oatThreads",
-      "Duration": 0,
-      "Value": "4"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "Dex2oatCPUSet",
-      "Duration": 0,
-      "Value": "0,1,2,3"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
-      "Node": "Dex2oatGroup",
-      "Duration": 0,
-      "Value": "0"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "PMU_POLL",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "BigControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "MidControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "LittleControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "G3dControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "TpuControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "BigSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "MidSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "LittleSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "G3dSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "TpuSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "Dex2oatThreads",
-      "Duration": 0,
-      "Value": "2"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "Dex2oatCPUSet",
-      "Duration": 0,
-      "Value": "0,1,2,3"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
-      "Node": "Dex2oatGroup",
-      "Duration": 0,
-      "Value": "0"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "PMU_POLL",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "BigControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "MidControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "LittleControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "G3dControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "TpuControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "BigSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "MidSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "LittleSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "G3dSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "TpuSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
       "Node": "Dex2oatThreads",
       "Duration": 0,
       "Value": "2"
     },
     {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "Dex2oatCPUSet",
-      "Duration": 0,
-      "Value": "0,1,2,3"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
-      "Node": "Dex2oatGroup",
-      "Duration": 0,
-      "Value": "0"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "PMU_POLL",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
       "Node": "CPU_LITTLE_TSKIN_BYPASS",
       "Duration": 0,
@@ -1962,83 +1718,11 @@
     },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "BigControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "MidControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "LittleControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "G3dControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "TpuControlTempSet",
-      "Duration": 0,
-      "Value": "80000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "BigSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "MidSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "LittleSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "G3dSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "TpuSwitchOnTempSet",
-      "Duration": 0,
-      "Value": "60000"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
       "Node": "Dex2oatThreads",
       "Duration": 0,
       "Value": "1"
     },
     {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "Dex2oatCPUSet",
-      "Duration": 0,
-      "Value": "0,1,2,3"
-    },
-    {
-      "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
-      "Node": "Dex2oatGroup",
-      "Duration": 0,
-      "Value": "0"
-    },
-    {
       "PowerHint": "FACE_UNLOCK_BOOST",
       "Node": "CPU_LITTLE_TSKIN_BYPASS",
       "Duration": 1000,
@@ -2134,7 +1818,7 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "REFRESH_90FPS",
@@ -2158,7 +1842,7 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "REFRESH_60FPS",
@@ -2182,7 +1866,7 @@
       "EarlyBoost_On": false,
       "EarlyBoost_TimeFactor": 0.0,
       "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 20.0
+      "StaleTimeFactor": 15.0
     },
     {
       "Name": "UiHighBoostWithoutPid",
diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp
new file mode 100644
index 0000000..0b3fcb6
--- /dev/null
+++ b/rro_overlays/NfcOverlay/Android.bp
@@ -0,0 +1,9 @@
+package {
+    default_applicable_licenses: ["device_google_lynx_license"],
+}
+
+runtime_resource_overlay {
+    name: "NfcOverlayLynx",
+    sdk_version: "current",
+    product_specific: true
+}
diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..5241aa4
--- /dev/null
+++ b/rro_overlays/NfcOverlay/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!-- Pixel specific nfc overlays -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.nfc.overlay"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.nfc"
+      android:targetName="NfcCustomization"
+      android:isStatic="true"
+      android:priority="0"/>
+</manifest>
diff --git a/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS
new file mode 100644
index 0000000..35e9713
--- /dev/null
+++ b/rro_overlays/NfcOverlay/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 48448
+include platform/packages/apps/Nfc:/OWNERS
diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/rro_overlays/NfcOverlay/res/values/config.xml
new file mode 100644
index 0000000..4a8efa9
--- /dev/null
+++ b/rro_overlays/NfcOverlay/res/values/config.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="nfcc_always_on_allowed">false</bool>
+  <string-array name="config_skuSupportsSecureNfc" translatable="false">
+    <item>G0DZQ</item>
+    <item>GWKK3</item>
+    <item>GHL1X</item>
+    <item>G82U8</item>
+  </string-array>
+  <bool name="tag_intent_app_pref_supported">true</bool>
+  <!-- NFC Antenna Location API -->
+  <integer name="device_width">70</integer>
+  <integer name="device_height">150</integer>
+  <bool name="device_foldable">false</bool>
+  <integer-array name="antenna_x">
+    <item>36</item>
+  </integer-array>
+  <integer-array name="antenna_y">
+    <item>102</item>
+  </integer-array>
+</resources>
author	Android Build Coastguard Worker <android-build-coastguard-worker@google.com>	2024-02-02 23:45:21 +0000
committer	Android Build Coastguard Worker <android-build-coastguard-worker@google.com>	2024-02-02 23:45:21 +0000
commit	0802adc6143f41f4264a2905109cd07bf1d55475 (patch)
tree	db60944b14041160211272bf34fb33acb9cbf28c
parent	ef3fef51595f8ef1a4f1295da38699dfebd19ab0 (diff)
parent	aadca75653fd9e19f63b204e58776af383c9a7f5 (diff)
download	lynx-simpleperf-release.tar.gz