Merge "hal: add incall music uplink2 pcm id" (b0c669fe) · Commits · e / os / android_hardware_qcom_audio

hal/msm8974/platform.h

+11 −6

Original line number	Diff line number	Diff line
		@@ -170,6 +170,17 @@ enum {
		#define HFP_PCM_RX 5

		#define INCALL_MUSIC_UPLINK_PCM_DEVICE 1

		#ifdef PLATFORM_MSM8610
		#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 15
		#elif PLATFORM_MSM8x26
		#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 16
		#elif PLATFORM_MSM8974
		#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 35
		#else
		#define INCALL_MUSIC_UPLINK2_PCM_DEVICE -1
		#endif

		#define SPKR_PROT_CALIB_RX_PCM_DEVICE 5
		#define SPKR_PROT_CALIB_TX_PCM_DEVICE 25
		#define PLAYBACK_OFFLOAD_DEVICE 9
		@@ -222,12 +233,6 @@ enum {
		#define HFP_ASM_RX_TX 24
		#endif

		#ifdef PLATFORM_MSM8610
		#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 15
		#else
		#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 16
		#endif

		#define LIB_CSD_CLIENT "libcsd-client.so"
		/* CSD-CLIENT related functions */
		typedef int (*init_t)();