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

Commit 0bb68eeb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Fix calibration address sent to ACDB" into audio-hal.lnx.5.0

parents 39e00dc8 d477f694

hal/msm8916/platform.c

+6 −6
Original line number Diff line number Diff line
@@ -7707,12 +7707,12 @@ int platform_send_audio_cal(void* platform, acdb_audio_cal_cfg_t* cal, 
    if (my_data->acdb_set_audio_cal) {

        // persist audio cal in local cache

        if (persist) {

            ret = my_data->acdb_set_audio_cal((void*)&cal, data, (uint32_t)length);

            ret = my_data->acdb_set_audio_cal((void*)cal, data, (uint32_t)length);

        }

        // send audio cal to dsp

        if (ret == 0) {

            cal->persist = false;

            ret = my_data->acdb_set_audio_cal((void*)&cal, data, (uint32_t)length);

            ret = my_data->acdb_set_audio_cal((void*)cal, data, (uint32_t)length);

            if (persist && (ret != 0)) {

                ALOGV("[%s] audio cal stored with success, ignore set cal failure", __func__);

                ret = 0;
@@ -7737,11 +7737,11 @@ int platform_get_audio_cal(void* platform, acdb_audio_cal_cfg_t* cal, 


    if (my_data->acdb_get_audio_cal) {

        // get cal from dsp

        ret = my_data->acdb_get_audio_cal((void*)&cal, data, (uint32_t*)length);

        ret = my_data->acdb_get_audio_cal((void*)cal, data, (uint32_t*)length);

        // get cached cal if prevoius attempt fails and persist flag is set

        if ((ret != 0) && persist) {

            cal->persist = true;

            ret = my_data->acdb_get_audio_cal((void*)&cal, data, (uint32_t*)length);

            ret = my_data->acdb_get_audio_cal((void*)cal, data, (uint32_t*)length);

        }

    }
@@ -7761,7 +7761,7 @@ int platform_store_audio_cal(void* platform, acdb_audio_cal_cfg_t* cal, 
    }



    if (my_data->acdb_set_audio_cal) {

        ret = my_data->acdb_set_audio_cal((void*)&cal, data, (uint32_t)length);

        ret = my_data->acdb_set_audio_cal((void*)cal, data, (uint32_t)length);

    }



ERROR_RETURN:
@@ -7780,7 +7780,7 @@ int platform_retrieve_audio_cal(void* platform, acdb_audio_cal_cfg_t* cal, 
    }



    if (my_data->acdb_get_audio_cal) {

        ret = my_data->acdb_get_audio_cal((void*)&cal, data, (uint32_t*)length);

        ret = my_data->acdb_get_audio_cal((void*)cal, data, (uint32_t*)length);

    }



ERROR_RETURN:

hal/msm8974/platform.c

+6 −6
Original line number Diff line number Diff line
@@ -7539,12 +7539,12 @@ int platform_send_audio_cal(void* platform, acdb_audio_cal_cfg_t* cal, 
    if (my_data->acdb_set_audio_cal) {

        // persist audio cal in local cache

        if (persist) {

            ret = my_data->acdb_set_audio_cal((void*)&cal, data, (uint32_t)length);

            ret = my_data->acdb_set_audio_cal((void*)cal, data, (uint32_t)length);

        }

        // send audio cal to dsp

        if (ret == 0) {

            cal->persist = false;

            ret = my_data->acdb_set_audio_cal((void*)&cal, data, (uint32_t)length);

            ret = my_data->acdb_set_audio_cal((void*)cal, data, (uint32_t)length);

            if (persist && (ret != 0)) {

                ALOGV("[%s] audio cal stored with success, ignore set cal failure", __func__);

                ret = 0;
@@ -7569,11 +7569,11 @@ int platform_get_audio_cal(void* platform, acdb_audio_cal_cfg_t* cal, 


    if (my_data->acdb_get_audio_cal) {

        // get cal from dsp

        ret = my_data->acdb_get_audio_cal((void*)&cal, data, (uint32_t*)length);

        ret = my_data->acdb_get_audio_cal((void*)cal, data, (uint32_t*)length);

        // get cached cal if prevoius attempt fails and persist flag is set

        if ((ret != 0) && persist) {

            cal->persist = true;

            ret = my_data->acdb_get_audio_cal((void*)&cal, data, (uint32_t*)length);

            ret = my_data->acdb_get_audio_cal((void*)cal, data, (uint32_t*)length);

        }

    }
@@ -7593,7 +7593,7 @@ int platform_store_audio_cal(void* platform, acdb_audio_cal_cfg_t* cal, 
    }



    if (my_data->acdb_set_audio_cal) {

        ret = my_data->acdb_set_audio_cal((void*)&cal, data, (uint32_t)length);

        ret = my_data->acdb_set_audio_cal((void*)cal, data, (uint32_t)length);

    }



ERROR_RETURN:
@@ -7612,7 +7612,7 @@ int platform_retrieve_audio_cal(void* platform, acdb_audio_cal_cfg_t* cal, 
    }



    if (my_data->acdb_get_audio_cal) {

        ret = my_data->acdb_get_audio_cal((void*)&cal, data, (uint32_t*)length);

        ret = my_data->acdb_get_audio_cal((void*)cal, data, (uint32_t*)length);

    }



ERROR_RETURN: