diff options
| author | Jimmy Chen <jimmycmchen@google.com> | 2019-12-23 17:53:40 +0200 |
|---|---|---|
| committer | Jimmy Chen <jimmycmchen@google.com> | 2020-09-02 10:56:56 +0800 |
| commit | 1bdf1a79f4715ff52fd8c670d31d704df09f40d2 (patch) | |
| tree | ed230021056ec02cf9f76bf891b7eafd800cfa12 /wifi/1.5/default/hidl_struct_util.cpp | |
| parent | 5f9687319b88ce6b84bc4ca47c1a26c6ff540570 (diff) | |
Wifi: add new chip capability WIGIG
Add a new chip capability WIGIG, for chips that
can operate on the 60GHz band. This capability is
mapped to the vendor HAL feature WIFI_FEATURE_INFRA_60G.
Bug: 147522435
Test: atest VtsHalWifiV1_0TargetTest VtsHalWifiNanV1_0TargetTest VtsHalWifiApV1_0TargetTest \
VtsHalWifiV1_1TargetTest \
VtsHalWifiV1_2TargetTest VtsHalWifiNanV1_2TargetTest \
VtsHalWifiV1_3TargetTest \
VtsHalWifiApV1_4TargetTest VtsHalWifiNanV1_4TargetTest VtsHalWifiRttV1_4TargetTest
Change-Id: I37b1121c62acadb621dca5e38671c78817f592e1
Diffstat (limited to 'wifi/1.5/default/hidl_struct_util.cpp')
| -rw-r--r-- | wifi/1.5/default/hidl_struct_util.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/wifi/1.5/default/hidl_struct_util.cpp b/wifi/1.5/default/hidl_struct_util.cpp index a155ff877a..91a82a7661 100644 --- a/wifi/1.5/default/hidl_struct_util.cpp +++ b/wifi/1.5/default/hidl_struct_util.cpp @@ -69,9 +69,9 @@ convertLegacyLoggerFeatureToHidlStaIfaceCapability(uint32_t feature) { return {}; } -V1_3::IWifiChip::ChipCapabilityMask convertLegacyFeatureToHidlChipCapability( - uint32_t feature) { - using HidlChipCaps = V1_3::IWifiChip::ChipCapabilityMask; +V1_5::IWifiChip::ChipCapabilityMask convertLegacyFeatureToHidlChipCapability( + uint64_t feature) { + using HidlChipCaps = V1_5::IWifiChip::ChipCapabilityMask; switch (feature) { case WIFI_FEATURE_SET_TX_POWER_LIMIT: return HidlChipCaps::SET_TX_POWER_LIMIT; @@ -81,6 +81,8 @@ V1_3::IWifiChip::ChipCapabilityMask convertLegacyFeatureToHidlChipCapability( return HidlChipCaps::D2D_RTT; case WIFI_FEATURE_D2AP_RTT: return HidlChipCaps::D2AP_RTT; + case WIFI_FEATURE_INFRA_60G: + return HidlChipCaps::WIGIG; case WIFI_FEATURE_SET_LATENCY_MODE: return HidlChipCaps::SET_LATENCY_MODE; case WIFI_FEATURE_P2P_RAND_MAC: @@ -126,7 +128,7 @@ convertLegacyFeatureToHidlStaIfaceCapability(uint64_t feature) { } bool convertLegacyFeaturesToHidlChipCapabilities( - uint32_t legacy_feature_set, uint32_t legacy_logger_feature_set, + uint64_t legacy_feature_set, uint32_t legacy_logger_feature_set, uint32_t* hidl_caps) { if (!hidl_caps) { return false; @@ -143,10 +145,11 @@ bool convertLegacyFeaturesToHidlChipCapabilities( convertLegacyLoggerFeatureToHidlChipCapability(feature); } } - std::vector<uint32_t> features = {WIFI_FEATURE_SET_TX_POWER_LIMIT, + std::vector<uint64_t> features = {WIFI_FEATURE_SET_TX_POWER_LIMIT, WIFI_FEATURE_USE_BODY_HEAD_SAR, WIFI_FEATURE_D2D_RTT, WIFI_FEATURE_D2AP_RTT, + WIFI_FEATURE_INFRA_60G, WIFI_FEATURE_SET_LATENCY_MODE, WIFI_FEATURE_P2P_RAND_MAC}; for (const auto feature : features) { |