Fix format for android.hardware.wifi@1.4 (46b5698a) · Commits · e / os / android_hardware_interfaces

wifi/1.4/IWifiChip.hal

+1 −2

Original line number	Diff line number	Diff line
		@@ -39,8 +39,7 @@ interface IWifiChip extends @1.3::IWifiChip {
		* \|WifiStatusCode.ERROR_NOT_SUPPORTED\|,
		* \|WifiStatusCode.ERROR_WIFI_CHIP_INVALID\|
		*/
		registerEventCallback_1_4(IWifiChipEventCallback callback)
		generates (WifiStatus status);
		registerEventCallback_1_4(IWifiChipEventCallback callback) generates (WifiStatus status);

		/**
		* Create a RTTController instance.

wifi/1.4/IWifiChipEventCallback.hal

+5 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ interface IWifiChipEventCallback extends @1.2::IWifiChipEventCallback {
		* only for debugging purposes.
		*/
		uint32_t radioId;

		/**
		* List of bands on which this radio chain is operating.
		* Can be one of:
		@@ -47,7 +48,10 @@ interface IWifiChipEventCallback extends @1.2::IWifiChipEventCallback {
		* time sharing across the 3 bands).
		*/
		WifiBand bandInfo;
		/** List of interfaces on this radio chain (hardware MAC). */

		/**
		* List of interfaces on this radio chain (hardware MAC).
		*/
		vec<IfaceInfo> ifaceInfos;
		};

wifi/1.4/IWifiNanIface.hal

+2 −4

Original line number	Diff line number	Diff line
		@@ -52,8 +52,7 @@ interface IWifiNanIface extends @1.2::IWifiNanIface {
		* \|WifiStatusCode.ERROR_UNKNOWN\|
		*/
		enableRequest_1_4(CommandIdShort cmdId, NanEnableRequest msg1,
		NanConfigRequestSupplemental msg2)
		generates (WifiStatus status);
		NanConfigRequestSupplemental msg2) generates (WifiStatus status);

		/**
		* Configure NAN: configures an existing NAN functionality (i.e. assumes
		@@ -75,6 +74,5 @@ interface IWifiNanIface extends @1.2::IWifiNanIface {
		* \|WifiStatusCode.ERROR_UNKNOWN\|
		*/
		configRequest_1_4(CommandIdShort cmdId, NanConfigRequest msg1,
		NanConfigRequestSupplemental msg2)
		generates (WifiStatus status);
		NanConfigRequestSupplemental msg2) generates (WifiStatus status);
		};

wifi/1.4/IWifiStaIface.hal

+15 −17

Original line number	Diff line number	Diff line
		@@ -27,9 +27,8 @@ import @1.3::IWifiStaIface;
		* IWifiChip.createStaIface() may return a @1.4::IWifiStaIface when supported.
		*/
		interface IWifiStaIface extends @1.3::IWifiStaIface {

		enum StaIfaceCapabilityMask : @1.0::IWifiStaIface.StaIfaceCapabilityMask {
		STA_6G = 1 << 15
		STA_6G = 1 << 15,
		};

		/**
		@@ -45,6 +44,5 @@ interface IWifiStaIface extends @1.3::IWifiStaIface {
		* @return capabilities Bitset of \|StaIfaceCapabilityMask\| values.
		*/
		getCapabilities_1_4()
		generates (WifiStatus status,
		bitfield<StaIfaceCapabilityMask> capabilities);
		generates (WifiStatus status, bitfield<StaIfaceCapabilityMask> capabilities);
		};

wifi/1.4/types.hal

