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.0/vts/functional/wifi_hidl_test_utils.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.0/vts/functional/wifi_hidl_test_utils.cpp')
| -rw-r--r-- | wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp index 092822f932..e6e61cf8b7 100644 --- a/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp +++ b/wifi/1.0/vts/functional/wifi_hidl_test_utils.cpp @@ -16,6 +16,8 @@ #include <android/log.h> +#include <android/hardware/wifi/1.3/IWifiChip.h> +#include <android/hardware/wifi/1.5/IWifiChip.h> #include <wifi_system/interface_tool.h> #include "wifi_hidl_call_util.h" @@ -208,3 +210,24 @@ void stopWifi(const std::string& instance_name) { ASSERT_NE(wifi, nullptr); HIDL_INVOKE(wifi, stop); } + +uint32_t getChipCapabilitiesLatest(const sp<IWifiChip>& wifi_chip) { + sp<::android::hardware::wifi::V1_5::IWifiChip> chip_converted15 = + ::android::hardware::wifi::V1_5::IWifiChip::castFrom(wifi_chip); + sp<::android::hardware::wifi::V1_3::IWifiChip> chip_converted13 = + ::android::hardware::wifi::V1_3::IWifiChip::castFrom(wifi_chip); + std::pair<WifiStatus, uint32_t> status_and_caps; + + if (chip_converted15 != nullptr) { + // Call the newer HAL 1.5 version + status_and_caps = HIDL_INVOKE(chip_converted15, getCapabilities_1_5); + } else if (chip_converted13 != nullptr) { + // Call the newer HAL 1.3 version + status_and_caps = HIDL_INVOKE(chip_converted13, getCapabilities_1_3); + } else { + status_and_caps = HIDL_INVOKE(wifi_chip, getCapabilities); + } + + EXPECT_EQ(WifiStatusCode::SUCCESS, status_and_caps.first.code); + return status_and_caps.second; +} |