From 6cedc97e95b3b3ee49fe0860ac8cfd8c5de2a2ab Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 28 Oct 2016 10:11:17 -0700 Subject: wifi: Move legacy hal types to a new namespace (2/2) Changes in HIDL interface obejcts to use the new namespace for legacy HAL. Bug: 32242225 Test: Compiles Change-Id: I7d0e9cee8656bd779a24d9eaede415317dceaf9b --- wifi/1.0/default/wifi.cpp | 3 ++- wifi/1.0/default/wifi.h | 2 +- wifi/1.0/default/wifi_ap_iface.cpp | 5 +++-- wifi/1.0/default/wifi_ap_iface.h | 4 ++-- wifi/1.0/default/wifi_chip.cpp | 2 +- wifi/1.0/default/wifi_chip.h | 5 +++-- wifi/1.0/default/wifi_nan_iface.cpp | 5 +++-- wifi/1.0/default/wifi_nan_iface.h | 4 ++-- wifi/1.0/default/wifi_p2p_iface.cpp | 5 +++-- wifi/1.0/default/wifi_p2p_iface.h | 4 ++-- wifi/1.0/default/wifi_rtt_controller.cpp | 2 +- wifi/1.0/default/wifi_rtt_controller.h | 4 ++-- wifi/1.0/default/wifi_sta_iface.cpp | 5 +++-- wifi/1.0/default/wifi_sta_iface.h | 4 ++-- 14 files changed, 30 insertions(+), 24 deletions(-) (limited to 'wifi') diff --git a/wifi/1.0/default/wifi.cpp b/wifi/1.0/default/wifi.cpp index fd2cb9cae..3475c46b8 100644 --- a/wifi/1.0/default/wifi.cpp +++ b/wifi/1.0/default/wifi.cpp @@ -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. diff --git a/wifi/1.0/default/wifi.h b/wifi/1.0/default/wifi.h index c6821164f..7872303a4 100644 --- a/wifi/1.0/default/wifi.h +++ b/wifi/1.0/default/wifi.h @@ -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 legacy_hal_; + std::shared_ptr legacy_hal_; RunState run_state_; std::vector> event_callbacks_; sp chip_; diff --git a/wifi/1.0/default/wifi_ap_iface.cpp b/wifi/1.0/default/wifi_ap_iface.cpp index 8c389467d..b8b7a3a41 100644 --- a/wifi/1.0/default/wifi_ap_iface.cpp +++ b/wifi/1.0/default/wifi_ap_iface.cpp @@ -27,8 +27,9 @@ namespace V1_0 { namespace implementation { using hidl_return_util::validateAndCall; -WifiApIface::WifiApIface(const std::string& ifname, - const std::weak_ptr legacy_hal) +WifiApIface::WifiApIface( + const std::string& ifname, + const std::weak_ptr legacy_hal) : ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {} void WifiApIface::invalidate() { diff --git a/wifi/1.0/default/wifi_ap_iface.h b/wifi/1.0/default/wifi_ap_iface.h index 458bddad0..ee5dc565d 100644 --- a/wifi/1.0/default/wifi_ap_iface.h +++ b/wifi/1.0/default/wifi_ap_iface.h @@ -34,7 +34,7 @@ namespace implementation { class WifiApIface : public IWifiApIface { public: WifiApIface(const std::string& ifname, - const std::weak_ptr legacy_hal); + const std::weak_ptr legacy_hal); // Refer to |WifiChip::invalidate()|. void invalidate(); bool isValid(); @@ -49,7 +49,7 @@ class WifiApIface : public IWifiApIface { std::pair getTypeInternal(); std::string ifname_; - std::weak_ptr legacy_hal_; + std::weak_ptr legacy_hal_; bool is_valid_; DISALLOW_COPY_AND_ASSIGN(WifiApIface); diff --git a/wifi/1.0/default/wifi_chip.cpp b/wifi/1.0/default/wifi_chip.cpp index 2245288bd..4d1bce555 100644 --- a/wifi/1.0/default/wifi_chip.cpp +++ b/wifi/1.0/default/wifi_chip.cpp @@ -42,7 +42,7 @@ namespace implementation { using hidl_return_util::validateAndCall; WifiChip::WifiChip(ChipId chip_id, - const std::weak_ptr legacy_hal) + const std::weak_ptr legacy_hal) : chip_id_(chip_id), legacy_hal_(legacy_hal), is_valid_(true) {} void WifiChip::invalidate() { diff --git a/wifi/1.0/default/wifi_chip.h b/wifi/1.0/default/wifi_chip.h index 0c8adacd9..c1a717303 100644 --- a/wifi/1.0/default/wifi_chip.h +++ b/wifi/1.0/default/wifi_chip.h @@ -42,7 +42,8 @@ namespace implementation { */ class WifiChip : public IWifiChip { public: - WifiChip(ChipId chip_id, const std::weak_ptr legacy_hal); + WifiChip(ChipId chip_id, + const std::weak_ptr 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 legacy_hal_; + std::weak_ptr legacy_hal_; std::vector> event_callbacks_; sp ap_iface_; sp nan_iface_; diff --git a/wifi/1.0/default/wifi_nan_iface.cpp b/wifi/1.0/default/wifi_nan_iface.cpp index a2190a815..48e75a52e 100644 --- a/wifi/1.0/default/wifi_nan_iface.cpp +++ b/wifi/1.0/default/wifi_nan_iface.cpp @@ -27,8 +27,9 @@ namespace V1_0 { namespace implementation { using hidl_return_util::validateAndCall; -WifiNanIface::WifiNanIface(const std::string& ifname, - const std::weak_ptr legacy_hal) +WifiNanIface::WifiNanIface( + const std::string& ifname, + const std::weak_ptr legacy_hal) : ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {} void WifiNanIface::invalidate() { diff --git a/wifi/1.0/default/wifi_nan_iface.h b/wifi/1.0/default/wifi_nan_iface.h index f3c06406e..4f89b3124 100644 --- a/wifi/1.0/default/wifi_nan_iface.h +++ b/wifi/1.0/default/wifi_nan_iface.h @@ -35,7 +35,7 @@ namespace implementation { class WifiNanIface : public IWifiNanIface { public: WifiNanIface(const std::string& ifname, - const std::weak_ptr legacy_hal); + const std::weak_ptr 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 legacy_hal_; + std::weak_ptr legacy_hal_; std::vector> event_callbacks_; bool is_valid_; diff --git a/wifi/1.0/default/wifi_p2p_iface.cpp b/wifi/1.0/default/wifi_p2p_iface.cpp index 65258ba0e..0d055f131 100644 --- a/wifi/1.0/default/wifi_p2p_iface.cpp +++ b/wifi/1.0/default/wifi_p2p_iface.cpp @@ -27,8 +27,9 @@ namespace V1_0 { namespace implementation { using hidl_return_util::validateAndCall; -WifiP2pIface::WifiP2pIface(const std::string& ifname, - const std::weak_ptr legacy_hal) +WifiP2pIface::WifiP2pIface( + const std::string& ifname, + const std::weak_ptr legacy_hal) : ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {} void WifiP2pIface::invalidate() { diff --git a/wifi/1.0/default/wifi_p2p_iface.h b/wifi/1.0/default/wifi_p2p_iface.h index d4656e122..d2982db8c 100644 --- a/wifi/1.0/default/wifi_p2p_iface.h +++ b/wifi/1.0/default/wifi_p2p_iface.h @@ -34,7 +34,7 @@ namespace implementation { class WifiP2pIface : public IWifiP2pIface { public: WifiP2pIface(const std::string& ifname, - const std::weak_ptr legacy_hal); + const std::weak_ptr legacy_hal); // Refer to |WifiChip::invalidate()|. void invalidate(); bool isValid(); @@ -49,7 +49,7 @@ class WifiP2pIface : public IWifiP2pIface { std::pair getTypeInternal(); std::string ifname_; - std::weak_ptr legacy_hal_; + std::weak_ptr legacy_hal_; bool is_valid_; DISALLOW_COPY_AND_ASSIGN(WifiP2pIface); diff --git a/wifi/1.0/default/wifi_rtt_controller.cpp b/wifi/1.0/default/wifi_rtt_controller.cpp index dbe836b22..6ac06292e 100644 --- a/wifi/1.0/default/wifi_rtt_controller.cpp +++ b/wifi/1.0/default/wifi_rtt_controller.cpp @@ -29,7 +29,7 @@ using hidl_return_util::validateAndCall; WifiRttController::WifiRttController( const sp& bound_iface, - const std::weak_ptr legacy_hal) + const std::weak_ptr legacy_hal) : bound_iface_(bound_iface), legacy_hal_(legacy_hal), is_valid_(true) {} void WifiRttController::invalidate() { diff --git a/wifi/1.0/default/wifi_rtt_controller.h b/wifi/1.0/default/wifi_rtt_controller.h index 5ebd4bcf8..3dd5340fc 100644 --- a/wifi/1.0/default/wifi_rtt_controller.h +++ b/wifi/1.0/default/wifi_rtt_controller.h @@ -36,7 +36,7 @@ namespace implementation { class WifiRttController : public IWifiRttController { public: WifiRttController(const sp& bound_iface, - const std::weak_ptr legacy_hal); + const std::weak_ptr 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 bound_iface_; - std::weak_ptr legacy_hal_; + std::weak_ptr legacy_hal_; std::vector> event_callbacks_; bool is_valid_; diff --git a/wifi/1.0/default/wifi_sta_iface.cpp b/wifi/1.0/default/wifi_sta_iface.cpp index 1f220f3a2..6365032bf 100644 --- a/wifi/1.0/default/wifi_sta_iface.cpp +++ b/wifi/1.0/default/wifi_sta_iface.cpp @@ -27,8 +27,9 @@ namespace V1_0 { namespace implementation { using hidl_return_util::validateAndCall; -WifiStaIface::WifiStaIface(const std::string& ifname, - const std::weak_ptr legacy_hal) +WifiStaIface::WifiStaIface( + const std::string& ifname, + const std::weak_ptr legacy_hal) : ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {} void WifiStaIface::invalidate() { diff --git a/wifi/1.0/default/wifi_sta_iface.h b/wifi/1.0/default/wifi_sta_iface.h index a13feeb9a..09a883c6a 100644 --- a/wifi/1.0/default/wifi_sta_iface.h +++ b/wifi/1.0/default/wifi_sta_iface.h @@ -35,7 +35,7 @@ namespace implementation { class WifiStaIface : public IWifiStaIface { public: WifiStaIface(const std::string& ifname, - const std::weak_ptr legacy_hal); + const std::weak_ptr 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 legacy_hal_; + std::weak_ptr legacy_hal_; std::vector> event_callbacks_; bool is_valid_; -- cgit v1.2.3