+178 −149

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ enum WifiBand : @1.0::WifiBand {
		/**
		* 2.4 GHz + 5 GHz with DFS + 6 GHz.
		*/
		BAND_24GHZ_5GHZ_WITH_DFS_6GHZ = 15
		BAND_24GHZ_5GHZ_WITH_DFS_6GHZ = 15,
		};

		/**
		@@ -100,28 +100,37 @@ struct NanDebugConfig {
		* Configuration is only used if \|validClusterIdVals\| is set to true.
		*/
		bool validClusterIdVals;

		uint16_t clusterIdBottomRangeVal;

		uint16_t clusterIdTopRangeVal;

		/**
		* NAN management interface address, if specified (\|validIntfAddrVal\| is true) then overrides any
		* other configuration (specifically the default randomization configured by
		* \|NanConfigRequest.macAddressRandomizationIntervalSec\|).
		*/
		bool validIntfAddrVal;

		MacAddress intfAddrVal;

		/**
		* Combination of the 24 bit Organizationally Unique ID (OUI) and the 8 bit OUI Type.
		* Used if \|validOuiVal\| is set to true.
		*/
		bool validOuiVal;

		uint32_t ouiVal;

		/**
		* Force the Random Factor to the specified value for all transmitted Sync/Discovery beacons.
		* Used if \|validRandomFactorForceVal\| is set to true.
		* NAN Spec: Master Indication Attribute / Random Factor
		*/
		bool validRandomFactorForceVal;

		uint8_t randomFactorForceVal;

		/**
		* Forces the hop-count for all transmitted Sync and Discovery Beacons NO matter the real
		* hop-count being received over the air. Used if the \|validHopCountForceVal}\| flag is set to
		@@ -129,24 +138,31 @@ struct NanDebugConfig {
		* NAN Spec: Cluster Attribute / Anchor Master Information / Hop Count to Anchor Master
		*/
		bool validHopCountForceVal;

		uint8_t hopCountForceVal;

		/**
		* Frequency in MHz to of the discovery channel in the specified band. Indexed by \|NanBandIndex\|.
		* Used if the \|validDiscoveryChannelVal\| is set to true.
		*/
		bool validDiscoveryChannelVal;

		WifiChannelInMhz[3] discoveryChannelMhzVal;

		/**
		* Specifies whether sync/discovery beacons are transmitted in the specified band. Indexed by
		* \|NanBandIndex\|. Used if the \|validUseBeaconsInBandVal\| is set to true.
		*/
		bool validUseBeaconsInBandVal;

		bool[3] useBeaconsInBandVal;

		/**
		* Specifies whether SDF (service discovery frames) are transmitted in the specified band. Indexed
		* by \|NanBandIndex\|. Used if the \|validUseSdfInBandVal\| is set to true.
		*/
		bool validUseSdfInBandVal;

		bool[3] useSdfInBandVal;
		};

		@@ -159,26 +175,31 @@ struct NanConfigRequest {
		* NAN Spec: Master Indication Attribute / Master Preference
		*/
		uint8_t masterPref;

		/**
		* Controls whether or not the \|IWifiNanIfaceEventCallback.eventClusterEvent\| will be delivered
		* for \|NanClusterEventType.DISCOVERY_MAC_ADDRESS_CHANGED\|.
		*/
		bool disableDiscoveryAddressChangeIndication;

		/**
		* Controls whether or not the \|IWifiNanIfaceEventCallback.eventClusterEvent\| will be delivered
		* for \|NanClusterEventType.STARTED_CLUSTER\|.
		*/
		bool disableStartedClusterIndication;

		/**
		* Controls whether or not the \|IWifiNanIfaceEventCallback.eventClusterEvent\| will be delivered
		* for \|NanClusterEventType.JOINED_CLUSTER\|.
		*/
		bool disableJoinedClusterIndication;

		/**
		* Control whether publish service IDs are included in Sync/Discovery beacons.
		* NAN Spec: Service ID List Attribute
		*/
		bool includePublishServiceIdsInBeacon;

		/**
		* If \|includePublishServiceIdsInBeacon\| is true then specifies the number of publish service IDs
		* to include in the Sync/Discovery beacons:
		@@ -186,11 +207,13 @@ struct NanConfigRequest {
		* Value must fit within 7 bits - i.e. <= 127.
		*/
		uint8_t numberOfPublishServiceIdsInBeacon;

		/**
		* Control whether subscribe service IDs are included in Sync/Discovery beacons.
		* Spec: Subscribe Service ID List Attribute
		*/
		bool includeSubscribeServiceIdsInBeacon;

		/**
		* If \|includeSubscribeServiceIdsInBeacon\| is true then specifies the number of subscribe service
		* IDs to include in the Sync/Discovery beacons:
		@@ -198,15 +221,18 @@ struct NanConfigRequest {
		* Value must fit within 7 bits - i.e. <= 127.
		*/
		uint8_t numberOfSubscribeServiceIdsInBeacon;

		/**
		* Number of samples used to calculate RSSI.
		*/
		uint16_t rssiWindowSize;

		/**
		* Specifies the interval in seconds that the NAN management interface MAC address is randomized.
		* A value of 0 is used to disable the MAC address randomization
		*/
		uint32_t macAddressRandomizationIntervalSec;

		/**
		* Additional configuration provided per band: indexed by \|NanBandIndex\|.
		*/
		@@ -221,15 +247,18 @@ struct NanEnableRequest {
		* Enable operation in a specific band: indexed by \|NanBandIndex\|.
		*/
		bool[3] operateInBand;

		/**
		* Specify extent of cluster by specifying the max hop count.
		*/
		uint8_t hopCountMax;

		/**
		* Configurations of NAN cluster operation. Can also be modified at run-time using
		* \|IWifiNanIface.configRequest\|.
		*/
		NanConfigRequest configParams;

		/**
		* Non-standard configurations of NAN cluster operation - useful for debugging operations.
		*/