Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1fb1ef3 authored by Jimmy Chen's avatar Jimmy Chen Committed by Android (Google) Code Review
Browse files

Merge changes from topic "60ghz-3-google-hal-60ghz"

* changes:
  Wifi: support 60GHz (Wigig) band
  Wifi: add new chip capability WIGIG
parents 27ac2a9d 5cbf6276
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ cc_library_static {
    ],
    static_libs: [
        "android.hardware.wifi@1.0",
        "android.hardware.wifi@1.3",
        "android.hardware.wifi@1.5",
        "libwifi-system-iface",
    ],
}
@@ -49,6 +51,8 @@ cc_test {
        "android.hardware.wifi@1.1",
        "android.hardware.wifi@1.2",
        "android.hardware.wifi@1.3",
        "android.hardware.wifi@1.4",
        "android.hardware.wifi@1.5",
        "libwifi-system-iface",
    ],
    test_suites: [
+1 −18
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@

#include <android/hardware/wifi/1.0/IWifi.h>
#include <android/hardware/wifi/1.0/IWifiChip.h>
#include <android/hardware/wifi/1.3/IWifiChip.h>
#include <gtest/gtest.h>
#include <hidl/GtestPrinter.h>
#include <hidl/ServiceManagement.h>
@@ -94,23 +93,7 @@ class WifiChipHidlTest : public ::testing::TestWithParam<std::string> {
    uint32_t configureChipForStaIfaceAndGetCapabilities() {
        configureChipForIfaceType(IfaceType::STA, true);

        sp<::android::hardware::wifi::V1_3::IWifiChip> chip_converted =
            ::android::hardware::wifi::V1_3::IWifiChip::castFrom(wifi_chip_);

        std::pair<WifiStatus, uint32_t> status_and_caps;

        if (chip_converted != nullptr) {
            // Call the newer HAL version
            status_and_caps = HIDL_INVOKE(chip_converted, getCapabilities_1_3);
        } else {
            status_and_caps = HIDL_INVOKE(wifi_chip_, getCapabilities);
        }

        if (status_and_caps.first.code != WifiStatusCode::SUCCESS) {
            EXPECT_EQ(WifiStatusCode::ERROR_NOT_SUPPORTED, status_and_caps.first.code);
            return 0;
        }
        return status_and_caps.second;
        return getChipCapabilitiesLatest(wifi_chip_);
    }

    std::string getIfaceName(const sp<IWifiIface>& iface) {
+23 −0
Original line number Diff line number Diff line
@@ -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;
}
+2 −0
Original line number Diff line number Diff line
@@ -51,3 +51,5 @@ bool configureChipToSupportIfaceType(
    android::hardware::wifi::V1_0::ChipModeId* configured_mode_id);
// Used to trigger IWifi.stop() at the end of every test.
void stopWifi(const std::string& instance_name);
uint32_t getChipCapabilitiesLatest(
    const android::sp<android::hardware::wifi::V1_0::IWifiChip>& wifi_chip);
+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ cc_test {
        "android.hardware.wifi@1.1",
        "android.hardware.wifi@1.2",
        "android.hardware.wifi@1.3",
        "android.hardware.wifi@1.4",
        "android.hardware.wifi@1.5",
        "libwifi-system-iface",
    ],
    test_suites: [
Loading