wifi: Add the various iface object implementation (3e2d671a) · Commits · e / os / android_hardware_interfaces

wifi/1.0/default/Android.mk

+6 −2

Original line number	Diff line number	Diff line
		@@ -19,9 +19,13 @@ LOCAL_MODULE_RELATIVE_PATH := hw
		LOCAL_CPPFLAGS := -std=c++11 -Wall -Wno-unused-parameter -Werror -Wextra
		LOCAL_SRC_FILES := \
		failure_reason_util.cpp \
		wifi_chip.cpp \
		wifi.cpp \
		wifi_legacy_hal.cpp
		wifi_ap_iface.cpp \
		wifi_chip.cpp \
		wifi_legacy_hal.cpp \
		wifi_nan_iface.cpp \
		wifi_p2p_iface.cpp \
		wifi_sta_iface.cpp
		LOCAL_SHARED_LIBRARIES := \
		android.hardware.wifi@1.0 \
		libbase \

wifi/1.0/default/wifi_ap_iface.cpp

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		#include "wifi_ap_iface.h"

		#include <android-base/logging.h>

		#include "failure_reason_util.h"

		namespace android {
		namespace hardware {
		namespace wifi {
		namespace V1_0 {
		namespace implementation {

		WifiApIface::WifiApIface(const std::string& ifname,
		const std::weak_ptr<WifiLegacyHal> legacy_hal)
		: ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}

		void WifiApIface::invalidate() {
		legacy_hal_.reset();
		is_valid_ = false;
		}

		Return<void> WifiApIface::getName(getName_cb cb) {
		hidl_string hidl_ifname;
		hidl_ifname.setToExternal(ifname_.c_str(), ifname_.size());
		cb(hidl_ifname);
		return Void();
		}

		Return<IfaceType> WifiApIface::getType() {
		return IfaceType::AP;
		}

		} // namespace implementation
		} // namespace V1_0
		} // namespace wifi
		} // namespace hardware
		} // namespace android

wifi/1.0/default/wifi_ap_iface.h

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		/*
		* 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.0/IWifiApIface.h>

		#include "wifi_legacy_hal.h"

		namespace android {
		namespace hardware {
		namespace wifi {
		namespace V1_0 {
		namespace implementation {

		/**
		* HIDL interface object used to control a AP Iface instance.
		*/
		class WifiApIface : public IWifiApIface {
		public:
		WifiApIface(const std::string& ifname,
		const std::weak_ptr<WifiLegacyHal> legacy_hal);
		// Refer to \|WifiChip::invalidate()\|.
		void invalidate();

		// HIDL methods exposed.
		Return<void> getName(getName_cb cb) override;
		Return<IfaceType> getType() override;

		private:
		std::string ifname_;
		std::weak_ptr<WifiLegacyHal> legacy_hal_;
		bool is_valid_;

		DISALLOW_COPY_AND_ASSIGN(WifiApIface);
		};

		} // namespace implementation
		} // namespace V1_0
		} // namespace wifi
		} // namespace hardware
		} // namespace android

		#endif // WIFI_AP_IFACE_H_

wifi/1.0/default/wifi_chip.h

+13 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,19 @@ namespace implementation {
		class WifiChip : public IWifiChip {
		public:
		WifiChip(ChipId chip_id, const std::weak_ptr<WifiLegacyHal> legacy_hal);
		// Invalidate this instance once the HAL is stopped.
		// 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
		// reference will continue to be directed to the server.
		//
		// However Wifi HAL needs to control the lifetime of these objects. So, add
		// a public \|invalidate\| method to \|WifiChip\| and it's child objects. This
		// will be used to mark an object invalid when either:
		// a) Wifi HAL is stopped, or
		// b) Wifi Chip is reconfigured.
		//
		// All HIDL method implementations should check if the object is still marked
		// valid before processing them.
		void invalidate();

		// HIDL methods exposed.

wifi/1.0/default/wifi_nan_iface.cpp

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		#include "wifi_nan_iface.h"

		#include <android-base/logging.h>

		#include "failure_reason_util.h"

		namespace android {
		namespace hardware {
		namespace wifi {
		namespace V1_0 {
		namespace implementation {

		WifiNanIface::WifiNanIface(const std::string& ifname,
		const std::weak_ptr<WifiLegacyHal> legacy_hal)
		: ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}

		void WifiNanIface::invalidate() {
		legacy_hal_.reset();
		is_valid_ = false;
		}

		Return<void> WifiNanIface::getName(getName_cb cb) {
		hidl_string hidl_ifname;
		hidl_ifname.setToExternal(ifname_.c_str(), ifname_.size());
		cb(hidl_ifname);
		return Void();
		}

		Return<IfaceType> WifiNanIface::getType() {
		return IfaceType::NAN;
		}

		} // namespace implementation
		} // namespace V1_0
		} // namespace wifi
		} // namespace hardware
		} // namespace android