commit 026a54ff1aa8a2cce976c7585b56608d0c78e81b
author zaclimon <isaacpateau05@gmail.com> Thu Aug 25 09:26:01 2016 -0400
committer Vaughn N <rwaterspf1@floydco.net> Tue Nov 22 08:06:05 2016 -0500
tree b49f56323530ba7898f56134af9c634495df8fc5
parent c1f7c546fe9f3a7369428b826f02914b610a9c5e

Fix conflicts so msm8960 can compile

hal/msm8960/platform.c

diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c
index d7fc84c..939aff3 100644
--- a/hal/msm8960/platform.c
+++ b/hal/msm8960/platform.c
@@ -1096,8 +1096,8 @@
     return 0;
 }
 
-bool platform_check_and_set_capture_backend_cfg(struct audio_device* adev __unused,
-                                              struct audio_usecase *usecase __unused)
+bool platform_check_and_set_capture_backend_cfg(struct audio_device* adev,
+                   struct audio_usecase *usecase, snd_device_t snd_device)
 {
     return false;
 }

hal/msm8960/platform.h

diff --git a/hal/msm8960/platform.h b/hal/msm8960/platform.h
index b879c0b..253175a 100644
--- a/hal/msm8960/platform.h
+++ b/hal/msm8960/platform.h
@@ -110,6 +110,8 @@
 #define LOW_LATENCY_OUTPUT_PERIOD_SIZE 240
 #define LOW_LATENCY_OUTPUT_PERIOD_COUNT 2
 
+#define DEVICE_NAME_MAX_SIZE 128
+
 #define HDMI_MULTI_PERIOD_SIZE  336
 #define HDMI_MULTI_PERIOD_COUNT 8
 #define HDMI_MULTI_DEFAULT_CHANNEL_COUNT 6
@@ -126,4 +128,6 @@
 #define AFE_PROXY_RECORD_PCM_DEVICE 8
 
 
+#define PLATFORM_INFO_XML_PATH          "/system/etc/audio_platform_info.xml"
+#define PLATFORM_INFO_XML_BASE_STRING   "/system/etc/audio_platform_info"
 #endif // QCOM_AUDIO_PLATFORM_H