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

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

Merge "hal: use updated acdb_init to pass ds1 license info"

parents 858d316f dd00598d

hal/msm8916/platform.c

+6 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct audio_block_header 


/* Audio calibration related functions */

typedef void (*acdb_deallocate_t)();

typedef int  (*acdb_init_t)(char *, char *);

typedef int  (*acdb_init_t)(char *, char *, int);

typedef void (*acdb_send_audio_cal_t)(int, int, int, int);

typedef void (*acdb_send_voice_cal_t)(int, int);

typedef int (*acdb_reload_vocvoltable_t)(int);
@@ -791,7 +791,7 @@ void *platform_init(struct audio_device *adev) 
    char baseband[PROPERTY_VALUE_MAX];

    char value[PROPERTY_VALUE_MAX];

    struct platform_data *my_data = NULL;

    int retry_num = 0, snd_card_num = 0;

    int retry_num = 0, snd_card_num = 0, key = 0;

    const char *snd_card_name;

    char mixer_xml_path[100],ffspEnable[PROPERTY_VALUE_MAX];

    char *cvd_version = NULL;
@@ -902,6 +902,9 @@ void *platform_init(struct audio_device *adev) 
        acdb_device_table[SND_DEVICE_OUT_SPEAKER_AND_HDMI] = 131;

        acdb_device_table[SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET] = 131;

    }

    property_get("audio.ds1.metainfo.key",value,"0");

    key = atoi(value);



    my_data->voice_feature_set = VOICE_FEATURE_SET_DEFAULT;

    my_data->acdb_handle = dlopen(LIB_ACDB_LOADER, RTLD_NOW);

    if (my_data->acdb_handle == NULL) {
@@ -952,7 +955,7 @@ void *platform_init(struct audio_device *adev) 
        else

            get_cvd_version(cvd_version, adev);



        my_data->acdb_init(snd_card_name, cvd_version);

        my_data->acdb_init(snd_card_name, cvd_version, key);

        if (cvd_version)

            free(cvd_version);

    }

hal/msm8974/platform.c

+5 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ struct audio_block_header 


/* Audio calibration related functions */

typedef void (*acdb_deallocate_t)();

typedef int  (*acdb_init_t)(const char *, char *);

typedef int  (*acdb_init_t)(const char *, char *, int);

typedef void (*acdb_send_audio_cal_t)(int, int, int , int);

typedef void (*acdb_send_voice_cal_t)(int, int);

typedef int (*acdb_reload_vocvoltable_t)(int);
@@ -859,7 +859,7 @@ void *platform_init(struct audio_device *adev) 
    char baseband[PROPERTY_VALUE_MAX];

    char value[PROPERTY_VALUE_MAX];

    struct platform_data *my_data = NULL;

    int retry_num = 0, snd_card_num = 0;

    int retry_num = 0, snd_card_num = 0, key = 0;

    const char *snd_card_name;

    char *cvd_version = NULL;
@@ -972,6 +972,8 @@ void *platform_init(struct audio_device *adev) 
            my_data->fluence_mode = FLUENCE_BROADSIDE;

        }

    }

    property_get("audio.ds1.metainfo.key",value,"0");

    key = atoi(value);



    my_data->voice_feature_set = VOICE_FEATURE_SET_DEFAULT;

    my_data->acdb_handle = dlopen(LIB_ACDB_LOADER, RTLD_NOW);
@@ -1023,7 +1025,7 @@ void *platform_init(struct audio_device *adev) 
        else

            get_cvd_version(cvd_version, adev);



        my_data->acdb_init(snd_card_name, cvd_version);

        my_data->acdb_init(snd_card_name, cvd_version, key);

        if (cvd_version)

            free(cvd_version);

    }