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

Commit bbc7dde4 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 compilation issues with audio FM extention"

parents 289d92de cbe2b4f2

hal/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE)),true) 
    LOCAL_CFLAGS += -DKPI_OPTIMIZE_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM)),true)

    LOCAL_CFLAGS += -DFM_ENABLED

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM_POWER_OPT)),true)

    LOCAL_CFLAGS += -DFM_POWER_OPT

    LOCAL_SRC_FILES += audio_extn/fm.c

endif

hal/audio_extn/audio_extn.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static struct audio_extn_module aextnmod = { 
#define AUDIO_PARAMETER_OFFLOAD_NUM_ACTIVE "offload_num_active"

#define AUDIO_PARAMETER_HPX            "HPX"



#ifndef FM_ENABLED

#ifndef FM_POWER_OPT

#define audio_extn_fm_set_parameters(adev, parms) (0)

#else

void audio_extn_fm_set_parameters(struct audio_device *adev,

hal/audio_extn/audio_extn.h

+2 −7
Original line number Diff line number Diff line
@@ -59,13 +59,8 @@ 
#define AUDIO_OUTPUT_FLAG_INCALL_MUSIC 0x8000

#endif



#ifndef FM_ENABLED

#define AUDIO_DEVICE_OUT_FM 0x80000

#define AUDIO_DEVICE_OUT_FM_TX 0x100000

#define AUDIO_SOURCE_FM_RX 9

#define AUDIO_SOURCE_FM_RX_A2DP 10

#define AUDIO_DEVICE_IN_FM_RX (AUDIO_DEVICE_BIT_IN | 0x8000)

#define AUDIO_DEVICE_IN_FM_RX_A2DP (AUDIO_DEVICE_BIT_IN | 0x10000)

#ifndef AUDIO_DEVICE_OUT_FM_TX

#define AUDIO_DEVICE_OUT_FM_TX 0x8000000

#endif



#ifndef FLAC_OFFLOAD_ENABLED

hal/audio_extn/fm.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <stdlib.h>

#include <cutils/str_parms.h>



#ifdef FM_ENABLED

#ifdef FM_POWER_OPT

#define AUDIO_PARAMETER_KEY_HANDLE_FM "handle_fm"

#define AUDIO_PARAMETER_KEY_FM_VOLUME "fm_volume"

#define AUDIO_PARAMETER_KEY_REC_PLAY_CONC "rec_play_conc_on"
@@ -304,4 +304,4 @@ void audio_extn_fm_set_parameters(struct audio_device *adev, 
exit:

    ALOGV("%s: exit", __func__);

}

#endif /* FM_ENABLED end */
 
#endif /* FM_POWER_OPT end */