commit 569498ab9a102b72a83ef19245ed62e11828ab7f
author Manoj Kumar N D <quic_mnd@quicinc.com> Wed Oct 19 14:38:19 2022 +0530
committer Manoj Kumar N D <quic_mnd@quicinc.com> Fri Oct 21 15:35:57 2022 +0530
tree bbdad70bb50f9bfcc085f8a3be2bf17b3a54f976
parent a2267aa830d06123de4be768d1ff2780e52aa1da

hal : differentiate automotive code change

Differentiated code changes that are specific to automotive.

Change-Id: I83d720c482a3a28d00ec4c04b0c8aa6752af7fd0
Signed-off-by: Manoj Kumar N D <quic_mnd@quicinc.com>

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 674601c..0736daf 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -5764,6 +5764,7 @@
         path = acdb_dev_type-1;
         fe_id = platform_get_fe_id(usecase->id, path);
 
+#ifdef PLATFORM_AUTO
         if (my_data->acdb_send_audio_cal_v6 && (fe_id != -1) ) {
             my_data->acdb_send_audio_cal_v6(acdb_dev_id, acdb_dev_type,
                                             app_type, sample_rate, fe_id,
@@ -5779,6 +5780,19 @@
             my_data->acdb_send_audio_cal(acdb_dev_id, acdb_dev_type, app_type,
                                          sample_rate);
         }
+#else
+        if (my_data->acdb_send_audio_cal_v4) {
+            my_data->acdb_send_audio_cal_v4(acdb_dev_id, acdb_dev_type,
+                                            app_type, sample_rate, i,
+                                            backend_cfg.sample_rate);
+        } else if (my_data->acdb_send_audio_cal_v3) {
+            my_data->acdb_send_audio_cal_v3(acdb_dev_id, acdb_dev_type,
+                                            app_type, sample_rate, i);
+        } else if (my_data->acdb_send_audio_cal) {
+            my_data->acdb_send_audio_cal(acdb_dev_id, acdb_dev_type, app_type,
+                                         sample_rate);
+        }
+#endif
     }
 
     /* send haptics audio calibration */

hal/platform_info.c

diff --git a/hal/platform_info.c b/hal/platform_info.c
index d9aabbf..0dd7c8c 100644
--- a/hal/platform_info.c
+++ b/hal/platform_info.c
@@ -391,6 +391,7 @@
 
     int pcm_id = atoi((char *)attr[5]);
 
+#ifdef PLATFORM_AUTO
     if (strcmp(attr[6], "fe") != 0) {
         ALOGE("%s: fe id not mentioned", __func__);
         goto done;
@@ -403,6 +404,15 @@
               __func__, attr[1], type, pcm_id, fe_id);
         goto done;
     }
+#else
+    int fe_id = -1;
+
+    if (platform_set_usecase_pcm_id(index, type, pcm_id, fe_id) < 0) {
+        ALOGE("%s: usecase %s type %d pcm_id %d fe_id %d was not set!",
+              __func__, attr[1], type, pcm_id, fe_id);
+        goto done;
+    }
+#endif
 
 done:
     return;