Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d610539a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Add snd device name index mapping for voice stereo speaker"

parents 5348ad08 f934f3a6

hal/msm8974/platform.c

+3 −0
Original line number Diff line number Diff line
@@ -996,6 +996,7 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_HANDSET)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_WSA)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_HFP)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_VBAT)},
@@ -2117,6 +2118,7 @@ static void set_platform_defaults(struct platform_data * my_data) 
    hw_interface_table[SND_DEVICE_OUT_VOICE_HANDSET] = strdup("SLIMBUS_0_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_HAC_HANDSET] = strdup("SLIMBUS_0_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER] = strdup("SLIMBUS_0_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_STEREO] = strdup("SLIMBUS_0_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = strdup("SLIMBUS_0_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2] = strdup("SLIMBUS_0_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT] = strdup("SLIMBUS_0_RX");
@@ -4879,6 +4881,7 @@ int platform_switch_voice_call_enable_device_config(void *platform, 
        return ret;



    if ((out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER ||

         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO ||

         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2 ||

         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_VBAT ||

         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT) &&