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

Commit 989d9e56 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 compiler warnings which are now treated as errors"

parents d5f7514a f1cd92b1

hal/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PM_SUPPORT)),true) 
    LOCAL_SHARED_LIBRARIES += libperipheral_client

endif



#LOCAL_CFLAGS += -Wall -Werror

LOCAL_CFLAGS += -Wall -Werror



LOCAL_COPY_HEADERS_TO   := mm-audio

LOCAL_COPY_HEADERS      := audio_extn/audio_defs.h

hal/audio_extn/fm.c

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static int32_t fm_set_volume(struct audio_device *adev, float value, bool persis 


static int32_t fm_stop(struct audio_device *adev)

{

    int32_t i, ret = 0;

    int32_t ret = 0;

    struct audio_usecase *uc_info;



    ALOGD("%s: enter", __func__);
@@ -153,7 +153,7 @@ static int32_t fm_stop(struct audio_device *adev) 


static int32_t fm_start(struct audio_device *adev)

{

    int32_t i, ret = 0;

    int32_t ret = 0;

    struct audio_usecase *uc_info;

    int32_t pcm_dev_rx_id, pcm_dev_tx_id;

hal/audio_extn/hfp.c

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int32_t hfp_set_volume(struct audio_device *adev, float value) 
static int32_t start_hfp(struct audio_device *adev,

                         struct str_parms *parms __unused)

{

    int32_t i, ret = 0;

    int32_t ret = 0;

    struct audio_usecase *uc_info;

    int32_t pcm_dev_rx_id, pcm_dev_tx_id, pcm_dev_asm_rx_id, pcm_dev_asm_tx_id;
@@ -243,7 +243,7 @@ exit: 


static int32_t stop_hfp(struct audio_device *adev)

{

    int32_t i, ret = 0;

    int32_t ret = 0;

    struct audio_usecase *uc_info;



    ALOGD("%s: enter", __func__);

hal/audio_extn/soundtrigger.c

+0 −2
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ exit: 


void audio_extn_sound_trigger_stop_lab(struct stream_in *in)

{

    int status = 0;

    struct sound_trigger_info  *st_ses_info = NULL;

    audio_event_info_t event;
@@ -341,7 +340,6 @@ int audio_extn_sound_trigger_init(struct audio_device *adev) 
{

    int status = 0;

    char sound_trigger_lib[100];

    void *lib_handle;



    ALOGI("%s: Enter", __func__);

hal/audio_extn/source_track.c

+3 −4
Original line number Diff line number Diff line
@@ -255,9 +255,8 @@ done: 


static int parse_soundfocus_sourcetracking_keys(struct str_parms *parms)

{

    char *str;

    char *value = NULL;

    int val, len;

    int len;

    int ret = 0, err;

    char *kv_pairs = str_parms_to_str(parms);
@@ -339,7 +338,7 @@ static int get_soundfocus_sourcetracking_data(const struct audio_device *adev, 
    char sound_focus_mixer_ctl_name[MIXER_PATH_MAX_LENGTH] = "Sound Focus";

    char source_tracking_mixer_ctl_name[MIXER_PATH_MAX_LENGTH] = "Source Tracking";

    int ret = -EINVAL;

    int i, count;

    int count;



    if (bitmask & BITMASK_AUDIO_PARAMETER_KEYS_SOUND_FOCUS) {

        /* Derive the mixer control name based on the use case and the audio interface
@@ -434,7 +433,7 @@ static void send_soundfocus_sourcetracking_params(struct str_parms *reply, 
                                                const struct sound_focus_param sound_focus_data,

                                                const struct source_tracking_param source_tracking_data)

{

    int i = 0, len = 0;

    int i = 0;

    char value[MAX_STR_SIZE] = "";



    if (bitmask & BITMASK_AUDIO_PARAMETER_KEY_SOUND_FOCUS_START_ANGLES) {