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

Commit d3a67a5c authored by Vignesh Kulothungan's avatar Vignesh Kulothungan Committed by Gerrit - the friendly Code Review server
Browse files

hal: add voice stereo speaker(-protected) with vbat 

Add voice stereo speaker vbat and voice stereo speaker protected vbat.
Update "get output device" function to use stereo speakers for voice
call when vbat/bcl and voice stereo speaker are enabled.

Change-Id: I5b91f2c133e8d9d39b14d60c35f0df2eb1454e73
parent b18a6d0e

hal/msm8916/platform.c

+26 −2
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_HANDSET] = "voice-handset",

    [SND_DEVICE_OUT_VOICE_SPEAKER] = "voice-speaker",

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO] = "voice-speaker-stereo",

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT] = "vbat-voice-speaker-stereo",

    [SND_DEVICE_OUT_VOICE_SPEAKER_WSA] = "wsa-voice-speaker",

    [SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = "vbat-voice-speaker",

    [SND_DEVICE_OUT_VOICE_SPEAKER_2] = "voice-speaker-2",
@@ -481,6 +482,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_SPEAKER_PROTECTED] = "speaker-protected",

    [SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED] = "voice-speaker-protected",

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED] = "voice-speaker-stereo-protected",

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT] = "voice-speaker-stereo-protected-vbat",

    [SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED] = "voice-speaker-2-protected",

    [SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT] = "speaker-protected-vbat",

    [SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT] = "voice-speaker-protected-vbat",
@@ -625,6 +627,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_LINE] = 10,

    [SND_DEVICE_OUT_VOICE_SPEAKER] = 14,

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO] = 15,

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT] = 15,

    [SND_DEVICE_OUT_VOICE_SPEAKER_2] = 14,

    [SND_DEVICE_OUT_VOICE_SPEAKER_WSA] = 135,

    [SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA] = 135,
@@ -667,6 +670,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT] = 101,

    [SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT] = 101,

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED] = 124,

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT] = 124,

    [SND_DEVICE_OUT_SPEAKER_PROTECTED_RAS] = 134,

    [SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT_RAS] = 134,

    [SND_DEVICE_OUT_VOIP_HANDSET] = 133,
@@ -783,6 +787,7 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_WSA)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_VBAT)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT)},
@@ -821,6 +826,7 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT)},
@@ -1627,6 +1633,7 @@ static void set_platform_defaults(struct platform_data * my_data) 
    backend_tag_table[SND_DEVICE_OUT_HEADPHONES_DSD] = strdup("headphones-dsd");

    backend_tag_table[SND_DEVICE_OUT_HEADPHONES_44_1] = strdup("headphones-44.1");

    backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = strdup("vbat-voice-speaker");

    backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT] = strdup("vbat-voice-speaker-stereo");

    backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT] = strdup("vbat-voice-speaker-2");

    backend_tag_table[SND_DEVICE_OUT_BT_A2DP] = strdup("bt-a2dp");

    backend_tag_table[SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP] = strdup("speaker-and-bt-a2dp");
@@ -1658,6 +1665,7 @@ static void set_platform_defaults(struct platform_data * my_data) 
    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");

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

    hw_interface_table[SND_DEVICE_OUT_VOICE_HEADPHONES] = strdup("SLIMBUS_6_RX");

    hw_interface_table[SND_DEVICE_OUT_VOICE_LINE] = strdup("SLIMBUS_6_RX");

    hw_interface_table[SND_DEVICE_OUT_HDMI] = strdup("HDMI");
@@ -1689,6 +1697,7 @@ static void set_platform_defaults(struct platform_data * my_data) 
    hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED] = strdup("SLIMBUS_0_RX");

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

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

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

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

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

    hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT] = strdup("SLIMBUS_0_RX");
@@ -3055,7 +3064,8 @@ void platform_add_backend_name(char *mixer_path, snd_device_t snd_device, 
    }



    if ((snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_VBAT ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT) &&

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT) &&

        !(usecase->type == VOICE_CALL || usecase->type == VOIP_CALL)) {

        ALOGI("%s: Not adding vbat speaker device to non voice use cases", __func__);

        return;
@@ -3799,6 +3809,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_VBAT ||

         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) &&
