commit 21e159afa782a11c269e8ca8e5c12826af05ac21
author Ajay Davanageri <ajay.davanageri@broadcom.corp-partner.google.com> Fri Dec 02 13:44:25 2022 +0530
committer Roger Wang <wangroger@google.com> Tue Apr 04 04:47:27 2023 +0000
tree ce3b69bd7685c85cab2f9ec566c8e9cc4740289b
parent 1064a42f7cdd736598bec6379549c0f78cf1f991

Updating the vendor hal with new rtt result struct

Applied patch#13

Bug: 253425912
Test: Tested using the halutil

Change-Id: I4fcf961a66200b9045ed0e2d8764c9cc7037174f
Merged-In: I4fcf961a66200b9045ed0e2d8764c9cc7037174f
Signed-off-by: Ajay Davanageri <ajay.davanageri@broadcom.corp-partner.google.com>
(cherry picked from commit 83c63617aff44b060bd108861a3ccde64d37e39e)

bcmdhd/wifi_hal/rtt.cpp

diff --git a/bcmdhd/wifi_hal/rtt.cpp b/bcmdhd/wifi_hal/rtt.cpp
index 202fb33..819364a 100644
--- a/bcmdhd/wifi_hal/rtt.cpp
+++ b/bcmdhd/wifi_hal/rtt.cpp
@@ -577,7 +577,7 @@
                     } else if (it2.get_type() == RTT_ATTRIBUTE_RESULT_FREQ) {
                         channel = it2.get_u32();
                         if (rttResults[currentIdx] == NULL) {
-                            ALOGE("Not allocated\n");
+                            ALOGE("Not allocated, currentIdx %d\n", currentIdx);
                             break;
                         }
                         if (!channel) {
@@ -590,7 +590,7 @@
                     } else if (it2.get_type() == RTT_ATTRIBUTE_RESULT_BW) {
                         bw = (wifi_rtt_bw)it2.get_u32();
                         if (rttResults[currentIdx] == NULL) {
-                            ALOGE("Not allocated\n");
+                            ALOGE("Not allocated, currentIdx %d\n", currentIdx);
                             break;
                         }
                         rttResults[currentIdx]->packet_bw = bw;
@@ -665,7 +665,7 @@
                         memcpy(&rtt_result_v2->rtt_result,
                             (wifi_rtt_result *)rtt_results_v1, RTT_RESULT_V1_SIZE);
                         if (!channel) {
-                            rtt_result_v2->frequency = WIFI_CHAN_WIDTH_INVALID;
+                            rtt_result_v2->frequency = UNSPECIFIED;
                         }
 
                         /* Copy the optional data to new struct */
@@ -706,7 +706,8 @@
                                 rtt_results_v1->distance_mm / 10,
                                 rtt_results_v1->burst_duration,
                                 rtt_results_v1->negotiated_burst_num);
-                        nextidx = currentIdx++;
+                        nextidx = currentIdx;
+                        nextidx++;
                     }
                 }
             }