From 31b09489156990e9794466298889d11d506dbd82 Mon Sep 17 00:00:00 2001 From: maheshkkv Date: Wed, 13 Dec 2023 09:42:23 -0800 Subject: [PATCH] Add I2R and R2I 11az LTF repetition count Add IEEE 802.11az LTF repetition count for both I2R and R2I in 11az RTT ranging result. Also remove the LTF repetition count from RTT capabilities and config. The reason for removing is that vendor software can pick the optimized value without an input from framework. Bug: 295619650 Test: m Change-Id: I54b3ba9f490a9de83ac63b1dcde1e1cb4e1bd8fc --- .../android/hardware/wifi/RttCapabilities.aidl | 1 - .../current/android/hardware/wifi/RttConfig.aidl | 1 - .../current/android/hardware/wifi/RttResult.aidl | 3 ++- wifi/aidl/android/hardware/wifi/RttCapabilities.aidl | 5 ----- wifi/aidl/android/hardware/wifi/RttConfig.aidl | 5 ----- wifi/aidl/android/hardware/wifi/RttResult.aidl | 10 ++++++++-- wifi/aidl/default/aidl_struct_util.cpp | 12 ++++++------ 7 files changed, 16 insertions(+), 21 deletions(-) diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttCapabilities.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttCapabilities.aidl index 56ef2d204d..83f3f7e30d 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttCapabilities.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttCapabilities.aidl @@ -46,5 +46,4 @@ parcelable RttCapabilities { android.hardware.wifi.RttBw azBwSupport; boolean ntbInitiatorSupported; boolean ntbResponderSupported; - int maxTxLtfRepetitionCount; } diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttConfig.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttConfig.aidl index b7830bd126..16a14eaeb2 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttConfig.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttConfig.aidl @@ -50,5 +50,4 @@ parcelable RttConfig { android.hardware.wifi.RttBw bw; int ntbMinMeasurementTimeMillis; int ntbMaxMeasurementTimeMillis; - int txLtfRepetitionCount; } diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttResult.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttResult.aidl index 30f5f58b52..93a04acb6f 100644 --- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttResult.aidl +++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttResult.aidl @@ -59,7 +59,8 @@ parcelable RttResult { android.hardware.wifi.WifiInformationElement lcr; int channelFreqMHz; android.hardware.wifi.RttBw packetBw; - int txLtfRepetitionCount; + byte i2rTxLtfRepetitionCount; + byte r2iTxLtfRepetitionCount; int ntbMinMeasurementTimeMillis; int ntbMaxMeasurementTimeMillis; } diff --git a/wifi/aidl/android/hardware/wifi/RttCapabilities.aidl b/wifi/aidl/android/hardware/wifi/RttCapabilities.aidl index 0352ec8ea6..c4b7d24b6f 100644 --- a/wifi/aidl/android/hardware/wifi/RttCapabilities.aidl +++ b/wifi/aidl/android/hardware/wifi/RttCapabilities.aidl @@ -78,9 +78,4 @@ parcelable RttCapabilities { * Whether IEEE 802.11az Non-Trigger-based (non-TB) responder mode is supported. */ boolean ntbResponderSupported; - /** - * Maximum HE LTF repetitions the IEEE 802.11az initiator is capable of transmitting in the - * preamble of I2R NDP. - */ - int maxTxLtfRepetitionCount; } diff --git a/wifi/aidl/android/hardware/wifi/RttConfig.aidl b/wifi/aidl/android/hardware/wifi/RttConfig.aidl index e970656229..97b3acfd71 100644 --- a/wifi/aidl/android/hardware/wifi/RttConfig.aidl +++ b/wifi/aidl/android/hardware/wifi/RttConfig.aidl @@ -128,9 +128,4 @@ parcelable RttConfig { * IEEE 802.11az Non-Trigger-based (non-TB) maximum measurement time in milliseconds. */ int ntbMaxMeasurementTimeMillis; - /** - * Multiple transmissions of HE-LTF symbols in an HE Ranging NDP. A value of 1 indicates no - * repetition. - */ - int txLtfRepetitionCount; } diff --git a/wifi/aidl/android/hardware/wifi/RttResult.aidl b/wifi/aidl/android/hardware/wifi/RttResult.aidl index 2cb0afa317..034b0da9f9 100644 --- a/wifi/aidl/android/hardware/wifi/RttResult.aidl +++ b/wifi/aidl/android/hardware/wifi/RttResult.aidl @@ -146,9 +146,15 @@ parcelable RttResult { */ RttBw packetBw; /** - * IEEE 802.11az Transmit LTF repetitions used to get this result. + * Multiple transmissions of HE-LTF symbols in an HE (I2R) Ranging NDP. An HE-LTF repetition + * value of 1 indicates no repetitions. */ - int txLtfRepetitionCount; + byte i2rTxLtfRepetitionCount; + /** + * Multiple transmissions of HE-LTF symbols in an HE (R2I) Ranging NDP. An HE-LTF repetition + * value of 1 indicates no repetitions. + */ + byte r2iTxLtfRepetitionCount; /** * Minimum non-trigger based (non-TB) dynamic measurement time in milliseconds assigned by the * IEEE 802.11az responder. diff --git a/wifi/aidl/default/aidl_struct_util.cpp b/wifi/aidl/default/aidl_struct_util.cpp index b62b3a0774..42f484be70 100644 --- a/wifi/aidl/default/aidl_struct_util.cpp +++ b/wifi/aidl/default/aidl_struct_util.cpp @@ -2741,7 +2741,6 @@ bool convertAidlRttConfigToLegacyV3(const RttConfig& aidl_config, if (!convertAidlRttConfigToLegacy(aidl_config, &(legacy_config->rtt_config))) { return false; } - legacy_config->tx_ltf_repetition_count = aidl_config.txLtfRepetitionCount; legacy_config->ntb_min_measurement_time_millis = aidl_config.ntbMinMeasurementTimeMillis; legacy_config->ntb_max_measurement_time_millis = aidl_config.ntbMaxMeasurementTimeMillis; return true; @@ -2891,7 +2890,6 @@ bool convertLegacyRttCapabilitiesToAidl( aidl_capabilities->azBwSupport = RttBw::BW_UNSPECIFIED; aidl_capabilities->ntbInitiatorSupported = false; aidl_capabilities->ntbResponderSupported = false; - aidl_capabilities->maxTxLtfRepetitionCount = 0; return true; } @@ -2919,7 +2917,6 @@ bool convertLegacyRttCapabilitiesV3ToAidl( convertLegacyRttBwBitmapToAidl(legacy_capabilities_v3.az_bw_support); aidl_capabilities->ntbInitiatorSupported = legacy_capabilities_v3.ntb_initiator_supported; aidl_capabilities->ntbResponderSupported = legacy_capabilities_v3.ntb_responder_supported; - aidl_capabilities->maxTxLtfRepetitionCount = legacy_capabilities_v3.max_tx_ltf_repetition_count; return true; } @@ -2994,7 +2991,8 @@ bool convertLegacyVectorOfRttResultToAidl( } aidl_result.channelFreqMHz = 0; aidl_result.packetBw = RttBw::BW_UNSPECIFIED; - aidl_result.txLtfRepetitionCount = 0; + aidl_result.i2rTxLtfRepetitionCount = 0; + aidl_result.r2iTxLtfRepetitionCount = 0; aidl_result.ntbMinMeasurementTimeMillis = 0; aidl_result.ntbMaxMeasurementTimeMillis = 0; aidl_results->push_back(aidl_result); @@ -3017,7 +3015,8 @@ bool convertLegacyVectorOfRttResultV2ToAidl( aidl_result.channelFreqMHz = legacy_result->frequency != UNSPECIFIED ? legacy_result->frequency : 0; aidl_result.packetBw = convertLegacyRttBwToAidl(legacy_result->packet_bw); - aidl_result.txLtfRepetitionCount = 0; + aidl_result.i2rTxLtfRepetitionCount = 0; + aidl_result.r2iTxLtfRepetitionCount = 0; aidl_result.ntbMinMeasurementTimeMillis = 0; aidl_result.ntbMaxMeasurementTimeMillis = 0; aidl_results->push_back(aidl_result); @@ -3041,7 +3040,8 @@ bool convertLegacyVectorOfRttResultV3ToAidl( ? legacy_result->rtt_result.frequency : 0; aidl_result.packetBw = convertLegacyRttBwToAidl(legacy_result->rtt_result.packet_bw); - aidl_result.txLtfRepetitionCount = legacy_result->tx_ltf_repetition_count; + aidl_result.i2rTxLtfRepetitionCount = legacy_result->i2r_tx_ltf_repetition_count; + aidl_result.r2iTxLtfRepetitionCount = legacy_result->r2i_tx_ltf_repetition_count; aidl_result.ntbMinMeasurementTimeMillis = legacy_result->ntb_min_measurement_time_millis; aidl_result.ntbMaxMeasurementTimeMillis = legacy_result->ntb_max_measurement_time_millis; aidl_results->push_back(aidl_result);