@@ -3842,6 +3853,8 @@ int platform_switch_voice_call_device_post(void *platform, 
                out_snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED;

            else if (out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO)

                out_snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED;

            else if (out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT)

                out_snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT;

            else if (out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2 ||

                out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA)

                out_snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED;
@@ -3878,6 +3891,7 @@ int platform_switch_voice_call_usecase_route_post(void *platform, 
    if ((out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER ||

         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2 ||

         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO ||

         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT ||

         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_VBAT ||

         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT) &&

         audio_extn_spkr_prot_is_enabled()) {
@@ -4393,7 +4407,9 @@ snd_device_t platform_get_output_snd_device(void *platform, struct stream_out *o 
                snd_device = SND_DEVICE_OUT_BT_A2DP;

        } else if (devices & AUDIO_DEVICE_OUT_SPEAKER) {

                if (my_data->is_vbat_speaker) {

                    if (my_data->mono_speaker == SPKR_1)

                    if (my_data->voice_speaker_stereo)

                        snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT;

                    else if (my_data->mono_speaker == SPKR_1)

                        snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_VBAT;

                    else

                        snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT;
@@ -7930,6 +7946,7 @@ static bool can_enable_mbdrc_on_device(snd_device_t snd_device) 
        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2 ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_WSA ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA) {

        ret = true;
@@ -8014,6 +8031,7 @@ bool platform_can_enable_spkr_prot_on_device(snd_device_t snd_device) 
        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2 ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_WSA ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA) {

        ret = true;
@@ -8051,6 +8069,9 @@ int platform_get_spkr_prot_acdb_id(snd_device_t snd_device) 
        case SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT:

             acdb_id = platform_get_snd_device_acdb_id(SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT);

             break;

        case SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT:

             acdb_id = platform_get_snd_device_acdb_id(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT);

             break;

        default:

             acdb_id = -EINVAL;

             break;
@@ -8075,6 +8096,8 @@ int platform_get_spkr_prot_snd_device(snd_device_t snd_device) 
             return SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED;

        case SND_DEVICE_OUT_VOICE_SPEAKER_STEREO:

             return SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED;

        case SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT:

             return SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT;

        case SND_DEVICE_OUT_SPEAKER_VBAT:

             return SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT;

        case SND_DEVICE_OUT_VOICE_SPEAKER_VBAT:
@@ -8092,6 +8115,7 @@ int platform_get_vi_feedback_snd_device(snd_device_t snd_device) 
        case SND_DEVICE_OUT_SPEAKER_PROTECTED:

        case SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT:

        case SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED:

        case SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT:

             return SND_DEVICE_IN_CAPTURE_VI_FEEDBACK;

        case SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED:

        case SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT:

hal/msm8916/platform.h

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ enum { 
    SND_DEVICE_OUT_VOICE_HANDSET,

    SND_DEVICE_OUT_VOICE_SPEAKER,

    SND_DEVICE_OUT_VOICE_SPEAKER_STEREO,

    SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT,

    SND_DEVICE_OUT_VOICE_SPEAKER_WSA,

    SND_DEVICE_OUT_VOICE_SPEAKER_VBAT,

    SND_DEVICE_OUT_VOICE_SPEAKER_2,
@@ -140,6 +141,7 @@ enum { 
    SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED,

    SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED,

    SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED,

    SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT,

    SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT,

    SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT,

    SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT,

hal/msm8974/platform.c

+29 −2
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_HAC_HANDSET] = "voice-hac-handset",

    [SND_DEVICE_OUT_VOICE_SPEAKER] = "voice-speaker",

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO] = "voice-speaker-stereo",

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT] = "voice-speaker-stereo-vbat",

    [SND_DEVICE_OUT_VOICE_SPEAKER_WSA] = "wsa-voice-speaker",

    [SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = "voice-speaker-vbat",

    [SND_DEVICE_OUT_VOICE_SPEAKER_2] = "voice-speaker-2",
@@ -607,6 +608,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED] = "voice-speaker-protected",

    [SND_DEVICE_OUT_VOICE_SPEAKER_HFP] = "voice-speaker-hfp",

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED] = "voice-speaker-stereo-protected",

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT] = "voice-speaker-stereo-protected-vbat",

    [SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED] = "voice-speaker-2-protected",

    [SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT] = "speaker-protected-vbat",

    [SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT] = "voice-speaker-protected-vbat",
@@ -847,6 +849,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_HANDSET] = 7,

    [SND_DEVICE_OUT_VOICE_SPEAKER] = 14,

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO] = 15,

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT] = 15,

    [SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = 14,

    [SND_DEVICE_OUT_VOICE_SPEAKER_2] = 14,

    [SND_DEVICE_OUT_VOICE_SPEAKER_WSA] = 135,
@@ -912,6 +915,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT] = 101,

    [SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT] = 101,

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED] = 124,

    [SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT] = 124,

    [SND_DEVICE_OUT_SPEAKER_PROTECTED_RAS] = 134,

    [SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT_RAS] = 134,

    [SND_DEVICE_OUT_VOICE_HEARING_AID] = 45,
@@ -1096,6 +1100,7 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {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_STEREO_VBAT)},

    {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)},
@@ -1154,6 +1159,7 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT)},

    {TO_NAME_INDEX(SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT)},
@@ -1848,6 +1854,7 @@ static bool can_enable_mbdrc_on_device(snd_device_t snd_device) 
        snd_device == SND_DEVICE_OUT_SPEAKER_VBAT ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_VBAT ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2 ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO ||
