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

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

Merge "hal: Avoid sending MAD calibration"

parents 5ae056df 979b456d

hal/msm8916/platform.c

+0 −3
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ 
char cal_name_info[WCD9XXX_MAX_CAL][MAX_CAL_NAME] = {

        [WCD9XXX_ANC_CAL] = "anc_cal",

        [WCD9XXX_MBHC_CAL] = "mbhc_cal",

        [WCD9XXX_MAD_CAL] = "mad_cal",

};



#define AUDIO_PARAMETER_KEY_REC_PLAY_CONC "rec_play_conc_on"
@@ -1118,8 +1117,6 @@ static int send_codec_cal(acdb_loader_get_calibration_t acdb_loader_get_calibrat 
        struct wcdcal_ioctl_buffer codec_buffer;

        struct param_data calib;



        if (!strcmp(cal_name_info[type], "mad_cal"))

            calib.acdb_id = SOUND_TRIGGER_DEVICE_HANDSET_MONO_LOW_POWER_ACDB_ID;

        calib.get_size = 1;

        ret = acdb_loader_get_calibration(cal_name_info[type], sizeof(struct param_data),

                                                                 &calib);

hal/msm8974/platform.c

+0 −3
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ 
char cal_name_info[WCD9XXX_MAX_CAL][MAX_CAL_NAME] = {

        [WCD9XXX_ANC_CAL] = "anc_cal",

        [WCD9XXX_MBHC_CAL] = "mbhc_cal",

        [WCD9XXX_MAD_CAL] = "mad_cal",

};



enum {
@@ -1046,8 +1045,6 @@ static int send_codec_cal(acdb_loader_get_calibration_t acdb_loader_get_calibrat 
        struct wcdcal_ioctl_buffer codec_buffer;

        struct param_data calib;



        if (!strcmp(cal_name_info[type], "mad_cal"))

            calib.acdb_id = SOUND_TRIGGER_DEVICE_HANDSET_MONO_LOW_POWER_ACDB_ID;

        calib.get_size = 1;

        ret = acdb_loader_get_calibration(cal_name_info[type], sizeof(struct param_data),

                                                                 &calib);