tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add I2R and R2I 11az LTF repetition count" into main

Browse source
This commit is contained in:
Mahesh KKV 2023-12-14 17:59:58 +00:00 committed by Android (Google) Code Review
commit 19f723c2f9
7 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttCapabilities.aidl
View file

@ -46,5 +46,4 @@ parcelable RttCapabilities {
android.hardware.wifi.RttBw azBwSupport;
boolean ntbInitiatorSupported;
boolean ntbResponderSupported;
int maxTxLtfRepetitionCount;
}

1
wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttConfig.aidl
View file

@ -50,5 +50,4 @@ parcelable RttConfig {
android.hardware.wifi.RttBw bw;
int ntbMinMeasurementTimeMillis;
int ntbMaxMeasurementTimeMillis;
int txLtfRepetitionCount;
}

3
wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttResult.aidl
View file

@ -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;
}

5
wifi/aidl/android/hardware/wifi/RttCapabilities.aidl
View file

@ -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;
}

5
wifi/aidl/android/hardware/wifi/RttConfig.aidl
View file

@ -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;
}

10
wifi/aidl/android/hardware/wifi/RttResult.aidl
View file

@ -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.

12
wifi/aidl/default/aidl_struct_util.cpp
View file

@ -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);