@@ -2343,6 +2350,7 @@ static void set_platform_defaults(struct platform_data * my_data) 
    backend_tag_table[SND_DEVICE_OUT_HEADPHONES_44_1] = strdup("headphones-44.1");

    backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = strdup("voice-speaker-vbat");

    backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT] = strdup("voice-speaker-2-vbat");

    backend_tag_table[SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT] = strdup("voice-speaker-stereo-vbat");

    backend_tag_table[SND_DEVICE_OUT_BT_A2DP] = strdup("bt-a2dp");

    backend_tag_table[SND_DEVICE_IN_BT_A2DP] = strdup("bt-a2dp-cap");

    backend_tag_table[SND_DEVICE_OUT_SPEAKER_AND_BT_A2DP] = strdup("speaker-and-bt-a2dp");
@@ -2389,6 +2397,7 @@ static void set_platform_defaults(struct platform_data * my_data) 
    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_STEREO_VBAT] = 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");
@@ -2445,6 +2454,7 @@ static void set_platform_defaults(struct platform_data * my_data) 
    hw_interface_table[SND_DEVICE_OUT_SPEAKER_SAFE_AND_BT_SCO_SWB] = strdup("QUAT_TDM_RX_0-and-SLIMBUS_7_RX");

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

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

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

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

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

    hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT] = strdup("SLIMBUS_0_RX");
@@ -4428,7 +4438,8 @@ void platform_add_backend_name(char *mixer_path, snd_device_t snd_device, 
    }









    if ((snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_VBAT ||









        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT) &&









        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT ||









        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT) &&









        !(usecase->type == VOICE_CALL || usecase->type == VOIP_CALL)) {









        ALOGI("%s: Not adding vbat speaker device to non voice use cases", __func__);









        return;








@@ -5521,6 +5532,7 @@ int platform_switch_voice_call_enable_device_config(void *platform,















    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_STEREO_VBAT ||









         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) &&








@@ -5564,6 +5576,8 @@ int platform_switch_voice_call_device_post(void *platform,







                out_snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED;









            else if (out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO)









                out_snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED;









            else if (out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT)









                out_snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT;









            else if (out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_VBAT)









                out_snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT;









            else if (out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2 ||








@@ -5600,6 +5614,7 @@ int platform_switch_voice_call_usecase_route_post(void *platform,







    if ((out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER ||









         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2 ||









         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO ||









         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT ||









         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_VBAT ||









         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT) &&









         audio_extn_spkr_prot_is_enabled()) {








@@ -6507,7 +6522,12 @@ snd_device_t platform_get_output_snd_device(void *platform, struct stream_out *o







                   compare_device_type(&devices, AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {









            if (my_data->is_vbat_speaker || my_data->is_bcl_speaker) {









                if (hw_info_is_stereo_spkr(my_data->hw_info)) {









                    if (my_data->mono_speaker == SPKR_1)









                    if (my_data->fluence_type & FLUENCE_QUAD_MIC &&









                        hw_info_use_mono_spkr_for_qmic(my_data->hw_info))









                         snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_VBAT;









                    else if (my_data->voice_speaker_stereo)









                        snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT;









                    else if (my_data->mono_speaker == SPKR_1)









                        snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_VBAT;









                    else









                        snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT;








@@ -11516,6 +11536,7 @@ bool platform_can_enable_spkr_prot_on_device(snd_device_t snd_device)







        snd_device == SND_DEVICE_OUT_SPEAKER_VBAT ||









        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_VBAT ||









        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT ||









        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT ||









        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_STEREO ||









        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER ||









        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2 ||








@@ -11556,6 +11577,9 @@ int platform_get_spkr_prot_acdb_id(snd_device_t snd_device)







        case SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT:









             acdb_id = platform_get_snd_device_acdb_id(SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT);









             break;









        case SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT:









             acdb_id = platform_get_snd_device_acdb_id(SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT);









             break;









        default:









             acdb_id = -EINVAL;









             break;








@@ -11589,6 +11613,8 @@ int platform_get_spkr_prot_snd_device(snd_device_t snd_device)







             return SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT;









        case SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT:









             return SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT;









        case SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT:









             return SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT;









        default:









             return snd_device;









    }








@@ -11599,6 +11625,7 @@ int platform_get_vi_feedback_snd_device(snd_device_t snd_device)







        case SND_DEVICE_OUT_SPEAKER_PROTECTED:









        case SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT:









        case SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED:









        case SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT:









             return SND_DEVICE_IN_CAPTURE_VI_FEEDBACK;









        case SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED:









        case SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT:
































hal/msm8974/platform.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -82,6 +82,7 @@ enum {







    SND_DEVICE_OUT_VOICE_HANDSET,









    SND_DEVICE_OUT_VOICE_SPEAKER,









    SND_DEVICE_OUT_VOICE_SPEAKER_STEREO,









    SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_VBAT,









    SND_DEVICE_OUT_VOICE_SPEAKER_VBAT,









    SND_DEVICE_OUT_VOICE_SPEAKER_2,









    SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT,








@@ -141,6 +142,7 @@ enum {







    SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED,









    SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED,









    SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED,









    SND_DEVICE_OUT_VOICE_SPEAKER_STEREO_PROTECTED_VBAT,









    SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT,









    SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT,









    SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT,