diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-10-12 12:12:32 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2015-10-12 13:43:14 -0700 |
| commit | c075069083619889b0b28147f08e53371551ea91 (patch) | |
| tree | d000f1689e0ac660159a72b11f53a27b7f783cef | |
| parent | 7246fb647b8e30c0aaec48961274c3a81e67d6e3 (diff) | |
| download | hardware_qcom_audio-c075069083619889b0b28147f08e53371551ea91.tar.gz hardware_qcom_audio-c075069083619889b0b28147f08e53371551ea91.tar.bz2 hardware_qcom_audio-c075069083619889b0b28147f08e53371551ea91.zip | |
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
| -rw-r--r-- | hal/Android.mk | 3 | ||||
| -rw-r--r-- | hal/audio_hw.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/hal/Android.mk b/hal/Android.mk index 48d4349f..549d2f98 100644 --- a/hal/Android.mk +++ b/hal/Android.mk @@ -7,6 +7,9 @@ include $(CLEAR_VARS) 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 diff --git a/hal/audio_hw.c b/hal/audio_hw.c index d44eeb45..9b5a0950 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 @@ static int check_input_parameters(uint32_t sample_rate, } 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; } |