diff options
| author | Ravi Kumar Alamanda <ralama@codeaurora.org> | 2015-06-13 23:30:32 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2015-06-30 15:29:14 -0700 |
| commit | 0d438e220dfe96bede717c47fa2b842da15e9687 (patch) | |
| tree | 07d8fe5d203778dbb01d536e62ab83e57ad47482 /hal/msm8974/platform.h | |
| parent | 5ef920143dc8f99dfbc844d01c53dbcd42d26562 (diff) | |
| download | hardware_qcom_audio-0d438e220dfe96bede717c47fa2b842da15e9687.tar.gz hardware_qcom_audio-0d438e220dfe96bede717c47fa2b842da15e9687.tar.bz2 hardware_qcom_audio-0d438e220dfe96bede717c47fa2b842da15e9687.zip | |
hal: clean up redudant code
External speaker/handset specific backend tags, acdb ids and
PCM device ids for Nexus 6 are now configured using
audio_platform_info.xml file. Remove the hardcoding in the HAL.
Bug: 22100304
Change-Id: I127a1a30333361fb794e9d5abee518c2dc3b4583
Diffstat (limited to 'hal/msm8974/platform.h')
| -rw-r--r-- | hal/msm8974/platform.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h index e96c098f..ca75b8fd 100644 --- a/hal/msm8974/platform.h +++ b/hal/msm8974/platform.h @@ -129,19 +129,11 @@ enum { #define DEFAULT_MUTE_RAMP_DURATION_MS 20 #define DEFAULT_VOLUME_RAMP_DURATION_MS 20 -#ifdef PLATFORM_MSM8084 -#define ACDB_ID_VOICE_SPEAKER 66 -#define ACDB_ID_VOICE_HANDSET 67 -#define ACDB_ID_VOICE_HANDSET_TMUS 67 -#define ACDB_ID_VOICE_DMIC_EF_TMUS 89 -#define ACDB_ID_HEADSET_MIC_AEC 47 -#else #define ACDB_ID_VOICE_SPEAKER 15 #define ACDB_ID_VOICE_HANDSET 7 #define ACDB_ID_VOICE_HANDSET_TMUS 88 #define ACDB_ID_VOICE_DMIC_EF_TMUS 89 #define ACDB_ID_HEADSET_MIC_AEC 8 -#endif #define MAX_VOL_INDEX 5 #define MIN_VOL_INDEX 0 @@ -189,19 +181,12 @@ enum { #define PLAYBACK_OFFLOAD_DEVICE 9 #define LOWLATENCY_PCM_DEVICE 15 #define VOICE_VSID 0x10C01000 -#ifdef PLATFORM_MSM8084 -#define VOICE_CALL_PCM_DEVICE 20 -#define VOICE2_CALL_PCM_DEVICE 25 -#define VOLTE_CALL_PCM_DEVICE 21 -#define QCHAT_CALL_PCM_DEVICE 33 -#define VOWLAN_CALL_PCM_DEVICE -1 -#else + #define VOICE_CALL_PCM_DEVICE 2 #define VOICE2_CALL_PCM_DEVICE 22 #define VOLTE_CALL_PCM_DEVICE 14 #define QCHAT_CALL_PCM_DEVICE 20 #define VOWLAN_CALL_PCM_DEVICE 36 -#endif #define AFE_PROXY_PLAYBACK_PCM_DEVICE 7 #define AFE_PROXY_RECORD_PCM_DEVICE 8 |