Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi: Move legacy hal types to a new namespace (2/2) am: 6cedc97e95

Browse Source 
am: b883f2f23b

Change-Id: I72293ac9a7f96db2434ddbd303aa4f0d552c73cb
This commit is contained in:
Roshan Pius
2016-11-18 01:19:49 +00:00
committed by android-build-merger
parent 016b58968f b883f2f23b
commit 799b637cfb
14 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wifi/1.0/default/wifi.cpp
View File

@@ -33,7 +33,8 @@ namespace implementation {
using hidl_return_util::validateAndCall;
Wifi::Wifi()
: legacy_hal_(new WifiLegacyHal()), run_state_(RunState::STOPPED) {}
: legacy_hal_(new legacy_hal::WifiLegacyHal()),
run_state_(RunState::STOPPED) {}
bool Wifi::isValid() {
// This object is always valid.

2
wifi/1.0/default/wifi.h
View File

@@ -64,7 +64,7 @@ class Wifi : public IWifi {
// Instance is created in this root level |IWifi| HIDL interface object
// and shared with all the child HIDL interface objects.
std::shared_ptr<WifiLegacyHal> legacy_hal_;
std::shared_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
RunState run_state_;
std::vector<sp<IWifiEventCallback>> event_callbacks_;
sp<WifiChip> chip_;

5
wifi/1.0/default/wifi_ap_iface.cpp
View File

@@ -27,8 +27,9 @@ namespace V1_0 {
namespace implementation {
using hidl_return_util::validateAndCall;
WifiApIface::WifiApIface(const std::string& ifname,
const std::weak_ptr<WifiLegacyHal> legacy_hal)
WifiApIface::WifiApIface(
const std::string& ifname,
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiApIface::invalidate() {

4
wifi/1.0/default/wifi_ap_iface.h
View File

@@ -34,7 +34,7 @@ namespace implementation {
class WifiApIface : public IWifiApIface {
public:
WifiApIface(const std::string& ifname,
const std::weak_ptr<WifiLegacyHal> legacy_hal);
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// Refer to |WifiChip::invalidate()|.
void invalidate();
bool isValid();
@@ -49,7 +49,7 @@ class WifiApIface : public IWifiApIface {
std::pair<WifiStatus, IfaceType> getTypeInternal();
std::string ifname_;
std::weak_ptr<WifiLegacyHal> legacy_hal_;
std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
bool is_valid_;
DISALLOW_COPY_AND_ASSIGN(WifiApIface);

2
wifi/1.0/default/wifi_chip.cpp
View File

@@ -42,7 +42,7 @@ namespace implementation {
using hidl_return_util::validateAndCall;
WifiChip::WifiChip(ChipId chip_id,
const std::weak_ptr<WifiLegacyHal> legacy_hal)
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: chip_id_(chip_id), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiChip::invalidate() {

5
wifi/1.0/default/wifi_chip.h
View File

@@ -42,7 +42,8 @@ namespace implementation {
*/
class WifiChip : public IWifiChip {
public:
WifiChip(ChipId chip_id, const std::weak_ptr<WifiLegacyHal> legacy_hal);
WifiChip(ChipId chip_id,
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// HIDL does not provide a built-in mechanism to let the server invalidate
// a HIDL interface object after creation. If any client process holds onto
// a reference to the object in their context, any method calls on that
@@ -154,7 +155,7 @@ class WifiChip : public IWifiChip {
getDebugHostWakeReasonStatsInternal();
ChipId chip_id_;
std::weak_ptr<WifiLegacyHal> legacy_hal_;
std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
std::vector<sp<IWifiChipEventCallback>> event_callbacks_;
sp<WifiApIface> ap_iface_;
sp<WifiNanIface> nan_iface_;

5
wifi/1.0/default/wifi_nan_iface.cpp
View File

@@ -27,8 +27,9 @@ namespace V1_0 {
namespace implementation {
using hidl_return_util::validateAndCall;
WifiNanIface::WifiNanIface(const std::string& ifname,
const std::weak_ptr<WifiLegacyHal> legacy_hal)
WifiNanIface::WifiNanIface(
const std::string& ifname,
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiNanIface::invalidate() {

4
wifi/1.0/default/wifi_nan_iface.h
View File

@@ -35,7 +35,7 @@ namespace implementation {
class WifiNanIface : public IWifiNanIface {
public:
WifiNanIface(const std::string& ifname,
const std::weak_ptr<WifiLegacyHal> legacy_hal);
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// Refer to |WifiChip::invalidate()|.
void invalidate();
bool isValid();
@@ -135,7 +135,7 @@ class WifiNanIface : public IWifiNanIface {
WifiStatus dataEndInternal(uint32_t cmd_id, const NanDataPathEndRequest& msg);
std::string ifname_;
std::weak_ptr<WifiLegacyHal> legacy_hal_;
std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
std::vector<sp<IWifiNanIfaceEventCallback>> event_callbacks_;
bool is_valid_;

5
wifi/1.0/default/wifi_p2p_iface.cpp
View File

@@ -27,8 +27,9 @@ namespace V1_0 {
namespace implementation {
using hidl_return_util::validateAndCall;
WifiP2pIface::WifiP2pIface(const std::string& ifname,
const std::weak_ptr<WifiLegacyHal> legacy_hal)
WifiP2pIface::WifiP2pIface(
const std::string& ifname,
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiP2pIface::invalidate() {

4
wifi/1.0/default/wifi_p2p_iface.h
View File

@@ -34,7 +34,7 @@ namespace implementation {
class WifiP2pIface : public IWifiP2pIface {
public:
WifiP2pIface(const std::string& ifname,
const std::weak_ptr<WifiLegacyHal> legacy_hal);
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// Refer to |WifiChip::invalidate()|.
void invalidate();
bool isValid();
@@ -49,7 +49,7 @@ class WifiP2pIface : public IWifiP2pIface {
std::pair<WifiStatus, IfaceType> getTypeInternal();
std::string ifname_;
std::weak_ptr<WifiLegacyHal> legacy_hal_;
std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
bool is_valid_;
DISALLOW_COPY_AND_ASSIGN(WifiP2pIface);

2
wifi/1.0/default/wifi_rtt_controller.cpp
View File

@@ -29,7 +29,7 @@ using hidl_return_util::validateAndCall;
WifiRttController::WifiRttController(
const sp<IWifiIface>& bound_iface,
const std::weak_ptr<WifiLegacyHal> legacy_hal)
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: bound_iface_(bound_iface), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiRttController::invalidate() {

4
wifi/1.0/default/wifi_rtt_controller.h
View File

@@ -36,7 +36,7 @@ namespace implementation {
class WifiRttController : public IWifiRttController {
public:
WifiRttController(const sp<IWifiIface>& bound_iface,
const std::weak_ptr<WifiLegacyHal> legacy_hal);
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// Refer to |WifiChip::invalidate()|.
void invalidate();
bool isValid();
@@ -103,7 +103,7 @@ class WifiRttController : public IWifiRttController {
WifiStatus disableResponderInternal(uint32_t cmd_id);
sp<IWifiIface> bound_iface_;
std::weak_ptr<WifiLegacyHal> legacy_hal_;
std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
std::vector<sp<IWifiRttControllerEventCallback>> event_callbacks_;
bool is_valid_;

5
wifi/1.0/default/wifi_sta_iface.cpp
View File

@@ -27,8 +27,9 @@ namespace V1_0 {
namespace implementation {
using hidl_return_util::validateAndCall;
WifiStaIface::WifiStaIface(const std::string& ifname,
const std::weak_ptr<WifiLegacyHal> legacy_hal)
WifiStaIface::WifiStaIface(
const std::string& ifname,
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
: ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}
void WifiStaIface::invalidate() {

4
wifi/1.0/default/wifi_sta_iface.h
View File

@@ -35,7 +35,7 @@ namespace implementation {
class WifiStaIface : public IWifiStaIface {
public:
WifiStaIface(const std::string& ifname,
const std::weak_ptr<WifiLegacyHal> legacy_hal);
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
// Refer to |WifiChip::invalidate()|.
void invalidate();
bool isValid();
@@ -107,7 +107,7 @@ class WifiStaIface : public IWifiStaIface {
getDebugRxPacketFatesInternal();
std::string ifname_;
std::weak_ptr<WifiLegacyHal> legacy_hal_;
std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
std::vector<sp<IWifiStaIfaceEventCallback>> event_callbacks_;
bool is_valid_;