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

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

Merge "hal: Add missing entries for voice speaker stereo."

parents 49946a48 ed9c4542

hal/msm8916/platform.c

+3 −0
Original line number Diff line number Diff line
@@ -3784,6 +3784,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_VBAT ||

         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT) &&

         audio_extn_spkr_prot_is_enabled()) {
@@ -7760,6 +7761,7 @@ static bool can_enable_mbdrc_on_device(snd_device_t snd_device) 
        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT ||

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

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA) {

        ret = true;
@@ -7842,6 +7844,7 @@ bool platform_can_enable_spkr_prot_on_device(snd_device_t snd_device) 
        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT ||

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

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA) {

        ret = true;

hal/msm8974/platform.c

+3 −0
Original line number Diff line number Diff line
@@ -1533,6 +1533,7 @@ static bool can_enable_mbdrc_on_device(snd_device_t snd_device) 
        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT ||

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

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_WSA) {

        ret = true;
@@ -4530,6 +4531,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_VBAT ||

         out_snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2_VBAT) &&

         audio_extn_spkr_prot_is_enabled()) {
@@ -9275,6 +9277,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 ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_2 ||

        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_WSA ||