commit 167ade554eb8c267537254c30416f40e5bdf9f6a
author Laxminath Kasam <lkasam@codeaurora.org> Mon May 23 17:46:51 2016 +0530
committer Laxminath Kasam <lkasam@codeaurora.org> Wed Jun 29 19:21:39 2016 +0530
tree d62610350315f27d728ea7454e731d21002b378c
parent 415c0f40d9b745cb250f6125b04bfae9fe859cec

hal: audio: port missing changes from master

TZ names section is removed in platform, still
some changes are present. Remove the TZ names
related changes from respective platform files.

CRs-Fixed: 1022234
Change-Id: I18ec458bc815e3f6faab95342251ab0dace5be20

hal/platform_info.c

diff --git a/hal/platform_info.c b/hal/platform_info.c
index 973d4c4..4ccb89c 100644
--- a/hal/platform_info.c
+++ b/hal/platform_info.c
@@ -49,7 +49,6 @@
     BACKEND_NAME,
     INTERFACE_NAME,
     CONFIG_PARAMS,
-    TZ_NAME,
 } section_t;
 
 typedef void (* section_process_fn)(const XML_Char **attr);
@@ -60,7 +59,6 @@
 static void process_backend_name(const XML_Char **attr);
 static void process_interface_name(const XML_Char **attr);
 static void process_config_params(const XML_Char **attr);
-static void process_tz_name(const XML_Char **attr);
 static void process_root(const XML_Char **attr);
 
 static section_process_fn section_table[] = {
@@ -71,7 +69,6 @@
     [BACKEND_NAME] = process_backend_name,
     [INTERFACE_NAME] = process_interface_name,
     [CONFIG_PARAMS] = process_config_params,
-    [TZ_NAME] = process_tz_name,
 };
 
 static section_t section;
@@ -110,12 +107,6 @@
  *      ...
  *      ...
  * </config_params>
- *
- * <tz_names>
- * <device name="???" spkr_1_tz_name="???" spkr_2_tz_name="???"/>
- * ...
- * ...
- * </tz_names>
  * </audio_platform_info>
  */
 
@@ -313,42 +304,6 @@
 done:
     return;
 }
-static void process_tz_name(const XML_Char **attr)
-{
-    int index;
-
-    if (strcmp(attr[0], "name") != 0) {
-        ALOGE("%s: 'name' not found, no Audio Interface set!", __func__);
-        goto done;
-    }
-
-    index = platform_get_snd_device_index((char *)attr[1]);
-    if (index < 0) {
-        ALOGE("%s: Device %s not found, no snd device set!",
-              __func__, attr[1]);
-        goto done;
-    }
-
-    if (strcmp(attr[2], "spkr_1_tz_name") != 0) {
-        ALOGE("%s: Device %s has no spkr_1_tz_name set!",
-              __func__, attr[1]);
-    }
-
-    if (strcmp(attr[4], "spkr_2_tz_name") != 0) {
-        ALOGE("%s: Device %s has no spkr_2_tz_name set!",
-              __func__, attr[1]);
-    }
-
-    /*  ret = platform_set_spkr_device_tz_names(index, (char *)attr[3], (char *)attr[5]);
-    if (ret < 0) {
-        ALOGE("%s: Audio Interface not set!", __func__);
-        goto done;
-    }
-    */
-
-done:
-    return;
-}
 
 static void process_config_params(const XML_Char **attr)
 {
@@ -382,12 +337,10 @@
         section = CONFIG_PARAMS;
     } else if (strcmp(tag_name, "interface_names") == 0) {
         section = INTERFACE_NAME;
-    } else if (strcmp(tag_name, "tz_names") == 0) {
-        section = TZ_NAME;
     } else if (strcmp(tag_name, "device") == 0) {
         if ((section != ACDB) && (section != BACKEND_NAME) && (section != BITWIDTH) &&
-            (section != INTERFACE_NAME) && (section != TZ_NAME)) {
-            ALOGE("device tag only supported for acdb/backend names/bitwitdh/interface/tz names");
+            (section != INTERFACE_NAME)) {
+            ALOGE("device tag only supported for acdb/backend names/bitwitdh/interface names");
             return;
         }