Merge "hal: Prevent integer overflow"
diff --git a/configs/msmnile_au/msmnile_au.mk b/configs/msmnile_au/msmnile_au.mk
index 7756819..214270b 100644
--- a/configs/msmnile_au/msmnile_au.mk
+++ b/configs/msmnile_au/msmnile_au.mk
@@ -76,7 +76,7 @@
AUDIO_FEATURE_ENABLED_SND_MONITOR := false
AUDIO_FEATURE_ENABLED_DLKM := true
AUDIO_FEATURE_ENABLED_USB_BURST_MODE := false
-AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := false
+AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := false
##AUDIO_FEATURE_FLAGS
diff --git a/configs/msmnile_au/sound_trigger_mixer_paths.xml b/configs/msmnile_au/sound_trigger_mixer_paths.xml
old mode 100644
new mode 100755
index 28cd4db..089b02a
--- a/configs/msmnile_au/sound_trigger_mixer_paths.xml
+++ b/configs/msmnile_au/sound_trigger_mixer_paths.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014-2018, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2014-2019, 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 -->
@@ -28,14 +28,14 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" />
- <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="0" />
<ctl name="LSM1 Port" value="None" />
<ctl name="LSM2 Port" value="None" />
<ctl name="LSM3 Port" value="None" />
@@ -44,7 +44,7 @@
<ctl name="LSM6 Port" value="None" />
<ctl name="LSM7 Port" value="None" />
<ctl name="LSM8 Port" value="None" />
- <ctl name="SLIMBUS_5_TX LSM Function" value="None" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="None" />
<ctl name="MADONOFF Switch" value="0" />
<ctl name="MAD Input" value="DMIC1" />
<ctl name="MAD_SEL MUX" value="SPE" />
@@ -91,99 +91,115 @@
<ctl name= "WDMA3_ON_OFF Switch" value="0" />
<path name="listen-voice-wakeup-1">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM1 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM1 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-2">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM2 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM2 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-3">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM3 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM3 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-4">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM4 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM4 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-5">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM5 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM5 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-6">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM6 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM6 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-7">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM7 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM7 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-8">
- <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
- <ctl name="LSM8 Port" value="SLIMBUS_5_TX" />
- <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM8 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-1 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM1 Port" value="ADM_LSM_TX" />
- <ctl name="LSM1 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-2 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM2 Port" value="ADM_LSM_TX" />
- <ctl name="LSM2 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-3 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM3 Port" value="ADM_LSM_TX" />
- <ctl name="LSM3 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-4 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM4 Port" value="ADM_LSM_TX" />
- <ctl name="LSM4 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-5 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM5 Port" value="ADM_LSM_TX" />
- <ctl name="LSM5 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-6 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM6 Port" value="ADM_LSM_TX" />
- <ctl name="LSM6 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-7 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM7 Port" value="ADM_LSM_TX" />
- <ctl name="LSM7 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-8 preproc">
- <ctl name="SLIMBUS_0_TX LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM8 Port" value="ADM_LSM_TX" />
- <ctl name="LSM8 Mixer SLIMBUS_0_TX" value="1" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-cpe-handset-mic">
@@ -323,8 +339,10 @@
</path>
<path name="echo-reference">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_RX"/>
- <ctl name="EC Reference Channels" value="Two"/>
+ <ctl name="SEC_TDM_TX_0 SampleRate" value="KHZ_16" />
+ <ctl name="SEC_TDM_TX_0 Channels" value="Six" />
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_TDM_TX_0"/>
+ <ctl name="EC Reference Channels" value="Six"/>
<ctl name="EC Reference Bit Format" value="S16_LE"/>
<ctl name="EC Reference SampleRate" value="48000"/>
</path>
diff --git a/configs/msmnile_au/sound_trigger_platform_info.xml b/configs/msmnile_au/sound_trigger_platform_info.xml
index 7d5e81f..6efdcdd 100644
--- a/configs/msmnile_au/sound_trigger_platform_info.xml
+++ b/configs/msmnile_au/sound_trigger_platform_info.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2013-2018, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2013-2019, 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 -->
@@ -46,11 +46,14 @@
<param transit_to_adsp_on_battery_charging="false" />
<!-- Below backend params must match with port used in mixer path file -->
<!-- param used to configure backend sample rate, format and channels -->
- <param backend_port_name="SLIM_1_TX" />
+ <param backend_port_name="TERT_TDM_TX_0" />
<!-- Param used to match and obtain device backend index -->
- <param backend_dai_name="SLIMBUS_1_TX" />
+ <param backend_dai_name="TERT_TDM_TX_0" />
<!-- Param used to indicate if SVA has dedicated SLIM ports -->
<param dedicated_sva_path="true" />
+ <param concurrent_capture="true" />
+ <param concurrent_voice_call="false" />
+ <param concurrent_voip_call="false" />
</common_config>
<acdb_ids>
<param DEVICE_HANDSET_MIC_APE="100" />
@@ -59,7 +62,7 @@
<param DEVICE_HANDSET_TMIC_CPE="130" />
<param DEVICE_HANDSET_TMIC_APE="157" />
<param DEVICE_HANDSET_MIC_PP_APE="135" />
- <param DEVICE_HANDSET_QMIC_APE="137" />
+ <param DEVICE_HANDSET_QMIC_APE="132" />
<param DEVICE_HEADSET_MIC_CPE="139" />
<param DEVICE_HEADSET_MIC_APE="141" />
<param DEVICE_HANDSET_DMIC_APE="149" />
@@ -73,7 +76,7 @@
<!-- QTI SVA -->
<sound_model_config>
<param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51b" />
- <param execution_type="DYNAMIC" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->
+ <param execution_type="ADSP" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->
<param library="libsmwrapper.so" />
<param max_cpe_phrases="6" />
<param max_cpe_users="3" />
@@ -90,7 +93,7 @@
<!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC" -->
<!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
<!-- is one of FLUENCE, FLUENCE_STEREO, FFECNS values -->
- <param fluence_type="FLUENCE_TMIC" />
+ <param fluence_type="FLUENCE_QMIC" />
<!-- wdsp_fluence_type: fluence disabled: "NONE" -->
<!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->
<param wdsp_fluence_type="NONE" />
@@ -163,7 +166,7 @@
<lsm_usecase>
<param execution_mode="ADSP" />
<param app_type="2" /> <!-- app type used in ACDB -->
- <param in_channels="5"/> <!-- Module input channels -->
+ <param in_channels="4"/> <!-- Module input channels -->
<param load_sound_model_ids="0x00012C1C, 0x00012C14" />
<param unload_sound_model_ids="0x00012C1C, 0x00012C15" />
<param confidence_levels_ids="0x00012C1C, 0x00012C07" />
@@ -179,6 +182,10 @@
transfer mode -->
<param capture_keyword="PCM_packet, RT, 2000" />
<param client_capture_read_delay="2000" />
+ <param lpi_enable="false" />
+ <param concurrent_capture="true" />
+ <param concurrent_voice_call="false" />
+ <param concurrent_voip_call="false" />
</sound_model_config>
<!-- QTI Music Detection !-->
@@ -336,28 +343,31 @@
<param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FLUENCE" />
- <param app_type="69944" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FLUENCE_STEREO" />
- <param app_type="69948" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FFECNS" />
- <param app_type="69947" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
- <param out_channels="5"/>
+ <param out_channels="4"/>
</adm_config>
<!-- backend_type tag defines backend type for each device -->
diff --git a/configs/msmsteppe_au/msmsteppe_au.mk b/configs/msmsteppe_au/msmsteppe_au.mk
index 01b2ec7..cb8d990 100644
--- a/configs/msmsteppe_au/msmsteppe_au.mk
+++ b/configs/msmsteppe_au/msmsteppe_au.mk
@@ -65,7 +65,7 @@
AUDIO_FEATURE_ENABLED_RAS := true
AUDIO_FEATURE_ENABLED_SND_MONITOR := false
AUDIO_FEATURE_ENABLED_USB_BURST_MODE := false
-AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := false
+AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := false
##AUDIO_FEATURE_FLAGS
diff --git a/configs/msmsteppe_au/sound_trigger_mixer_paths.xml b/configs/msmsteppe_au/sound_trigger_mixer_paths.xml
index 90de0d3..64312f9 100644
--- a/configs/msmsteppe_au/sound_trigger_mixer_paths.xml
+++ b/configs/msmsteppe_au/sound_trigger_mixer_paths.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014-2018, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2014-2019, 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 -->
@@ -28,14 +28,14 @@
<mixer>
<!-- These are the initial mixer settings -->
- <ctl name="LSM1 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM2 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM3 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM4 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM5 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM6 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM7 Mixer TX_CDC_DMA_TX_3" value="0" />
- <ctl name="LSM8 Mixer TX_CDC_DMA_TX_3" value="0" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="0" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="0" />
<ctl name="LSM1 Port" value="None" />
<ctl name="LSM2 Port" value="None" />
<ctl name="LSM3 Port" value="None" />
@@ -44,7 +44,7 @@
<ctl name="LSM6 Port" value="None" />
<ctl name="LSM7 Port" value="None" />
<ctl name="LSM8 Port" value="None" />
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="None" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="None" />
<ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
<ctl name="TX_AIF1_CAP Mixer DEC0" value="0" />
<ctl name="TX_AIF1_CAP Mixer DEC1" value="0" />
@@ -68,99 +68,115 @@
<ctl name="TX_DEC3 Volume" value="84" />
<path name="listen-voice-wakeup-1">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM1 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM1 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM1 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-2">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM2 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM2 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM2 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-3">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM3 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM3 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM3 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-4">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM4 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM4 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM4 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-5">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM5 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM5 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM5 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-6">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM6 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM6 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM6 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-7">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM7 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM7 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM7 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-8">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
- <ctl name="LSM8 Port" value="TX_CDC_DMA_TX_3" />
- <ctl name="LSM8 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
+ <ctl name="LSM8 Port" value="TERT_TDM_TX_0" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-1 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM1 Port" value="ADM_LSM_TX" />
- <ctl name="LSM1 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM1 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-2 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM2 Port" value="ADM_LSM_TX" />
- <ctl name="LSM2 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM2 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-3 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM3 Port" value="ADM_LSM_TX" />
- <ctl name="LSM3 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM3 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-4 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM4 Port" value="ADM_LSM_TX" />
- <ctl name="LSM4 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM4 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-5 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM5 Port" value="ADM_LSM_TX" />
- <ctl name="LSM5 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM5 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-6 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM6 Port" value="ADM_LSM_TX" />
- <ctl name="LSM6 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM6 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-7 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM7 Port" value="ADM_LSM_TX" />
- <ctl name="LSM7 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM7 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-voice-wakeup-8 preproc">
- <ctl name="TX_CDC_DMA_TX_3 LSM Function" value="SWAUDIO" />
+ <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
+ <ctl name="TERT_TDM_TX_0 LSM Function" value="SWAUDIO" />
<ctl name="LSM8 Port" value="ADM_LSM_TX" />
- <ctl name="LSM8 Mixer TX_CDC_DMA_TX_3" value="1" />
+ <ctl name="LSM8 Mixer TERT_TDM_TX_0" value="1" />
</path>
<path name="listen-ape-handset-mic">
@@ -214,8 +230,10 @@
</path>
<path name="echo-reference">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="WSA_CDC_DMA_RX_0"/>
- <ctl name="EC Reference Channels" value="Two"/>
+ <ctl name="SEC_TDM_TX_0 SampleRate" value="KHZ_16" />
+ <ctl name="SEC_TDM_TX_0 Channels" value="Six" />
+ <ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_TDM_TX_0"/>
+ <ctl name="EC Reference Channels" value="Six"/>
<ctl name="EC Reference Bit Format" value="S16_LE"/>
<ctl name="EC Reference SampleRate" value="48000"/>
</path>
diff --git a/configs/msmsteppe_au/sound_trigger_platform_info.xml b/configs/msmsteppe_au/sound_trigger_platform_info.xml
index a85a180..77e2f09 100644
--- a/configs/msmsteppe_au/sound_trigger_platform_info.xml
+++ b/configs/msmsteppe_au/sound_trigger_platform_info.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2013-2018, The Linux Foundation. All rights reserved. -->
+<!--- Copyright (c) 2013-2019, 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 -->
@@ -46,12 +46,14 @@
<!-- Below backend params must match with port used in mixer path file -->
<!-- param used to configure backend sample rate, format and channels -->
<!-- uncomment TX_CDC_DMA_TX_3 values for internal codec and comment SLIM_0_TX values -->
- <param backend_port_name="SLIM_0_TX" />
+ <param backend_port_name="TERT_TDM_TX_0" />
<!-- param backend_port_name="TX_CDC_DMA_TX_3" /-->
<!-- Param used to match and obtain device backend index -->
- <param backend_dai_name="SLIMBUS_0_TX" />
+ <param backend_dai_name="TERT_TDM_TX_0" />
<!-- param backend_dai_name="TX_CDC_DMA_TX_3" /-->
-
+ <param concurrent_capture="true" />
+ <param concurrent_voice_call="false" />
+ <param concurrent_voip_call="false" />
</common_config>
<acdb_ids>
<!--For internal codec please enable below device-->
@@ -61,7 +63,7 @@
<param DEVICE_HANDSET_MIC_ECPP_CPE="128" />
<param DEVICE_HANDSET_TMIC_CPE="130" />
<param DEVICE_HANDSET_MIC_PP_APE="135" />
- <param DEVICE_HANDSET_QMIC_APE="137" />
+ <param DEVICE_HANDSET_QMIC_APE="132" />
<param DEVICE_HEADSET_MIC_CPE="139" />
<param DEVICE_HANDSET_DMIC_APE="149" />
<param DEVICE_HANDSET_DMIC_CPE="153" />
@@ -72,7 +74,7 @@
<!-- configuration. ISV must use their own unique vendor_uuid. -->
<sound_model_config>
<param vendor_uuid="68ab2d40-e860-11e3-95ef-0002a5d5c51b" />
- <param execution_type="WDSP" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->
+ <param execution_type="ADSP" /> <!-- value: "WDSP" "ADSP" "DYNAMIC" -->
<param library="libsmwrapper.so" />
<param max_cpe_phrases="6" />
<param max_cpe_users="3" />
@@ -85,9 +87,10 @@
<!-- adm_cfg_profile should match with the one defined under adm_config -->
<!-- Set it to NONE if LSM directly connects to AFE -->
<param adm_cfg_profile="FFECNS" />
- <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC", -->
- <!-- "FLUENCE_QMIC". param value is valid when adm_cfg_profile="FLUENCE"-->
- <param fluence_type="FLUENCE_TMIC" />
+ <!-- fluence_type: "FLUENCE", "FLUENCE_DMIC", "FLUENCE_TMIC" -->
+ <!-- "FLUENCE_QMIC". Param value is valid when adm_cfg_profile -->
+ <!-- is one of FLUENCE, FLUENCE_STEREO, FFECNS values -->
+ <param fluence_type="FLUENCE_QMIC" />
<!-- wdsp_fluence_type: fluence disabled: "NONE" -->
<!-- fluence enabled: "FLUENCE_DMIC", "FLUENCE_TMIC", "FLUENCE_QMIC" -->
<param wdsp_fluence_type="NONE" />
@@ -158,7 +161,7 @@
<lsm_usecase>
<param execution_mode="ADSP" />
<param app_type="2" /> <!-- app type used in ACDB -->
- <param in_channels="5"/> <!-- Module input channels -->
+ <param in_channels="4"/> <!-- Module input channels -->
<param load_sound_model_ids="0x00012C1C, 0x00012C14" />
<param unload_sound_model_ids="0x00012C1C, 0x00012C15" />
<param confidence_levels_ids="0x00012C1C, 0x00012C07" />
@@ -182,6 +185,10 @@
transfer mode -->
<param capture_keyword="PCM_packet, RT, 2000" />
<param client_capture_read_delay="2000" />
+ <param lpi_enable="false" />
+ <param concurrent_capture="true" />
+ <param concurrent_voice_call="false" />
+ <param concurrent_voip_call="false" />
</sound_model_config>
<!-- QTI Music Detection !-->
@@ -324,28 +331,31 @@
<param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FLUENCE" />
- <param app_type="69944" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FLUENCE_STEREO" />
- <param app_type="69948" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
+ <param out_channels="4"/>
</adm_config>
<adm_config>
<param adm_cfg_profile="FFECNS" />
- <param app_type="69947" />
+ <param app_type="69938" />
<param sample_rate="16000" />
<param bit_width="16" />
- <param out_channels="5"/>
+ <param out_channels="4"/>
</adm_config>
<!-- backend_type tag defines backend type for each device -->