summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-11 02:49:15 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-11 02:49:15 +0000
commita625474383084e0b4c2db911a0f52161d661a6ba (patch)
tree4258d54df3e9895d565938693c97d807e53494ca
parent65454571ad46d0bd9032b4044af4fc937a7448d8 (diff)
parent2ef5d102433c4776aaa0e23c14d7aee00a6beadd (diff)
downloaduwb-a625474383084e0b4c2db911a0f52161d661a6ba.tar.gz
Snap for 10302501 from 2ef5d102433c4776aaa0e23c14d7aee00a6beadd to android13-gs-pixel-5.10-release
Change-Id: I55d83da6ae16cc5cf267002a290ef7a34f927cfb
-rw-r--r--mac/fira_frame.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/mac/fira_frame.c b/mac/fira_frame.c
index ca44ba2..7bbf9d0 100644
--- a/mac/fira_frame.c
+++ b/mac/fira_frame.c
@@ -766,13 +766,6 @@ fira_frame_result_report_fill_ranging_info(struct fira_local *local,
ranging_info->remote_aoa_elevation_pi = get_unaligned_le16(p);
p += sizeof(s16);
}
- if (neg_tof_present) {
- /* When negative ToF is present at end of frame,
- * ToF read ahead MUST be 0, so, is safe to overwrite */
- ranging_info->tof_rctu = -get_unaligned_le32(p);
- p += sizeof(u32);
- }
-
if (aoa_fom_present) {
ranging_info->remote_aoa_fom_present = true;
if (aoa_azimuth_present)
@@ -780,6 +773,13 @@ fira_frame_result_report_fill_ranging_info(struct fira_local *local,
if (aoa_elevation_present)
ranging_info->remote_aoa_elevation_fom = *p++;
}
+ if (neg_tof_present) {
+ /* When negative ToF is present at end of frame,
+ * ToF read ahead MUST be 0, so, is safe to overwrite */
+ ranging_info->tof_rctu = -get_unaligned_le32(p);
+ p += sizeof(u32);
+ }
+
return true;
}