commit f1d46c784a412cbf8ce6b82c4e00d4888cdd5c73
author Damir Didjusto <damird@codeaurora.org> Wed Nov 06 17:59:04 2013 -0800
committer Damir Didjusto <damird@codeaurora.org> Thu Nov 07 14:20:36 2013 -0800
tree 64ab0151bced4eac42003fa78ca990271a9d8374
parent debeb7b90ae7709f5d6310dd485796d9133f1534

hal: Add support for AUXPCM BT

Atheros BT chip uses AUXPCM instead of slimbus. Audio HAL has
to use different mixer paths file depending on whether it's
internal or external BT chip

Change-Id: I78ae70462fed42d4260ae37070ba23e81779c866

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 691a833..359e56c 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -32,6 +32,7 @@
 #include "audio_extn.h"
 
 #define MIXER_XML_PATH "/system/etc/mixer_paths.xml"
+#define MIXER_XML_PATH_AUXPCM "/system/etc/mixer_paths_auxpcm.xml"
 #define LIB_ACDB_LOADER "libacdbloader.so"
 #define AUDIO_DATA_BLOCK_MIXER_CTL "HDMI EDID"
 
@@ -324,7 +325,10 @@
         return NULL;
     }
 
-    adev->audio_route = audio_route_init(MIXER_CARD, MIXER_XML_PATH);
+    if (audio_extn_read_xml(adev, MIXER_CARD, MIXER_XML_PATH,
+                            MIXER_XML_PATH_AUXPCM) == -ENOSYS)
+        adev->audio_route = audio_route_init(MIXER_CARD, MIXER_XML_PATH);
+
     if (!adev->audio_route) {
         ALOGE("%s: Failed to init audio route controls, aborting.", __func__);
         return NULL;