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

Commit b3cfd131 authored by Vidyakumar Athota's avatar Vidyakumar Athota
Browse files

Revert "hal: audio: add tz_names extn to support from audio platform_info xml" 

tz_names support is added using key value pairs under
config params in audio_platform_info.xml.

This reverts commit 8225243c

Change-Id: I5bee7225f945b31e3df9372d00aeb003c2092d8b
parent 991966da

hal/msm8916/platform.c

+0 −54
Original line number Diff line number Diff line
@@ -4372,60 +4372,6 @@ done: 
    return ret;

}



/*

 * This is a lookup table to map names of speaker device with respective left and right TZ names.

 * Also the tz names for a particular left or right speaker can be overriden by adding

 * corresponding entry in audio_platform_info.xml file.

 */

struct speaker_device_to_tz_names speaker_device_tz_names = {

    {SND_DEVICE_OUT_SPEAKER, "", ""},

};



const char *platform_get_spkr_1_tz_name(snd_device_t snd_device)

{

    if (snd_device >= SND_DEVICE_MIN && snd_device < SND_DEVICE_MAX)

        return speaker_device_tz_names.spkr_1_tz_name;

    else

        return "";

}



const char *platform_get_spkr_2_tz_name(snd_device_t snd_device)

{

    if (snd_device >= SND_DEVICE_MIN && snd_device < SND_DEVICE_MAX)

        return speaker_device_tz_names.spkr_2_tz_name;

    else

        return "";

}



int platform_set_spkr_device_tz_names(snd_device_t index,

                                      const char *spkr_1_tz_name, const char *spkr_2_tz_name)

{

    int ret = 0;



    if (spkr_1_tz_name == NULL && spkr_2_tz_name == NULL) {

        ALOGE("%s: Invalid input", __func__);

        ret = -EINVAL;

        goto done;

    }

    if (index != speaker_device_tz_names.snd_device) {

        ALOGE("%s: not matching speaker device\n");

        ret = -EINVAL;

        goto done;

    }

    ALOGD("%s: Enter, spkr_1_tz_name :%s, spkr_2_tz_name:%s",

            __func__, spkr_1_tz_name, spkr_2_tz_name);



    if (spkr_1_tz_name != NULL)

        strlcpy(speaker_device_tz_names.spkr_1_tz_name, spkr_1_tz_name,

                sizeof(speaker_device_tz_names.spkr_1_tz_name));



    if (spkr_2_tz_name != NULL)

        strlcpy(speaker_device_tz_names.spkr_2_tz_name, spkr_2_tz_name,

                sizeof(speaker_device_tz_names.spkr_2_tz_name));

done:

    return ret;

}



bool platform_send_gain_dep_cal(void *platform __unused,

                                int level __unused)

{

hal/msm8916/platform.h

+0 −6
Original line number Diff line number Diff line
@@ -322,10 +322,4 @@ struct audio_device_to_audio_interface { 
    char device_name[100];

    char interface_name[100];

};



struct speaker_device_to_tz_names {

    snd_device_t snd_device;

    char spkr_1_tz_name[100];

    char spkr_2_tz_name[100];

};

#endif // QCOM_AUDIO_PLATFORM_H

hal/msm8960/platform.c

+0 −6
Original line number Diff line number Diff line
@@ -1166,12 +1166,6 @@ int platform_set_audio_device_interface(const char * device_name __unused, 
    return -ENOSYS;

}



int platform_set_spkr_device_tz_names(snd_device_t index,

                                      const char *spkr_1_tz_name, const char *spkr_2_tz_name)

{

    return -ENOSYS;

}



bool platform_send_gain_dep_cal(void *platform __unused,

                                int level __unused)

{

hal/msm8974/platform.c

+0 −53
Original line number Diff line number Diff line
@@ -704,14 +704,6 @@ static int msm_device_to_be_id [][NO_COLS] = { 
static int msm_be_id_array_len  =

    sizeof(msm_device_to_be_id) / sizeof(msm_device_to_be_id[0]);



/*

 * This is a lookup table to map names of speaker device with respective left and right TZ names.

 * Also the tz names for a particular left or right speaker can be overriden by adding

 * corresponding entry in audio_platform_info.xml file.

 */

struct speaker_device_to_tz_names speaker_device_tz_names = {

    {SND_DEVICE_OUT_SPEAKER, "", ""},

};



#define DEEP_BUFFER_PLATFORM_DELAY (29*1000LL)

#define LOW_LATENCY_PLATFORM_DELAY (13*1000LL)
@@ -1517,22 +1509,6 @@ const char *platform_get_snd_device_name(snd_device_t snd_device) 
        return "";

}



const char *platform_get_spkr_1_tz_name(snd_device_t snd_device)

{

    if (snd_device >= SND_DEVICE_MIN && snd_device < SND_DEVICE_MAX)

        return speaker_device_tz_names.spkr_1_tz_name;

    else

        return "";

}



const char *platform_get_spkr_2_tz_name(snd_device_t snd_device)

{

    if (snd_device >= SND_DEVICE_MIN && snd_device < SND_DEVICE_MAX)

        return speaker_device_tz_names.spkr_2_tz_name;

    else

        return "";

}



int platform_get_snd_device_name_extn(void *platform, snd_device_t snd_device,

                                      char *device_name)

{
@@ -4153,32 +4129,3 @@ int platform_set_audio_device_interface(const char *device_name, const char *int 
done:

    return ret;

}
 


int platform_set_spkr_device_tz_names(snd_device_t index,

                                      const char *spkr_1_tz_name, const char *spkr_2_tz_name)

{

    int ret = 0;



    if (spkr_1_tz_name == NULL && spkr_2_tz_name == NULL) {

        ALOGE("%s: Invalid input", __func__);

        ret = -EINVAL;

        goto done;

    }

    if (index != speaker_device_tz_names.snd_device) {

        ALOGE("%s: not matching speaker device\n", __func__);

        ret = -EINVAL;

        goto done;

    }

    ALOGD("%s: Enter, spkr_1_tz_name :%s, spkr_2_tz_name:%s",

           __func__, spkr_1_tz_name, spkr_2_tz_name);



    if (spkr_1_tz_name != NULL)

        strlcpy(speaker_device_tz_names.spkr_1_tz_name, spkr_1_tz_name,

                sizeof(speaker_device_tz_names.spkr_1_tz_name));



    if (spkr_2_tz_name != NULL)

        strlcpy(speaker_device_tz_names.spkr_2_tz_name, spkr_2_tz_name,

                sizeof(speaker_device_tz_names.spkr_2_tz_name));

done:

    return ret;

}

hal/msm8974/platform.h

+0 −6
Original line number Diff line number Diff line
@@ -407,10 +407,4 @@ struct audio_device_to_audio_interface { 
    char device_name[100];

    char interface_name[100];

};



struct speaker_device_to_tz_names {

    snd_device_t snd_device;

    char spkr_1_tz_name[100];

    char spkr_2_tz_name[100];

};

#endif // QCOM_AUDIO_PLATFORM_H