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

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

Merge "hal: add support for external FM volume control"

parents 593897be 88d6cc51

hal/audio_extn/fm.c

+2 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -64,7 +64,7 @@ static int32_t fm_set_volume(struct audio_device *adev, float value) 
{

    int32_t vol, ret = 0;

    struct mixer_ctl *ctl;

    const char *mixer_ctl_name = "Internal FM RX Volume";

    const char *mixer_ctl_name = FM_RX_VOLUME;



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

    ALOGD("%s: (%f)\n", __func__, value);
@@ -92,7 +92,6 @@ static int32_t fm_set_volume(struct audio_device *adev, float value) 
        return -EINVAL;

    }

    mixer_ctl_set_value(ctl, 0, vol);



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

    return ret;

}

hal/msm8916/platform.h

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ enum { 
#define PLAYBACK_OFFLOAD_DEVICE 9

#define COMPRESS_VOIP_CALL_PCM_DEVICE 3



/* Define macro for Internal FM volume mixer */

#define FM_RX_VOLUME "Internal FM RX Volume"



#define LOWLATENCY_PCM_DEVICE 12

#define EC_REF_RX "I2S_RX"

hal/msm8960/platform.h

+3 −0
Original line number Diff line number Diff line
@@ -118,4 +118,7 @@ enum { 
#define AUDIO_CAPTURE_PERIOD_DURATION_MSEC 20

#define AUDIO_CAPTURE_PERIOD_COUNT 2



/* Define macro for Internal FM volume mixer */

#define FM_RX_VOLUME "Internal FM RX Volume"



#endif // QCOM_AUDIO_PLATFORM_H

hal/msm8974/platform.h

+6 −0
Original line number Diff line number Diff line
@@ -245,6 +245,12 @@ enum { 
#define HFP_ASM_RX_TX 24

#endif



#ifdef PLATFORM_APQ8084

#define FM_RX_VOLUME "Quat MI2S FM RX Volume"

#else

#define FM_RX_VOLUME "Internal FM RX Volume"

#endif



#define LIB_CSD_CLIENT "libcsd-client.so"

/* CSD-CLIENT related functions */

typedef int (*init_t)(bool);