hal: Fix warnings in audio HAL and policy
Enable Wall and Werror and fix warnings in
HAL and policy manager
CRs-Fixed: 962049
Change-Id: Ie93c8f933943875ac68e8318d777602ed864f531
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 2f9c2e8..fe502da 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1303,7 +1303,7 @@
backend_table[SND_DEVICE_OUT_VOICE_SPEAKER_VBAT] = strdup("vbat-voice-speaker");
/*remove ALAC & APE from DSP decoder list based on software decoder availability*/
- for (count = 0; count < sizeof(dsp_only_decoders_mime)/sizeof(dsp_only_decoders_mime[0]);
+ for (count = 0; count < (int32_t) (sizeof(dsp_only_decoders_mime)/sizeof(dsp_only_decoders_mime[0]));
count++) {
if (!strncmp(MEDIA_MIMETYPE_AUDIO_ALAC, dsp_only_decoders_mime[count],
@@ -1619,10 +1619,10 @@
/* update wsa combo supported flag based on sound card name */
/* wsa combo flag needs to be set to true only for hardware
combinations which has support for both wsa and non-wsa speaker */
- if (snd_card_name && (!strncmp(snd_card_name, "msm8953-snd-card-mtp",
+ if (snd_card_name && ((!strncmp(snd_card_name, "msm8953-snd-card-mtp",
sizeof("msm8953-snd-card-mtp"))) ||
- !strncmp(snd_card_name, "msm8952-skum-snd-card",
- sizeof("msm8952-skum-snd-card"))) {
+ (!strncmp(snd_card_name, "msm8952-skum-snd-card",
+ sizeof("msm8952-skum-snd-card"))))) {
*is_wsa_combo_supported = true;
} else {
*is_wsa_combo_supported = false;
@@ -1763,7 +1763,7 @@
}
}
- if (check_and_get_wsa_info(snd_card_name, &wsaCount, &is_wsa_combo_supported)) {
+ if (check_and_get_wsa_info((char *)snd_card_name, &wsaCount, &is_wsa_combo_supported)) {
/*Set ACDB ID of Stereo speaker if two WSAs are present*/
/*Default ACDB ID for wsa speaker is that for mono*/
if (wsaCount == 2) {
@@ -2359,7 +2359,7 @@
OUTPUT_SAMPLING_RATE_44100 == usecase->stream.out->sample_rate) {
ALOGD("%s:napb: triggering dynamic device switch for usecase(%d: %s)"
" stream(%p), device(%d)", __func__, usecase->id,
- use_case_table[usecase->id], usecase->stream,
+ use_case_table[usecase->id], (void*) usecase->stream.out,
usecase->stream.out->devices);
select_devices(platform->adev, usecase->id);
}
@@ -3467,7 +3467,7 @@
static void set_audiocal(void *platform, struct str_parms *parms, char *value, int len) {
struct platform_data *my_data = (struct platform_data *)platform;
- struct stream_out out={0};
+ struct stream_out out;
acdb_audio_cal_cfg_t cal={0};
uint8_t *dptr = NULL;
int32_t dlen;
@@ -3708,7 +3708,7 @@
static void get_audiocal(void *platform, void *keys, void *pReply) {
struct platform_data *my_data = (struct platform_data *)platform;
- struct stream_out out={0};
+ struct stream_out out;
struct str_parms *query = (struct str_parms *)keys;
struct str_parms *reply=(struct str_parms *)pReply;
acdb_audio_cal_cfg_t cal={0};
@@ -3857,7 +3857,7 @@
//check if unsupported mime type or not
if(decoder_mime_type) {
- int i = 0;
+ unsigned int i = 0;
for (i = 0; i < sizeof(dsp_only_decoders_mime)/sizeof(dsp_only_decoders_mime[0]); i++) {
if (!strncmp(decoder_mime_type, dsp_only_decoders_mime[i],
strlen(dsp_only_decoders_mime[i]))) {
@@ -4439,7 +4439,7 @@
void platform_get_device_to_be_id_map(int **device_to_be_id, int *length)
{
- *device_to_be_id = msm_device_to_be_id;
+ *device_to_be_id = (int*) msm_device_to_be_id;
*length = msm_be_id_array_len;
}
int platform_set_stream_channel_map(void *platform, audio_channel_mask_t channel_mask, int snd_id)
@@ -5019,7 +5019,7 @@
* corresponding entry in audio_platform_info.xml file.
*/
struct speaker_device_to_tz_names speaker_device_tz_names = {
- {SND_DEVICE_OUT_SPEAKER, "", ""},
+ SND_DEVICE_OUT_SPEAKER, "", ""
};
const char *platform_get_spkr_1_tz_name(snd_device_t snd_device)
@@ -5050,7 +5050,7 @@
goto done;
}
if (index != speaker_device_tz_names.snd_device) {
- ALOGE("%s: not matching speaker device\n");
+ ALOGE("%s: not matching speaker device\n", __func__);
ret = -EINVAL;
goto done;
}
@@ -5071,7 +5071,7 @@
int platform_spkr_prot_is_wsa_analog_mode(void *adev)
{
struct audio_device *adev_h = adev;
- char *snd_card_name;
+ const char *snd_card_name;
/*
* wsa analog mode is decided based on the sound card name