52947fbc7e
This is pretty hardcoded for now. We expose 2 chip modes: 1. STA mode: 1 STA and 1 P2P or NAN iface. 2. AP mode: 1 AP iface. Implement the chip mode configuration related HIDL methods in WifiChip and integrate WifiModeController. These is some change in the order of calls invoked within the implementation to accomodate the firmware reload: a. Since the legacy HAL needs to reinitialized after firmware reload, we can no longer do this in IWifi.start(). So, we'll defer this to IWifiChip.configureChip() now. b. Refactor IWifi.startInternal() and IWifi.stopInternal() to pull out the actual implementation into a separate helper functions and let it invoke the required callbacks. Bug: 31997422 Bug: 32018162 Test: Compiles Change-Id: I461687d7ee92398bc47321e1baca609db65c7991
86 lines
2.6 KiB
C++
86 lines
2.6 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_H_
|
|
#define WIFI_H_
|
|
|
|
#include <functional>
|
|
|
|
#include <android-base/macros.h>
|
|
#include <android/hardware/wifi/1.0/IWifi.h>
|
|
#include <utils/Looper.h>
|
|
|
|
#include "wifi_chip.h"
|
|
#include "wifi_legacy_hal.h"
|
|
#include "wifi_mode_controller.h"
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace wifi {
|
|
namespace V1_0 {
|
|
namespace implementation {
|
|
|
|
/**
|
|
* Root HIDL interface object used to control the Wifi HAL.
|
|
*/
|
|
class Wifi : public IWifi {
|
|
public:
|
|
Wifi();
|
|
|
|
bool isValid();
|
|
|
|
// HIDL methods exposed.
|
|
Return<void> registerEventCallback(
|
|
const sp<IWifiEventCallback>& event_callback,
|
|
registerEventCallback_cb hidl_status_cb) override;
|
|
Return<bool> isStarted() override;
|
|
Return<void> start(start_cb hidl_status_cb) override;
|
|
Return<void> stop(stop_cb hidl_status_cb) override;
|
|
Return<void> getChipIds(getChipIds_cb hidl_status_cb) override;
|
|
Return<void> getChip(ChipId chip_id, getChip_cb hidl_status_cb) override;
|
|
|
|
private:
|
|
enum class RunState { STOPPED, STARTED, STOPPING };
|
|
|
|
// Corresponding worker functions for the HIDL methods.
|
|
WifiStatus registerEventCallbackInternal(
|
|
const sp<IWifiEventCallback>& event_callback);
|
|
WifiStatus startInternal();
|
|
WifiStatus stopInternal();
|
|
std::pair<WifiStatus, std::vector<ChipId>> getChipIdsInternal();
|
|
std::pair<WifiStatus, sp<IWifiChip>> getChipInternal(ChipId chip_id);
|
|
|
|
WifiStatus initializeLegacyHal();
|
|
WifiStatus stopLegacyHalAndDeinitializeModeController();
|
|
|
|
// Instance is created in this root level |IWifi| HIDL interface object
|
|
// and shared with all the child HIDL interface objects.
|
|
std::shared_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
|
|
std::shared_ptr<mode_controller::WifiModeController> mode_controller_;
|
|
RunState run_state_;
|
|
std::vector<sp<IWifiEventCallback>> event_callbacks_;
|
|
sp<WifiChip> chip_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(Wifi);
|
|
};
|
|
|
|
} // namespace implementation
|
|
} // namespace V1_0
|
|
} // namespace wifi
|
|
} // namespace hardware
|
|
} // namespace android
|
|
|
|
#endif // WIFI_H_
|