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

Commit 4875a261 authored by Aditya Bavanari's avatar Aditya Bavanari Committed by Gerrit - the friendly Code Review server
Browse files

hal: Modify logic to get acdb snd card name 

If sound card name has tashalite or tasha9326
as substring in it, use tasha sound card name
to pick ACDB files.

Change-Id: I3318775696559eda54fa8c33a5d11651f167c2d7
parent 5c1a2fa7

hal/msm8916/platform.c

+22 −45
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ 
#define EVENT_EXTERNAL_MIC   "qc_ext_mic"

#define MAX_CAL_NAME 20

#define MAX_MIME_TYPE_LENGTH 30

#define MAX_SND_CARD_NAME_LENGTH 100



#define GET_IN_DEVICE_INDEX(SND_DEVICE) ((SND_DEVICE) - (SND_DEVICE_IN_BEGIN))
@@ -1954,56 +1955,32 @@ static void audio_hwdep_send_cal(struct platform_data *plat_data) 
    plat_data->hw_dep_fd = fd;

}



const char * platform_get_snd_card_name_for_acdb_loader(const char *snd_card_name) {

const char * platform_get_snd_card_name_for_acdb_loader(const char *snd_card_name)

{

    const char *acdb_card_name = NULL;

    char *substring = NULL;

    char string[MAX_SND_CARD_NAME_LENGTH] = {0};

    int length = 0;



    if (snd_card_name == NULL)

        return NULL;



    // Both tasha & tasha-lite uses tasha ACDB files

    // simulate sound card name for tasha lite, so that

    // ACDB module loads tasha ACDB files for tasha lite

    if(!strncmp(snd_card_name, "msm8976-tashalite-snd-card",

             sizeof("msm8976-tashalite-snd-card"))) {

        ALOGD("using tasha ACDB files for tasha-lite");

        return "msm8976-tasha-snd-card";

    }



    if(!strncmp(snd_card_name, "msm8952-tashalite-snd-card",

             sizeof("msm8952-tashalite-snd-card"))) {

        ALOGD("using tasha ACDB files for tasha-lite");

        return "msm8952-tasha-snd-card";

    }



    if(!strncmp(snd_card_name, "msm8937-tashalite-snd-card",

             sizeof("msm8937-tashalite-snd-card"))) {

        ALOGD("using tasha ACDB files for tasha-lite");

        return "msm8937-tasha-snd-card";

    }



    if(!strncmp(snd_card_name, "msm8953-tashalite-snd-card",

             sizeof("msm8953-tashalite-snd-card"))) {

        ALOGD("using tasha ACDB files for tasha-lite");

        return "msm8953-tasha-snd-card";

    }



    if(!strncmp(snd_card_name, "sdm660-tashalite-snd-card",

             sizeof("sdm660-tashalite-snd-card"))) {

        ALOGD("using tasha ACDB files for tasha-lite");

        return "sdm660-tasha-snd-card";

    /* Both tasha & tasha-lite uses tasha ACDB files

       simulate sound card name for tasha lite, so that

       ACDB module loads tasha ACDB files for tasha lite */

    if ((substring = strstr(snd_card_name, "tashalite")) ||

        (substring = strstr(snd_card_name, "tasha9326"))) {

        ALOGD("%s: using tasha ACDB files for tasha-lite", __func__);

        length = substring - snd_card_name + 1;

        snprintf(string, length, "%s", snd_card_name);

        strlcat(string, "tasha-snd-card", sizeof(string));

        acdb_card_name = strdup(string);

        return acdb_card_name;

    }

    acdb_card_name = strdup(snd_card_name);

    return acdb_card_name;

}



    // Both tasha & tasha-lite uses tasha ACDB files

    // simulate sound card name for tasha lite, so that

    // ACDB module loads tasha ACDB files for tasha lite

    if(!strncmp(snd_card_name, "msm8x09-tasha9326-snd-card",

             sizeof("msm8x09-tasha9326-snd-card"))) {

       ALOGD("using tasha ACDB files for tasha-lite");

       return "msm8x09-tasha-snd-card";

   }

   return snd_card_name;

}





int platform_acdb_init(void *platform)

{

    struct platform_data *my_data = (struct platform_data *)platform;

hal/msm8974/platform.c

+22 −13
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ 
#define EVENT_EXTERNAL_MIC   "qc_ext_mic"

#define MAX_CAL_NAME 20

#define MAX_MIME_TYPE_LENGTH 30

#define MAX_SND_CARD_NAME_LENGTH 100



#define GET_IN_DEVICE_INDEX(SND_DEVICE) ((SND_DEVICE) - (SND_DEVICE_IN_BEGIN))
@@ -2159,22 +2160,30 @@ static void audio_hwdep_send_cal(struct platform_data *plat_data) 
    plat_data->hw_dep_fd = fd;

}



const char * platform_get_snd_card_name_for_acdb_loader(const char *snd_card_name) {

const char * platform_get_snd_card_name_for_acdb_loader(const char *snd_card_name)

{

    const char *acdb_card_name = NULL;

    char *substring = NULL;

    char string[MAX_SND_CARD_NAME_LENGTH] = {0};

    int length = 0;



    if (snd_card_name == NULL)

        return NULL;



    if(!strncmp(snd_card_name, "sdm660-tashalite-snd-card",

             sizeof("sdm660-tashalite-snd-card"))) {

        ALOGD("using tasha ACDB files for tasha-lite");

        return "sdm660-tasha-snd-card";

    }

    if(!strncmp(snd_card_name, "sdm670-tashalite-snd-card",

             sizeof("sdm670-tashalite-snd-card"))) {

        ALOGD("using tasha ACDB files for tasha-lite");

        return "sdm670-tasha-snd-card";

    }

    return snd_card_name;

    /* Both tasha & tasha-lite uses tasha ACDB files

       simulate sound card name for tasha lite, so that

       ACDB module loads tasha ACDB files for tasha lite */

    if ((substring = strstr(snd_card_name, "tashalite")) ||

        (substring = strstr(snd_card_name, "tasha9326"))) {

        ALOGD("%s: using tasha ACDB files for tasha-lite", __func__);

        length = substring - snd_card_name + 1;

        snprintf(string, length, "%s", snd_card_name);

        strlcat(string, "tasha-snd-card", sizeof(string));

        acdb_card_name = strdup(string);

        return acdb_card_name;

    }

    acdb_card_name = strdup(snd_card_name);

    return acdb_card_name;

}



static int platform_acdb_init(void *platform)