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/wifi_chip.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/wifi_chip.cpp')
| -rw-r--r-- | wifi/1.5/default/wifi_chip.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/wifi/1.5/default/wifi_chip.cpp b/wifi/1.5/default/wifi_chip.cpp index ecf170abc2..ebff722859 100644 --- a/wifi/1.5/default/wifi_chip.cpp +++ b/wifi/1.5/default/wifi_chip.cpp @@ -628,6 +628,13 @@ Return<void> WifiChip::getCapabilities_1_3(getCapabilities_cb hidl_status_cb) { hidl_status_cb); } +Return<void> WifiChip::getCapabilities_1_5( + getCapabilities_1_5_cb hidl_status_cb) { + return validateAndCall(this, WifiStatusCode::ERROR_WIFI_CHIP_INVALID, + &WifiChip::getCapabilitiesInternal_1_5, + hidl_status_cb); +} + Return<void> WifiChip::debug(const hidl_handle& handle, const hidl_vec<hidl_string>&) { if (handle != nullptr && handle->numFds >= 1) { @@ -1237,8 +1244,13 @@ WifiStatus WifiChip::selectTxPowerScenarioInternal_1_2( } std::pair<WifiStatus, uint32_t> WifiChip::getCapabilitiesInternal_1_3() { + // Deprecated support for this callback. + return {createWifiStatus(WifiStatusCode::ERROR_NOT_SUPPORTED), 0}; +} + +std::pair<WifiStatus, uint32_t> WifiChip::getCapabilitiesInternal_1_5() { legacy_hal::wifi_error legacy_status; - uint32_t legacy_feature_set; + uint64_t legacy_feature_set; uint32_t legacy_logger_feature_set; const auto ifname = getFirstActiveWlanIfaceName(); std::tie(legacy_status, legacy_feature_set) = |