commit 456b5c07d4e80d95eb3b3c1636c335d23757a7e5
author Eric Laurent <elaurent@google.com> Mon Sep 14 21:47:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 14 21:47:01 2015 +0000
tree 68d81fb1a3baf81c6480a1cecda151b85f4d9e8c
parent 4f1399cd26744fd7e99f003f6927deaf5d182239
parent e04901bfccd127bbf24f0064077c9ff93c2401e1

am e04901bf: Merge "msm7984: fix plaform_set_parameters()." into mnc-dr-dev

* commit 'e04901bfccd127bbf24f0064077c9ff93c2401e1':
  msm7984: fix plaform_set_parameters().

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 81363fb..ff92d0f 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -817,7 +817,7 @@
 #endif
 }
 
-static void set_platform_defaults(struct platform_data * my_data __unused)
+static void set_platform_defaults(struct platform_data * my_data)
 {
     int32_t dev;
     for (dev = 0; dev < SND_DEVICE_MAX; dev++) {
@@ -864,6 +864,8 @@
     hw_interface_table[SND_DEVICE_OUT_VOICE_TX] = strdup("AFE_PCM_RX");
     hw_interface_table[SND_DEVICE_OUT_SPEAKER_PROTECTED] = strdup("SLIMBUS_0_RX");
     hw_interface_table[SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED] = strdup("SLIMBUS_0_RX");
+
+    my_data->max_mic_count = PLATFORM_DEFAULT_MIC_COUNT;
 }
 
 void get_cvd_version(char *cvd_version, struct audio_device *adev)
@@ -2333,15 +2335,12 @@
     }
 
     memset(value, 0, sizeof(value));
-    err = str_parms_get_str(parms, PLATFORM_MAX_MIC_COUNT,
+    err = str_parms_get_str(parms, PLATFORM_CONFIG_KEY_MAX_MIC_COUNT,
                             value, sizeof(value));
     if (err >= 0) {
-        str_parms_del(parms, PLATFORM_MAX_MIC_COUNT);
+        str_parms_del(parms, PLATFORM_CONFIG_KEY_MAX_MIC_COUNT);
         my_data->max_mic_count = atoi(value);
         ALOGV("%s: max_mic_count %s/%d", __func__, value, my_data->max_mic_count);
-    } else {
-        ALOGE("%s: max_mic_count key value pair not found, reset to default", __func__);
-        my_data->max_mic_count = 2;
     }
 
 done:

hal/msm8974/platform.h

diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index b471634..6368af7 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -243,7 +243,8 @@
 #define LIB_MDM_DETECT "libmdmdetect.so"
 
 #define PLATFORM_CONFIG_KEY_SOUNDCARD_NAME "snd_card_name"
-#define PLATFORM_MAX_MIC_COUNT "input_mic_max_count"
+#define PLATFORM_CONFIG_KEY_MAX_MIC_COUNT "input_mic_max_count"
+#define PLATFORM_DEFAULT_MIC_COUNT 2
 
 /* CSD-CLIENT related functions */
 typedef int (*init_t)(bool);