commit cc3f2e8dbe76ea15472471fa374051273c441035
author Glenn Kasten <gkasten@google.com> Tue Oct 13 17:23:10 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 13 17:23:10 2015 +0000
tree 5c85f6a7adce3dc25542126f9b9a63b0c8e5e045
parent c075069083619889b0b28147f08e53371551ea91
parent 971e0728d525986c8302cd3b1fcbea87226ef776

Merge "hal: Add support for perf lock management (continued)" into mnc-dr-dev

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index 48d4349..549d2f9 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -7,6 +7,9 @@
 LOCAL_ARM_MODE := arm
 
 AUDIO_PLATFORM := $(TARGET_BOARD_PLATFORM)
+ifneq ($(filter msm8960,$(TARGET_BOARD_PLATFORM)),)
+  LOCAL_CFLAGS += -DMAX_TARGET_SPECIFIC_CHANNEL_CNT="2"
+endif
 ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),)
   # B-family platform uses msm8974 code base
   AUDIO_PLATFORM = msm8974

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index d44eeb4..9b5a095 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -65,9 +65,13 @@
 #define MIN_CHANNEL_COUNT                1
 #define DEFAULT_CHANNEL_COUNT            2
 
+#ifndef MAX_TARGET_SPECIFIC_CHANNEL_CNT
+#define MAX_CHANNEL_COUNT 1
+#else
 #define MAX_CHANNEL_COUNT atoi(XSTR(MAX_TARGET_SPECIFIC_CHANNEL_CNT))
 #define XSTR(x) STR(x)
 #define STR(x) #x
+#endif
 
 static unsigned int configured_low_latency_capture_period_size =
         LOW_LATENCY_CAPTURE_PERIOD_SIZE;
@@ -1239,7 +1243,7 @@
     }
 
     if ((channel_count < MIN_CHANNEL_COUNT) || (channel_count > MAX_CHANNEL_COUNT)) {
-        ALOGE("%s: unsupported channel count (%d) passed  Min / Max (%d\%d)", __func__,
+        ALOGE("%s: unsupported channel count (%d) passed  Min / Max (%d / %d)", __func__,
                channel_count, MIN_CHANNEL_COUNT, MAX_CHANNEL_COUNT);
         return -EINVAL;
     }