commit 54f1849762f242f8b2708018bb870f925588d8ee
author Linux Build Service Account <lnxbuild@localhost> Mon Aug 03 02:26:33 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Aug 03 02:26:33 2020 -0700
tree 0803d6c993fa03d0bee39987db5aea2b93a37bc9
parent dda3ebc198f03c9b0c428c3475e74a77382bb1ac
parent 460107eefdc87613f628b4f8af1a4311ff849bfd

Merge "audio-hal: fix for compilation issues" into audio-hal.lnx.8.0

hal/audio_extn/spkr_protection.c

diff --git a/hal/audio_extn/spkr_protection.c b/hal/audio_extn/spkr_protection.c
index 8af4d80..e1be59f 100644
--- a/hal/audio_extn/spkr_protection.c
+++ b/hal/audio_extn/spkr_protection.c
@@ -881,7 +881,9 @@
                 t0_spk_2 = SAFE_SPKR_TEMP_Q6;
             }
         }
+#ifdef MSM_SPKR_PROT_SPV3
         protCfg.sp_version = handle.sp_version;
+#endif
         protCfg.t0[SP_V2_SPKR_1] = t0_spk_1;
         protCfg.t0[SP_V2_SPKR_2] = t0_spk_2;
         if (set_spkr_prot_cal(acdb_fd, &protCfg)) {
@@ -1069,7 +1071,9 @@
             pcm_close(handle.pcm_tx);
         handle.pcm_tx = NULL;
         if (!v_validation) {
+#ifdef MSM_SPKR_PROT_SPV3
             protCfg.sp_version = handle.sp_version;
+#endif
             if (!status.status) {
                 protCfg.mode = MSM_SPKR_PROT_CALIBRATED;
                 protCfg.r0[SP_V2_SPKR_1] = status.r0[SP_V2_SPKR_1];
@@ -1193,7 +1197,9 @@
     if (acdb_fd > 0) {
         /*Set processing mode with t0/r0*/
         protCfg.mode = MSM_SPKR_PROT_NOT_CALIBRATED;
+#ifdef MSM_SPKR_PROT_SPV3
         protCfg.sp_version = handle.sp_version;
+#endif
         if (set_spkr_prot_cal(acdb_fd, &protCfg)) {
             ALOGE("%s: spkr_prot_thread enable prot failed", __func__);
             handle.spkr_prot_mode = MSM_SPKR_PROT_DISABLED;
@@ -1238,7 +1244,9 @@
             if (spkr_calibrated) {
                 ALOGD("%s: Spkr calibrated", __func__);
                 protCfg.mode = MSM_SPKR_PROT_CALIBRATED;
+#ifdef MSM_SPKR_PROT_SPV3
                 protCfg.sp_version = handle.sp_version;
+#endif
                 if (set_spkr_prot_cal(acdb_fd, &protCfg)) {
                     ALOGE("%s: enable prot failed", __func__);
                     handle.spkr_prot_mode = MSM_SPKR_PROT_DISABLED;