Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

audio: move controls for acoustic shock and battey throttle.

Browse source 
Bug: 274373213
Test: manual voip test/ device, host test
 vendor.google.whitechapel.audio.hal.audio.tuner_device_tests
 vendor.google.whitechapel.audio.hal.audio.tuner_tests

Change-Id: I9d0d67beb1e78258f390801b3a4c9ac92bd06bf1
Signed-off-by: Jasmine Cha <chajasmine@google.com>
This commit is contained in:
Jasmine Cha 2023-06-28 16:36:30 +08:00
parent 413f2c4016
commit 13fbb117f6
2 changed files with 84 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

61
audio/husky/aidl_config/mixer_paths_aidl.xml
View file

@ -714,7 +714,6 @@
<ctl name="PCM Source" value="ASP" /> <ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="6" /> <ctl name="AMP PCM Gain" value="6" />
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<ctl name="Digital PCM Volume" value="817" />
</path> </path>
<path name="speaker-earpiece (VOICE)"> <path name="speaker-earpiece (VOICE)">
@ -722,7 +721,6 @@
<ctl name="AMP PCM Gain" value="7" /> <ctl name="AMP PCM Gain" value="7" />
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<ctl name="AoC Chirp Enable" value="1" /> <ctl name="AoC Chirp Enable" value="1" />
<ctl name="Digital PCM Volume" value="817" />
</path> </path>
<path name="speaker"> <path name="speaker">
@ -732,8 +730,6 @@
<ctl name="Fast Use Case Switch Enable" value="1" /> <ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="Digital PCM Volume" value="817" />
<ctl name="R Digital PCM Volume" value="817" />
</path> </path>
<path name="speaker (VOICE)"> <path name="speaker (VOICE)">
@ -747,8 +743,6 @@
<ctl name="Fast Use Case Switch Enable" value="1" /> <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 Delta File" value="fast_switch2.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="Digital PCM Volume" value="800" />
<ctl name="R Digital PCM Volume" value="817" />
</path> </path>
<path name="speaker-safe"> <path name="speaker-safe">
@ -756,7 +750,6 @@
<!-- load Bypass FIR --> <!-- load Bypass FIR -->
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="R Digital PCM Volume" value="817" />
</path> </path>
<!-- Tx device --> <!-- Tx device -->
@ -910,38 +903,68 @@
<ctl name="R DSP1 Preload Switch" value="1" /> <ctl name="R DSP1 Preload Switch" value="1" />
</path> </path>
<!-- cs35l41 specific path to load firmware in cs35l41.c end--> <!-- cs35l41 specific path to load firmware in cs35l41.c end-->
<!-- cs35l41 specific path to set current limit in cs35l41 --> <!-- cs35l41 specific path for adated feature in cs35l41_route_control.cc -->
<path name="speaker-boost-peak-current-limit"> <!-- 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="Boost Peak Current Limit" value="2.50A" />
<ctl name="R 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>
<path name="speaker-boost-peak-current-limit-battery-throttled"> <path name="adapted-speaker-battery-throttled">
<ctl name="Boost Peak Current Limit" value="1.80A" /> <ctl name="Boost Peak Current Limit" value="1.80A" />
<ctl name="R 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>
<path name="speaker-safe-boost-peak-current-limit"> <path name="adapted-speaker-safe">
<ctl name="R Boost Peak Current Limit" value="3.50A" /> <ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="R Digital PCM Volume" value="817" />
</path> </path>
<path name="speaker-safe-boost-peak-current-limit-battery-throttled"> <path name="adapted-speaker-safe-battery-throttled">
<path name="adapted-speaker-safe" />
</path> </path>
<path name="earpiece-boost-peak-current-limit"> <path name="adapted-earpiece">
<ctl name="Digital PCM Volume" value="817" />
</path> </path>
<path name="earpiece-boost-peak-current-limit-battery-throttled"> <path name="adapted-earpiece-battery-throttled">
<path name="adapted-earpiece" />
</path> </path>
<path name="voice-speaker-boost-peak-current-limit"> <path name="adapted-voice-speaker">
<ctl name="R Boost Peak Current Limit" value="3.50A" /> <ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="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>
<path name="voice-speaker-boost-peak-current-limit-battery-throttled"> <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>
<path name="voice-earpiece-boost-peak-current-limit"> <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="Boost Peak Current Limit" value="3.50A" />
<ctl name="Digital PCM Volume" value="817" />
</path> </path>
<path name="voice-earpiece-boost-peak-current-limit-battery-throttled"> <path name="adapted-voice-earpiece-battery-throttled">
<path name="adapted-voice-earpiece" />
</path> </path>
<!-- cs35l41 specific path to set current limit in cs35l41 end --> <!-- cs35l41 specific path for adated feature in cs35l41_route_control.cc end -->
</mixer> </mixer>

