wifi: Use hal_tool & if_tool am: 908a69a53a (765f9500) · Commits · e / os / android_hardware_interfaces

wifi/1.0/default/Android.mk

+4 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,8 @@ LOCAL_SHARED_LIBRARIES := \
		libhwbinder \
		liblog \
		libnl \
		libutils
		libutils \
		libwifi-system
		LOCAL_WHOLE_STATIC_LIBRARIES := $(LIB_WIFI_HAL)
		include $(BUILD_SHARED_LIBRARY)

		@@ -49,7 +50,8 @@ LOCAL_SHARED_LIBRARIES := \
		libhwbinder \
		liblog \
		libnl \
		libutils
		libutils \
		libwifi-system
		LOCAL_WHOLE_STATIC_LIBRARIES := $(LIB_WIFI_HAL)
		LOCAL_INIT_RC := android.hardware.wifi@1.0-service.rc
		include $(BUILD_EXECUTABLE)

wifi/1.0/default/wifi_legacy_hal.cpp

+16 −4

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@

		#include <android-base/logging.h>
		#include <cutils/properties.h>
		#include <wifi_system/hal_tool.h>
		#include <wifi_system/interface_tool.h>

		namespace {
		std::string getWlanInterfaceName() {
		@@ -50,16 +52,24 @@ namespace implementation {
		WifiLegacyHal::WifiLegacyHal()
		: global_handle_(nullptr),
		wlan_interface_handle_(nullptr),
		awaiting_event_loop_termination_(false) {
		CHECK_EQ(init_wifi_vendor_hal_func_table(&global_func_table_), WIFI_SUCCESS)
		<< "Failed to initialize legacy hal function table";
		}
		awaiting_event_loop_termination_(false) {}

		wifi_error WifiLegacyHal::start() {
		// Ensure that we're starting in a good state.
		CHECK(!global_handle_ && !wlan_interface_handle_ &&
		!awaiting_event_loop_termination_);

		android::wifi_system::HalTool hal_tool;
		android::wifi_system::InterfaceTool if_tool;
		if (!hal_tool.InitFunctionTable(&global_func_table_)) {
		LOG(ERROR) << "Failed to initialize legacy hal function table";
		return WIFI_ERROR_UNKNOWN;
		}
		if (!if_tool.SetWifiUpState(true)) {
		LOG(ERROR) << "Failed to set WiFi interface up";
		return WIFI_ERROR_UNKNOWN;
		}

		LOG(INFO) << "Starting legacy HAL";
		wifi_error status = global_func_table_.wifi_initialize(&global_handle_);
		if (status != WIFI_SUCCESS \|\| !global_handle_) {
		@@ -130,6 +140,8 @@ void WifiLegacyHal::runEventLoop() {
		}
		LOG(VERBOSE) << "Legacy HAL event loop terminated";
		awaiting_event_loop_termination_ = false;
		android::wifi_system::InterfaceTool if_tool;
		if_tool.SetWifiUpState(false);
		}

		} // namespace implementation