summaryrefslogtreecommitdiffstats
path: root/hal/msm8974/platform.h
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-03-11 04:19:41 -0800
committerSteve Kondik <steve@cyngn.com>2016-03-11 04:19:41 -0800
commit3e55a8628681cc32c38d97f11b5e44881d56bc96 (patch)
tree3159a681d590ebab62f88d7adade509b7bc4537f /hal/msm8974/platform.h
parent934773692aedfd455472de69a96fa691e05215ac (diff)
parent582e0a5e965897ea54ecfa5fe206797dab577a45 (diff)
downloadandroid_hardware_qcom_audio-3e55a8628681cc32c38d97f11b5e44881d56bc96.tar.gz
android_hardware_qcom_audio-3e55a8628681cc32c38d97f11b5e44881d56bc96.tar.bz2
android_hardware_qcom_audio-3e55a8628681cc32c38d97f11b5e44881d56bc96.zip
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/hardware/qcom/audio into cm-13.0
Android 6.0.1 release 22
Diffstat (limited to 'hal/msm8974/platform.h')
-rw-r--r--hal/msm8974/platform.h22
1 files changed, 21 insertions, 1 deletions
diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 4b4332e0..dcd763a9 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -77,6 +77,7 @@ enum {
SND_DEVICE_OUT_VOICE_TX,
SND_DEVICE_OUT_SPEAKER_PROTECTED,
SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED,
+ SND_DEVICE_OUT_VOICE_SPEAKER_HFP,
SND_DEVICE_OUT_END,
/*
@@ -118,6 +119,7 @@ enum {
SND_DEVICE_IN_VOICE_DMIC,
SND_DEVICE_IN_VOICE_DMIC_TMUS,
SND_DEVICE_IN_VOICE_SPEAKER_MIC,
+ SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP,
SND_DEVICE_IN_VOICE_SPEAKER_DMIC,
SND_DEVICE_IN_VOICE_HEADSET_MIC,
SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC,
@@ -204,18 +206,36 @@ enum {
#define LOWLATENCY_PCM_DEVICE 15
#define VOICE_VSID 0x10C01000
+#ifdef PLATFORM_MSM8x26
+#define VOICE_CALL_PCM_DEVICE 2
+#define VOICE2_CALL_PCM_DEVICE 14
+#define VOLTE_CALL_PCM_DEVICE 17
+#define QCHAT_CALL_PCM_DEVICE 18
+#define VOWLAN_CALL_PCM_DEVICE 30
+#elif 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
#define HFP_PCM_RX 5
#ifdef PLATFORM_MSM8x26
-#define HFP_SCO_RX 28
+#ifdef EXTERNAL_BT_SUPPORTED
+#define HFP_SCO_RX 10 // AUXPCM Hostless
+#else
+#define HFP_SCO_RX 28 // INT_HFP_BT Hostless
+#endif
#define HFP_ASM_RX_TX 29
#else
#define HFP_SCO_RX 23