61
audio/shiba/aidl_config/mixer_paths_aidl.xml
View file

@ -714,7 +714,6 @@
<ctl name="PCM Source" value="ASP" /> <ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="6" /> <ctl name="AMP PCM Gain" value="6" />
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<ctl name="Digital PCM Volume" value="817" />
</path> </path>
<path name="speaker-earpiece (VOICE)"> <path name="speaker-earpiece (VOICE)">
@ -722,7 +721,6 @@
<ctl name="AMP PCM Gain" value="7" /> <ctl name="AMP PCM Gain" value="7" />
<ctl name="Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" />
<ctl name="AoC Chirp Enable" value="1" /> <ctl name="AoC Chirp Enable" value="1" />
<ctl name="Digital PCM Volume" value="817" />
</path> </path>
<path name="speaker"> <path name="speaker">
@ -732,8 +730,6 @@
<ctl name="Fast Use Case Switch Enable" value="1" /> <ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="Digital PCM Volume" value="817" />
<ctl name="R Digital PCM Volume" value="817" />
</path> </path>
<path name="speaker (VOICE)"> <path name="speaker (VOICE)">
@ -747,8 +743,6 @@
<ctl name="Fast Use Case Switch Enable" value="1" /> <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 Delta File" value="fast_switch2.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="Digital PCM Volume" value="800" />
<ctl name="R Digital PCM Volume" value="817" />
</path> </path>
<path name="speaker-safe"> <path name="speaker-safe">
@ -756,7 +750,6 @@
<!-- load Bypass FIR --> <!-- load Bypass FIR -->
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="R Digital PCM Volume" value="817" />
</path> </path>
<!-- Tx device --> <!-- Tx device -->
@ -910,38 +903,68 @@
<ctl name="R DSP1 Preload Switch" value="1" /> <ctl name="R DSP1 Preload Switch" value="1" />
</path> </path>
<!-- cs35l41 specific path to load firmware in cs35l41.c end--> <!-- cs35l41 specific path to load firmware in cs35l41.c end-->
<!-- cs35l41 specific path to set current limit in cs35l41 --> <!-- cs35l41 specific path for adated feature in cs35l41_route_control.cc -->
<path name="speaker-boost-peak-current-limit"> <!-- 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="Boost Peak Current Limit" value="2.50A" />
<ctl name="R 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>
<path name="speaker-boost-peak-current-limit-battery-throttled"> <path name="adapted-speaker-battery-throttled">
<ctl name="Boost Peak Current Limit" value="1.80A" /> <ctl name="Boost Peak Current Limit" value="1.80A" />
<ctl name="R 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>
<path name="speaker-safe-boost-peak-current-limit"> <path name="adapted-speaker-safe">
<ctl name="R Boost Peak Current Limit" value="3.50A" /> <ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="R Digital PCM Volume" value="817" />
</path> </path>
<path name="speaker-safe-boost-peak-current-limit-battery-throttled"> <path name="adapted-speaker-safe-battery-throttled">
<path name="adapted-speaker-safe" />
</path> </path>
<path name="earpiece-boost-peak-current-limit"> <path name="adapted-earpiece">
<ctl name="Digital PCM Volume" value="817" />
</path> </path>
<path name="earpiece-boost-peak-current-limit-battery-throttled"> <path name="adapted-earpiece-battery-throttled">
<path name="adapted-earpiece" />
</path> </path>
<path name="voice-speaker-boost-peak-current-limit"> <path name="adapted-voice-speaker">
<ctl name="R Boost Peak Current Limit" value="3.50A" /> <ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="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>
<path name="voice-speaker-boost-peak-current-limit-battery-throttled"> <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>
<path name="voice-earpiece-boost-peak-current-limit"> <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="Boost Peak Current Limit" value="3.50A" />
<ctl name="Digital PCM Volume" value="817" />
</path> </path>
<path name="voice-earpiece-boost-peak-current-limit-battery-throttled"> <path name="adapted-voice-earpiece-battery-throttled">
<path name="adapted-voice-earpiece" />
</path> </path>
<!-- cs35l41 specific path to set current limit in cs35l41 end --> <!-- cs35l41 specific path for adated feature in cs35l41_route_control.cc end -->
</mixer> </mixer>