wifi: Add remaining capability flags from legacy HAL am: a2d369dd03 am: 228e755d9b (c5c09c6b) · Commits · e / os / android_hardware_interfaces

wifi/1.0/IWifiChip.hal

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -137,28 +137,28 @@ interface IWifiChip {
	/**		/**
	* Memory dump of Firmware.		* Memory dump of Firmware.
	*/		*/
	DEBUG_MEMORY_FIRMWARE_DUMP_SUPPORTED = 1 << 0,		DEBUG_MEMORY_FIRMWARE_DUMP = 1 << 0,
	/**		/**
	* Memory dump of Driver.		* Memory dump of Driver.
	*/		*/
	DEBUG_MEMORY_DRIVER_DUMP_SUPPORTED = 1 << 1,		DEBUG_MEMORY_DRIVER_DUMP = 1 << 1,
	/**		/**
	* Connectivity events reported via debug ring buffer.		* Connectivity events reported via debug ring buffer.
	*/		*/
	DEBUG_RING_BUFFER_CONNECT_EVENT_SUPPORTED = 1 << 2,		DEBUG_RING_BUFFER_CONNECT_EVENT = 1 << 2,
	/**		/**
	* Power events reported via debug ring buffer.		* Power events reported via debug ring buffer.
	*/		*/
	DEBUG_RING_BUFFER_POWER_EVENT_SUPPORTED = 1 << 3,		DEBUG_RING_BUFFER_POWER_EVENT = 1 << 3,
	/**		/**
	* Wakelock events reported via debug ring buffer.		* Wakelock events reported via debug ring buffer.
	*/		*/
	DEBUG_RING_BUFFER_WAKELOCK_EVENT_SUPPORTED = 1 << 4,		DEBUG_RING_BUFFER_WAKELOCK_EVENT = 1 << 4,
	/**		/**
	* Vendor data reported via debug ring buffer.		* Vendor data reported via debug ring buffer.
	* This mostly contains firmware event logs.		* This mostly contains firmware event logs.
	*/		*/
	DEBUG_RING_BUFFER_VENDOR_DATA_SUPPORTED = 1 << 5,		DEBUG_RING_BUFFER_VENDOR_DATA = 1 << 5,
	/**		/**
	* Host wake reasons stats collection.		* Host wake reasons stats collection.
	*/		*/
	@@ -292,7 +292,7 @@ interface IWifiChip {
	* Create an AP iface on the chip.		* Create an AP iface on the chip.
	*		*
	* Depending on the mode the chip is configured in, the interface creation		* Depending on the mode the chip is configured in, the interface creation
	* may fail (code: \|ERROR_NOT_SUPPORTED\|) if we've already reached the maximum		* may fail (code: \|ERROR_NOT_AVAILABLE\|) if we've already reached the maximum
	* allowed (specified in \|ChipIfaceCombination\|) number of ifaces of the AP		* allowed (specified in \|ChipIfaceCombination\|) number of ifaces of the AP
	* type.		* type.
	*		*
	@@ -352,7 +352,7 @@ interface IWifiChip {
	* Create a NAN iface on the chip.		* Create a NAN iface on the chip.
	*		*
	* Depending on the mode the chip is configured in, the interface creation		* Depending on the mode the chip is configured in, the interface creation
	* may fail (code: \|ERROR_NOT_SUPPORTED\|) if we've already reached the maximum		* may fail (code: \|ERROR_NOT_AVAILABLE\|) if we've already reached the maximum
	* allowed (specified in \|ChipIfaceCombination\|) number of ifaces of the NAN		* allowed (specified in \|ChipIfaceCombination\|) number of ifaces of the NAN
	* type.		* type.
	*		*
	@@ -412,7 +412,7 @@ interface IWifiChip {
	* Create a P2P iface on the chip.		* Create a P2P iface on the chip.
	*		*
	* Depending on the mode the chip is configured in, the interface creation		* Depending on the mode the chip is configured in, the interface creation
	* may fail (code: \|ERROR_NOT_SUPPORTED\|) if we've already reached the maximum		* may fail (code: \|ERROR_NOT_AVAILABLE\|) if we've already reached the maximum
	* allowed (specified in \|ChipIfaceCombination\|) number of ifaces of the P2P		* allowed (specified in \|ChipIfaceCombination\|) number of ifaces of the P2P
	* type.		* type.
	*		*
	@@ -472,7 +472,7 @@ interface IWifiChip {
	* Create an STA iface on the chip.		* Create an STA iface on the chip.
	*		*
	* Depending on the mode the chip is configured in, the interface creation		* Depending on the mode the chip is configured in, the interface creation
	* may fail (code: \|ERROR_NOT_SUPPORTED\|) if we've already reached the maximum		* may fail (code: \|ERROR_NOT_AVAILABLE\|) if we've already reached the maximum
	* allowed (specified in \|ChipIfaceCombination\|) number of ifaces of the STA		* allowed (specified in \|ChipIfaceCombination\|) number of ifaces of the STA
	* type.		* type.
	*		*

wifi/1.0/IWifiStaIface.hal

+22 −2

Original line number	Original line	Diff line number	Diff line
	@@ -61,9 +61,29 @@ interface IWifiStaIface extends IWifiIface {
	*/		*/
	SCAN_RAND = 1 << 6,		SCAN_RAND = 1 << 6,
	/**		/**
	* Tracks connection packets' fate.		* Support for 5 GHz Band.
	*/		*/
	DEBUG_PACKET_FATE_SUPPORTED = 1 << 7		STA_5G = 1 << 7,
			/**
			* Support for GAS/ANQP queries.
			*/
			HOTSPOT = 1 << 8,
			/**
			* Support for Preferred Network Offload.
			*/
			PNO = 1 << 9,
			/**
			* Support for Tunneled Direct Link Setup.
			*/
			TDLS = 1 << 10,
			/**
			* Support for Tunneled Direct Link Setup off channel.
			*/
			TDLS_OFFCHANNEL = 1 << 11,
			/**
			* Support for tracking connection packets' fate.
			*/
			DEBUG_PACKET_FATE = 1 << 12
	};		};

	/**		/**

wifi/1.0/default/hidl_struct_util.cpp

+23 −8

Original line number	Original line	Diff line number	Diff line
	@@ -31,15 +31,15 @@ IWifiChip::ChipCapabilityMask convertLegacyLoggerFeatureToHidlChipCapability(
	using HidlChipCaps = IWifiChip::ChipCapabilityMask;		using HidlChipCaps = IWifiChip::ChipCapabilityMask;
	switch (feature) {		switch (feature) {
	case legacy_hal::WIFI_LOGGER_MEMORY_DUMP_SUPPORTED:		case legacy_hal::WIFI_LOGGER_MEMORY_DUMP_SUPPORTED:
	return HidlChipCaps::DEBUG_MEMORY_FIRMWARE_DUMP_SUPPORTED;		return HidlChipCaps::DEBUG_MEMORY_FIRMWARE_DUMP;
	case legacy_hal::WIFI_LOGGER_DRIVER_DUMP_SUPPORTED:		case legacy_hal::WIFI_LOGGER_DRIVER_DUMP_SUPPORTED:
	return HidlChipCaps::DEBUG_MEMORY_DRIVER_DUMP_SUPPORTED;		return HidlChipCaps::DEBUG_MEMORY_DRIVER_DUMP;
	case legacy_hal::WIFI_LOGGER_CONNECT_EVENT_SUPPORTED:		case legacy_hal::WIFI_LOGGER_CONNECT_EVENT_SUPPORTED:
	return HidlChipCaps::DEBUG_RING_BUFFER_CONNECT_EVENT_SUPPORTED;		return HidlChipCaps::DEBUG_RING_BUFFER_CONNECT_EVENT;
	case legacy_hal::WIFI_LOGGER_POWER_EVENT_SUPPORTED:		case legacy_hal::WIFI_LOGGER_POWER_EVENT_SUPPORTED:
	return HidlChipCaps::DEBUG_RING_BUFFER_POWER_EVENT_SUPPORTED;		return HidlChipCaps::DEBUG_RING_BUFFER_POWER_EVENT;
	case legacy_hal::WIFI_LOGGER_WAKE_LOCK_SUPPORTED:		case legacy_hal::WIFI_LOGGER_WAKE_LOCK_SUPPORTED:
	return HidlChipCaps::DEBUG_RING_BUFFER_WAKELOCK_EVENT_SUPPORTED;		return HidlChipCaps::DEBUG_RING_BUFFER_WAKELOCK_EVENT;
	};		};
	CHECK(false) << "Unknown legacy feature: " << feature;		CHECK(false) << "Unknown legacy feature: " << feature;
	return {};		return {};
	@@ -50,7 +50,7 @@ convertLegacyLoggerFeatureToHidlStaIfaceCapability(uint32_t feature) {
	using HidlStaIfaceCaps = IWifiStaIface::StaIfaceCapabilityMask;		using HidlStaIfaceCaps = IWifiStaIface::StaIfaceCapabilityMask;
	switch (feature) {		switch (feature) {
	case legacy_hal::WIFI_LOGGER_PACKET_FATE_SUPPORTED:		case legacy_hal::WIFI_LOGGER_PACKET_FATE_SUPPORTED:
	return HidlStaIfaceCaps::DEBUG_PACKET_FATE_SUPPORTED;		return HidlStaIfaceCaps::DEBUG_PACKET_FATE;
	};		};
	CHECK(false) << "Unknown legacy feature: " << feature;		CHECK(false) << "Unknown legacy feature: " << feature;
	return {};		return {};
	@@ -72,6 +72,16 @@ convertLegacyFeatureToHidlStaIfaceCapability(uint32_t feature) {
	return HidlStaIfaceCaps::PROBE_IE_WHITELIST;		return HidlStaIfaceCaps::PROBE_IE_WHITELIST;
	case WIFI_FEATURE_SCAN_RAND:		case WIFI_FEATURE_SCAN_RAND:
	return HidlStaIfaceCaps::SCAN_RAND;		return HidlStaIfaceCaps::SCAN_RAND;
			case WIFI_FEATURE_INFRA_5G:
			return HidlStaIfaceCaps::STA_5G;
			case WIFI_FEATURE_HOTSPOT:
			return HidlStaIfaceCaps::HOTSPOT;
			case WIFI_FEATURE_PNO:
			return HidlStaIfaceCaps::PNO;
			case WIFI_FEATURE_TDLS:
			return HidlStaIfaceCaps::TDLS;
			case WIFI_FEATURE_TDLS_OFFCHANNEL:
			return HidlStaIfaceCaps::TDLS_OFFCHANNEL;
	};		};
	CHECK(false) << "Unknown legacy feature: " << feature;		CHECK(false) << "Unknown legacy feature: " << feature;
	return {};		return {};
	@@ -95,7 +105,7 @@ bool convertLegacyFeaturesToHidlChipCapabilities(
	}		}
	// There are no flags for these 3 in the legacy feature set. Adding them to		// There are no flags for these 3 in the legacy feature set. Adding them to
	// the set because all the current devices support it.		// the set because all the current devices support it.
	*hidl_caps \|= HidlChipCaps::DEBUG_RING_BUFFER_VENDOR_DATA_SUPPORTED;		*hidl_caps \|= HidlChipCaps::DEBUG_RING_BUFFER_VENDOR_DATA;
	*hidl_caps \|= HidlChipCaps::DEBUG_HOST_WAKE_REASON_STATS;		*hidl_caps \|= HidlChipCaps::DEBUG_HOST_WAKE_REASON_STATS;
	*hidl_caps \|= HidlChipCaps::DEBUG_ERROR_ALERTS;		*hidl_caps \|= HidlChipCaps::DEBUG_ERROR_ALERTS;
	return true;		return true;
	@@ -224,7 +234,12 @@ bool convertLegacyFeaturesToHidlStaCapabilities(
	WIFI_FEATURE_RSSI_MONITOR,		WIFI_FEATURE_RSSI_MONITOR,
	WIFI_FEATURE_CONTROL_ROAMING,		WIFI_FEATURE_CONTROL_ROAMING,
	WIFI_FEATURE_IE_WHITELIST,		WIFI_FEATURE_IE_WHITELIST,
	WIFI_FEATURE_SCAN_RAND}) {		WIFI_FEATURE_SCAN_RAND,
			WIFI_FEATURE_INFRA_5G,
			WIFI_FEATURE_HOTSPOT,
			WIFI_FEATURE_PNO,
			WIFI_FEATURE_TDLS,
			WIFI_FEATURE_TDLS_OFFCHANNEL}) {
	if (feature & legacy_feature_set) {		if (feature & legacy_feature_set) {
	*hidl_caps \|= convertLegacyFeatureToHidlStaIfaceCapability(feature);		*hidl_caps \|= convertLegacyFeatureToHidlStaIfaceCapability(feature);
	}		}