commit c075069083619889b0b28147f08e53371551ea91
author Jean-Michel Trivi <jmtrivi@google.com> Mon Oct 12 12:12:32 2015 -0700
committer Jean-Michel Trivi <jmtrivi@google.com> Mon Oct 12 13:43:14 2015 -0700
tree d000f1689e0ac660159a72b11f53a27b7f783cef
parent 7246fb647b8e30c0aaec48961274c3a81e67d6e3

Configure platform msm8960

Configure HAL build for msm8960.
Fix typo in HAL error message on channel count.
Add default value for max number of channels.

Bug 24758771

Change-Id: I6942fbc01012c272abb0fbed312e92958ebceb87

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;
     }