687ce13059
This commit uprevs the Wifi vendor HAL to 1.6
Bug: 214108561
Test: atest VtsHalWifiV1_0TargetTest VtsHalWifiNanV1_0TargetTest VtsHalWifiApV1_0TargetTest \
VtsHalWifiV1_1TargetTest \
VtsHalWifiV1_2TargetTest VtsHalWifiNanV1_2TargetTest \
VtsHalWifiV1_3TargetTest \
VtsHalWifiApV1_4TargetTest VtsHalWifiNanV1_4TargetTest VtsHalWifiRttV1_4TargetTest \
VtsHalWifiV1_5TargetTest VtsHalWifiNanV1_5TargetTest VtsHalWifiApV1_5TargetTest
Change-Id: I059a5de346e353f7fba1e008ecd9fb4611e66880
89 lines
3.4 KiB
C++
89 lines
3.4 KiB
C++
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef WIFI_AP_IFACE_H_
|
|
#define WIFI_AP_IFACE_H_
|
|
|
|
#include <android-base/macros.h>
|
|
#include <android/hardware/wifi/1.5/IWifiApIface.h>
|
|
|
|
#include "wifi_iface_util.h"
|
|
#include "wifi_legacy_hal.h"
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace wifi {
|
|
namespace V1_6 {
|
|
namespace implementation {
|
|
using namespace android::hardware::wifi::V1_0;
|
|
|
|
/**
|
|
* HIDL interface object used to control a AP Iface instance.
|
|
*/
|
|
class WifiApIface : public V1_5::IWifiApIface {
|
|
public:
|
|
WifiApIface(const std::string& ifname, const std::vector<std::string>& instances,
|
|
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal,
|
|
const std::weak_ptr<iface_util::WifiIfaceUtil> iface_util);
|
|
// Refer to |WifiChip::invalidate()|.
|
|
void invalidate();
|
|
bool isValid();
|
|
std::string getName();
|
|
void removeInstance(std::string instance);
|
|
|
|
// HIDL methods exposed.
|
|
Return<void> getName(getName_cb hidl_status_cb) override;
|
|
Return<void> getType(getType_cb hidl_status_cb) override;
|
|
Return<void> setCountryCode(const hidl_array<int8_t, 2>& code,
|
|
setCountryCode_cb hidl_status_cb) override;
|
|
Return<void> getValidFrequenciesForBand(V1_0::WifiBand band,
|
|
getValidFrequenciesForBand_cb hidl_status_cb) override;
|
|
Return<void> setMacAddress(const hidl_array<uint8_t, 6>& mac,
|
|
setMacAddress_cb hidl_status_cb) override;
|
|
Return<void> getFactoryMacAddress(getFactoryMacAddress_cb hidl_status_cb) override;
|
|
Return<void> resetToFactoryMacAddress(resetToFactoryMacAddress_cb hidl_status_cb) override;
|
|
|
|
Return<void> getBridgedInstances(getBridgedInstances_cb hidl_status_cb) override;
|
|
|
|
private:
|
|
// Corresponding worker functions for the HIDL methods.
|
|
std::pair<WifiStatus, std::string> getNameInternal();
|
|
std::pair<WifiStatus, IfaceType> getTypeInternal();
|
|
WifiStatus setCountryCodeInternal(const std::array<int8_t, 2>& code);
|
|
std::pair<WifiStatus, std::vector<WifiChannelInMhz>> getValidFrequenciesForBandInternal(
|
|
V1_0::WifiBand band);
|
|
WifiStatus setMacAddressInternal(const std::array<uint8_t, 6>& mac);
|
|
std::pair<WifiStatus, std::array<uint8_t, 6>> getFactoryMacAddressInternal(
|
|
const std::string& ifaceName);
|
|
WifiStatus resetToFactoryMacAddressInternal();
|
|
std::pair<WifiStatus, std::vector<hidl_string>> getBridgedInstancesInternal();
|
|
|
|
std::string ifname_;
|
|
std::vector<std::string> instances_;
|
|
std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
|
|
std::weak_ptr<iface_util::WifiIfaceUtil> iface_util_;
|
|
bool is_valid_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(WifiApIface);
|
|
};
|
|
|
|
} // namespace implementation
|
|
} // namespace V1_6
|
|
} // namespace wifi
|
|
} // namespace hardware
|
|
} // namespace android
|
|
|
|
#endif // WIFI_AP_IFACE_H_
|