diff options
| author | Jimmy Chen <jimmycmchen@google.com> | 2020-09-04 15:10:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-04 15:10:36 +0000 |
| commit | b1fb1ef3063e204e9bb569810b19ad47056f7950 (patch) | |
| tree | 077121c53abce35931b29f901303b6a5ef53f0e9 /wifi/1.5/default/hidl_struct_util.cpp | |
| parent | 27ac2a9d4df152c02cf1c11710faf029822212e7 (diff) | |
| parent | 5cbf6276f5ccd0c8a7d3b6f979a3b2f557c5c229 (diff) | |
Merge changes from topic "60ghz-3-google-hal-60ghz"
* changes:
Wifi: support 60GHz (Wigig) band
Wifi: add new chip capability WIGIG
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) { |