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

Commit b5b2cb43 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 unused param warnings"

parents 0da9cf84 bdf1416c

hal/audio_extn/audio_extn.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ void audio_extn_set_fluence_parameters(struct audio_device *adev, 
    }

}



int audio_extn_get_fluence_parameters(struct audio_device *adev,

int audio_extn_get_fluence_parameters(const struct audio_device *adev,

                       struct str_parms *query, struct str_parms *reply)

{

    int ret = 0, err;

hal/audio_extn/audio_extn.h

+6 −8
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ bool audio_extn_should_use_handset_anc(int in_channels); 
#else

void audio_extn_set_fluence_parameters(struct audio_device *adev,

                                           struct str_parms *parms);

int audio_extn_get_fluence_parameters(struct audio_device *adev,

int audio_extn_get_fluence_parameters(const struct audio_device *adev,

                  struct str_parms *query, struct str_parms *reply);

#endif
@@ -125,14 +125,13 @@ bool audio_extn_usb_is_proxy_inuse(); 
#endif



#ifndef SSR_ENABLED

#define audio_extn_ssr_init(adev, in)                 (0)

#define audio_extn_ssr_init(in)                       (0)

#define audio_extn_ssr_deinit()                       (0)

#define audio_extn_ssr_update_enabled()               (0)

#define audio_extn_ssr_get_enabled()                  (0)

#define audio_extn_ssr_read(stream, buffer, bytes)    (0)

#else

int32_t audio_extn_ssr_init(struct audio_device *adev,

                            struct stream_in *in);

int32_t audio_extn_ssr_init(struct stream_in *in);

int32_t audio_extn_ssr_deinit();

void audio_extn_ssr_update_enabled();

bool audio_extn_ssr_get_enabled();
@@ -234,7 +233,7 @@ void audio_extn_spkr_prot_calib_cancel(void *adev); 
#endif



#ifndef COMPRESS_CAPTURE_ENABLED

#define audio_extn_compr_cap_init(adev,in)                (0)

#define audio_extn_compr_cap_init(in)                     (0)

#define audio_extn_compr_cap_enabled()                    (0)

#define audio_extn_compr_cap_format_supported(format)     (0)

#define audio_extn_compr_cap_usecase_supported(usecase)   (0)
@@ -242,8 +241,7 @@ void audio_extn_spkr_prot_calib_cancel(void *adev); 
#define audio_extn_compr_cap_read(in, buffer, bytes)      (0)

#define audio_extn_compr_cap_deinit()                     (0)

#else

void audio_extn_compr_cap_init(struct audio_device *adev,

                                    struct stream_in *in);

void audio_extn_compr_cap_init(struct stream_in *in);

bool audio_extn_compr_cap_enabled();

bool audio_extn_compr_cap_format_supported(audio_format_t format);

bool audio_extn_compr_cap_usecase_supported(audio_usecase_t usecase);
@@ -284,7 +282,7 @@ void audio_extn_dolby_send_ddp_endp_params(struct audio_device *adev); 


#ifndef HFP_ENABLED

#define audio_extn_hfp_is_active(adev)                  (0)

#define audio_extn_hfp_get_usecase()                    (0)

#define audio_extn_hfp_get_usecase()                    (-1)

#else

bool audio_extn_hfp_is_active(struct audio_device *adev);

audio_usecase_t audio_extn_hfp_get_usecase();

hal/audio_extn/compress_capture.c

+2 −3
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ static struct compress_in_module c_in_mod = { 
};





void audio_extn_compr_cap_init(struct audio_device *adev,

                            struct stream_in *in)

void audio_extn_compr_cap_init(struct stream_in *in)

{

    in->usecase = USECASE_AUDIO_RECORD_COMPRESS;

    in->config.channels = COMPRESS_IN_CONFIG_CHANNELS;
@@ -137,7 +136,7 @@ size_t audio_extn_compr_cap_read(struct stream_in * in, 
                    header->frame_size =

                        bytes - sizeof(*header) - header->reserved[0];

                }

                ALOGV("c_in_buf: %p, data offset: %p, header size: %u,"

                ALOGV("c_in_buf: %p, data offset: %p, header size: %zu,"

                    "reserved[0]: %u frame_size: %d", c_in_mod.in_buf,

                        c_in_mod.in_buf + c_in_header,

                        sizeof(*header), header->reserved[0],

hal/audio_extn/dolby.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int update_ddp_endp_table(int device, int dev_ch_cap, int param_id, 


void send_ddp_endp_params_stream(struct stream_out *out,

                                 int device, int dev_ch_cap,

                                 bool set_cache)

                                 bool set_cache __unused)

{

    int idx, i;

    int ddp_endp_params_data[2*DDP_ENDP_NUM_PARAMS + 1];

hal/audio_extn/hfp.c

+6 −8
Original line number Diff line number Diff line
@@ -127,7 +127,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)

                         struct str_parms *parms __unused)

{

    int32_t i, ret = 0;

    struct audio_usecase *uc_info;
@@ -324,12 +324,10 @@ void audio_extn_hfp_set_parameters(struct audio_device *adev, struct str_parms * 
           if (rate == 8000){

               hfpmod.ucid = USECASE_AUDIO_HFP_SCO;

               pcm_config_hfp.rate = rate;

           }

           else if (rate == 16000){

           } else if (rate == 16000){

               hfpmod.ucid = USECASE_AUDIO_HFP_SCO_WB;

               pcm_config_hfp.rate = rate;

           }

           else

           } else

               ALOGE("Unsupported rate..");

    }