Loading wifi/1.0/Android.mk +50 −12 Original line number Diff line number Diff line Loading @@ -13,9 +13,9 @@ intermediates := $(local-generated-sources-dir) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) # # Build types.hal (CommandFailureReason) # Build types.hal (FailureReason) # GEN := $(intermediates)/android/hardware/wifi/1.0/CommandFailureReason.java GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReason.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal Loading @@ -23,16 +23,16 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.CommandFailureReason android.hardware.wifi@1.0::types.FailureReason $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (FailureReason) # Build types.hal (FailureReasonCode) # GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReason.java GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReasonCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal Loading @@ -40,7 +40,7 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.FailureReason android.hardware.wifi@1.0::types.FailureReasonCode $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) Loading @@ -63,6 +63,23 @@ $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StatusCode) # GEN := $(intermediates)/android/hardware/wifi/1.0/StatusCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.StatusCode $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifi.hal # Loading Loading @@ -242,6 +259,8 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttController.hal $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiIface.hal $(GEN): $(LOCAL_PATH)/IWifiIface.hal $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ Loading Loading @@ -307,9 +326,9 @@ intermediates := $(local-generated-sources-dir) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) # # Build types.hal (CommandFailureReason) # Build types.hal (FailureReason) # GEN := $(intermediates)/android/hardware/wifi/1.0/CommandFailureReason.java GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReason.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal Loading @@ -317,16 +336,16 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.CommandFailureReason android.hardware.wifi@1.0::types.FailureReason $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (FailureReason) # Build types.hal (FailureReasonCode) # GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReason.java GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReasonCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal Loading @@ -334,7 +353,7 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.FailureReason android.hardware.wifi@1.0::types.FailureReasonCode $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) Loading @@ -357,6 +376,23 @@ $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StatusCode) # GEN := $(intermediates)/android/hardware/wifi/1.0/StatusCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.StatusCode $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifi.hal # Loading Loading @@ -536,6 +572,8 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttController.hal $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiIface.hal $(GEN): $(LOCAL_PATH)/IWifiIface.hal $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ Loading wifi/1.0/IWifiChip.hal +109 −21 Original line number Diff line number Diff line Loading @@ -121,9 +121,13 @@ interface IWifiChip { /** * Get the id assigned to this chip. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return id Assigned chip Id. */ getId() generates (ChipId id); getId() generates (StatusCode status, ChipId id); /** * Requests notifications of significant events on this chip. Multiple calls Loading @@ -132,15 +136,23 @@ interface IWifiChip { * * @param callback An instance of the |IWifiChipEventCallback| HIDL interface * object. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ oneway registerEventCallback(IWifiChipEventCallback callback); registerEventCallback(IWifiChipEventCallback callback) generates (StatusCode status); /** * Get the set of operation modes that the chip supports. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return modes List of modes supported by the device. */ getAvailableModes() generates (vec<ChipMode> modes); getAvailableModes() generates (StatusCode status, vec<ChipMode> modes); /** * Reconfigure the Chip. Loading @@ -149,37 +161,60 @@ interface IWifiChip { * * @param modeId The mode that the chip should switch to, corresponding to the * id property of the target ChipMode. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ oneway configureChip(ChipModeId modeId); configureChip(ChipModeId modeId) generates (StatusCode status); /** * Get the current mode that the chip is in. * * @return modeId The mode that the chip is currently configured to, * corresponding to the id property of the target ChipMode. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ getMode() generates (ChipModeId modeId); getMode() generates (StatusCode status, ChipModeId modeId); /** * Request information about the chip. * Must trigger |IWifiChipEventCallback.onChipDebugInfoAvailable| on sucess, * or |IWifiChipEventCallback.onChipDebugInfoFailure| on failure. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ oneway requestChipDebugInfo(); requestChipDebugInfo() generates (StatusCode status); /** * Request vendor debug info from the driver. * Must trigger |IWifiChipEventCallback.onDriverDebugDumpAvailable| on success, * or |IWifiChipEventCallback.onDriverDebugDumpFailure| on failure. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ oneway requestDriverDebugDump(); requestDriverDebugDump() generates (StatusCode status); /** * Request vendor debug info from the firmware. * Must trigger |IWifiChipEventCallback.onFirmwareDebugDumpAvailable| on * success, or |IWifiChipEventCallback.onFirmwareDebugDumpFailure| on failure. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ oneway requestFirmwareDebugDump(); requestFirmwareDebugDump() generates (StatusCode status); /** * Create an AP iface on the chip. Loading @@ -188,29 +223,41 @@ interface IWifiChip { * may fail if we've already reached the maximum allowed * (specified in |ChipIfaceCombination|) number of ifaces of the AP type. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * successful, null otherwise. */ createApIface() generates (IWifiApIface iface); createApIface() generates (StatusCode status, IWifiApIface iface); /** * List all the AP iface names configured on the chip. * The corresponding |IWifiApIface| object for any iface are * retrieved using |getApIface| method. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return ifnames List of all AP iface names on the chip. */ getApIfaceNames() generates (vec<string> ifnames); getApIfaceNames() generates (StatusCode status, vec<string> ifnames); /** * Gets a HIDL interface object for the AP Iface corresponding * to the provided ifname. * * @param ifname Name of the iface. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * it exists, null otherwise. */ getApIface(string ifname) generates (IWifiApIface iface); getApIface(string ifname) generates (StatusCode status, IWifiApIface iface); /** * Create a NAN iface on the chip. Loading @@ -219,29 +266,41 @@ interface IWifiChip { * may fail if we've already reached the maximum allowed * (specified in |ChipIfaceCombination|) number of ifaces of the NAN type. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * successful, null otherwise. */ createNanIface() generates (IWifiNanIface iface); createNanIface() generates (StatusCode status, IWifiNanIface iface); /** * List all the NAN iface names configured on the chip. * The corresponding |IWifiNanIface| object for any iface are * retrieved using |getNanIface| method. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return ifnames List of all NAN iface names on the chip. */ getNanIfaceNames() generates (vec<string> ifnames); getNanIfaceNames() generates (StatusCode status, vec<string> ifnames); /** * Gets a HIDL interface object for the NAN Iface corresponding * to the provided ifname. * * @param ifname Name of the iface. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * it exists, null otherwise. */ getNanIface(string ifname) generates (IWifiNanIface iface); getNanIface(string ifname) generates (StatusCode status, IWifiNanIface iface); /** * Create a P2P iface on the chip. Loading @@ -250,29 +309,41 @@ interface IWifiChip { * may fail if we've already reached the maximum allowed * (specified in |ChipIfaceCombination|) number of ifaces of the P2P type. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * successful, null otherwise. */ createP2pIface() generates (IWifiP2pIface iface); createP2pIface() generates (StatusCode status, IWifiP2pIface iface); /** * List all the P2P iface names configured on the chip. * The corresponding |IWifiP2pIface| object for any iface are * retrieved using |getP2pIface| method. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return ifnames List of all P2P iface names on the chip. */ getP2pIfaceNames() generates (vec<string> ifnames); getP2pIfaceNames() generates (StatusCode status, vec<string> ifnames); /** * Gets a HIDL interface object for the P2P Iface corresponding * to the provided ifname. * * @param ifname Name of the iface. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * it exists, null otherwise. */ getP2pIface(string ifname) generates (IWifiP2pIface iface); getP2pIface(string ifname) generates (StatusCode status, IWifiP2pIface iface); /** * Create an STA iface on the chip. Loading @@ -281,29 +352,41 @@ interface IWifiChip { * may fail if we've already reached the maximum allowed * (specified in |ChipIfaceCombination|) number of ifaces of the STA type. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * successful, null otherwise. */ createStaIface() generates (IWifiStaIface iface); createStaIface() generates (StatusCode status, IWifiStaIface iface); /** * List all the STA iface names configured on the chip. * The corresponding |IWifiStaIface| object for any iface are * retrieved using |getStaIface| method. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return ifnames List of all STA iface names on the chip. */ getStaIfaceNames() generates (vec<string> ifnames); getStaIfaceNames() generates (StatusCode status, vec<string> ifnames); /** * Gets a HIDL interface object for the STA Iface corresponding * to the provided ifname. * * @param ifname Name of the iface. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * it exists, null otherwise. */ getStaIface(string ifname) generates (IWifiStaIface iface); getStaIface(string ifname) generates (StatusCode status, IWifiStaIface iface); /** * Create a RTTController instance. Loading @@ -316,6 +399,11 @@ interface IWifiChip { * * @param boundIface HIDL interface object representing the iface if * the responder must be bound to a specific iface, null otherwise. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ createRttController(IWifiIface boundIface) generates (IWifiRttController rtt); createRttController(IWifiIface boundIface) generates (StatusCode status, IWifiRttController rtt); }; wifi/1.0/IWifiIface.hal +10 −2 Original line number Diff line number Diff line Loading @@ -23,14 +23,22 @@ interface IWifiIface { /** * Get the type of this iface. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| * @return type One of the supported iface types. */ getType() generates (IfaceType type); getType() generates (StatusCode status, IfaceType type); /** * Get the name of this iface. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| * @return name Name of the iface. */ getName() generates (string name); getName() generates (StatusCode status, string name); }; wifi/1.0/IWifiRttController.hal +5 −1 Original line number Diff line number Diff line Loading @@ -25,8 +25,12 @@ interface IWifiRttController { /** * Get the iface on which the RTT operations will be performed. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_RTT_CONTROLLER_INVALID| * @return boundIface HIDL interface object representing the iface if bound * to a specific iface, null otherwise */ getBoundIface() generates (IWifiIface boundIface); getBoundIface() generates (StatusCode status, IWifiIface boundIface); }; wifi/1.0/IWifiStaIface.hal +40 −9 Original line number Diff line number Diff line Loading @@ -213,24 +213,37 @@ interface IWifiStaIface extends IWifiIface { * * @param callback An instance of the |IWifiStaIfaceEventCallback| HIDL interface * object. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| */ oneway registerEventCallback(IWifiStaIfaceEventCallback callback); registerEventCallback(IWifiStaIfaceEventCallback callback) generates (StatusCode status); /** * Get the capabilities supported by this STA iface. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| * @return capabilities Bitset of |StaIfaceCapabilityMask| values. */ getCapabilities() generates (uint64_t capabilities); getCapabilities() generates (StatusCode status, uint64_t capabilities); /** * Used to query additional information about the chip's APF capabilities. * Will fail if |StaIfaceCapabilityMask.APF| is not set. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| * @return capabilities Instance of |ApfPacketFilterCapabilities|. */ getApfPacketFilterCapabilities() generates (ApfPacketFilterCapabilities capabilities); generates (StatusCode status, ApfPacketFilterCapabilities capabilities); /** * Installs an APF program on this iface, replacing an existing Loading @@ -238,18 +251,27 @@ interface IWifiStaIface extends IWifiIface { * Will fail if |StaIfaceCapabilityMask.APF| is not set. * * @param cmdId command Id to use for this invocation. * @param program APF Program to be set. */ oneway installApfPacketFilter(CommandId cmdId, vec<uint8_t> program); * @param APF Program to be set. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| */ installApfPacketFilter(CommandId cmdId, vec<uint8_t> program) generates (StatusCode status); /** * Used to query additional information about the chip's APF capabilities. * Will fail if |StaIfaceCapabilityMask.BACKGROUND_SCAN| is not set. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| * @return capabilities Instance of |BackgroundScanCapabilities|. */ getBackgroundScanCapabilities() generates (BackgroundScanCapabilities capabilities); generates (StatusCode status, BackgroundScanCapabilities capabilities); /** * Start a background scan using the given cmdId as an identifier. Only one Loading Loading @@ -278,14 +300,23 @@ interface IWifiStaIface extends IWifiIface { * WIFI_SCAN_FLAG_INTERRUPTED flag set. * * @param cmdId command Id to use for this invocation. * @param params Background scan parameters. */ oneway startBackgroundScan(CommandId cmdId, BackgroundScanParameters params); * @params Background scan parameters. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| */ startBackgroundScan(CommandId cmdId, BackgroundScanParameters params) generates (StatusCode status); /** * Stop the background scan started. * * @param cmdId command Id corresponding to the request. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| */ oneway stopBackgroundScan(CommandId cmdId); stopBackgroundScan(CommandId cmdId) generates (StatusCode status); }; Loading
wifi/1.0/Android.mk +50 −12 Original line number Diff line number Diff line Loading @@ -13,9 +13,9 @@ intermediates := $(local-generated-sources-dir) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) # # Build types.hal (CommandFailureReason) # Build types.hal (FailureReason) # GEN := $(intermediates)/android/hardware/wifi/1.0/CommandFailureReason.java GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReason.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal Loading @@ -23,16 +23,16 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.CommandFailureReason android.hardware.wifi@1.0::types.FailureReason $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (FailureReason) # Build types.hal (FailureReasonCode) # GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReason.java GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReasonCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal Loading @@ -40,7 +40,7 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.FailureReason android.hardware.wifi@1.0::types.FailureReasonCode $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) Loading @@ -63,6 +63,23 @@ $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StatusCode) # GEN := $(intermediates)/android/hardware/wifi/1.0/StatusCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.StatusCode $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifi.hal # Loading Loading @@ -242,6 +259,8 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttController.hal $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiIface.hal $(GEN): $(LOCAL_PATH)/IWifiIface.hal $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ Loading Loading @@ -307,9 +326,9 @@ intermediates := $(local-generated-sources-dir) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) # # Build types.hal (CommandFailureReason) # Build types.hal (FailureReason) # GEN := $(intermediates)/android/hardware/wifi/1.0/CommandFailureReason.java GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReason.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal Loading @@ -317,16 +336,16 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.CommandFailureReason android.hardware.wifi@1.0::types.FailureReason $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (FailureReason) # Build types.hal (FailureReasonCode) # GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReason.java GEN := $(intermediates)/android/hardware/wifi/1.0/FailureReasonCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal Loading @@ -334,7 +353,7 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.FailureReason android.hardware.wifi@1.0::types.FailureReasonCode $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) Loading @@ -357,6 +376,23 @@ $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StatusCode) # GEN := $(intermediates)/android/hardware/wifi/1.0/StatusCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ android.hardware.wifi@1.0::types.StatusCode $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifi.hal # Loading Loading @@ -536,6 +572,8 @@ $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttController.hal $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IWifiIface.hal $(GEN): $(LOCAL_PATH)/IWifiIface.hal $(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ Loading
wifi/1.0/IWifiChip.hal +109 −21 Original line number Diff line number Diff line Loading @@ -121,9 +121,13 @@ interface IWifiChip { /** * Get the id assigned to this chip. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return id Assigned chip Id. */ getId() generates (ChipId id); getId() generates (StatusCode status, ChipId id); /** * Requests notifications of significant events on this chip. Multiple calls Loading @@ -132,15 +136,23 @@ interface IWifiChip { * * @param callback An instance of the |IWifiChipEventCallback| HIDL interface * object. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ oneway registerEventCallback(IWifiChipEventCallback callback); registerEventCallback(IWifiChipEventCallback callback) generates (StatusCode status); /** * Get the set of operation modes that the chip supports. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return modes List of modes supported by the device. */ getAvailableModes() generates (vec<ChipMode> modes); getAvailableModes() generates (StatusCode status, vec<ChipMode> modes); /** * Reconfigure the Chip. Loading @@ -149,37 +161,60 @@ interface IWifiChip { * * @param modeId The mode that the chip should switch to, corresponding to the * id property of the target ChipMode. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ oneway configureChip(ChipModeId modeId); configureChip(ChipModeId modeId) generates (StatusCode status); /** * Get the current mode that the chip is in. * * @return modeId The mode that the chip is currently configured to, * corresponding to the id property of the target ChipMode. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ getMode() generates (ChipModeId modeId); getMode() generates (StatusCode status, ChipModeId modeId); /** * Request information about the chip. * Must trigger |IWifiChipEventCallback.onChipDebugInfoAvailable| on sucess, * or |IWifiChipEventCallback.onChipDebugInfoFailure| on failure. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ oneway requestChipDebugInfo(); requestChipDebugInfo() generates (StatusCode status); /** * Request vendor debug info from the driver. * Must trigger |IWifiChipEventCallback.onDriverDebugDumpAvailable| on success, * or |IWifiChipEventCallback.onDriverDebugDumpFailure| on failure. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ oneway requestDriverDebugDump(); requestDriverDebugDump() generates (StatusCode status); /** * Request vendor debug info from the firmware. * Must trigger |IWifiChipEventCallback.onFirmwareDebugDumpAvailable| on * success, or |IWifiChipEventCallback.onFirmwareDebugDumpFailure| on failure. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ oneway requestFirmwareDebugDump(); requestFirmwareDebugDump() generates (StatusCode status); /** * Create an AP iface on the chip. Loading @@ -188,29 +223,41 @@ interface IWifiChip { * may fail if we've already reached the maximum allowed * (specified in |ChipIfaceCombination|) number of ifaces of the AP type. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * successful, null otherwise. */ createApIface() generates (IWifiApIface iface); createApIface() generates (StatusCode status, IWifiApIface iface); /** * List all the AP iface names configured on the chip. * The corresponding |IWifiApIface| object for any iface are * retrieved using |getApIface| method. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return ifnames List of all AP iface names on the chip. */ getApIfaceNames() generates (vec<string> ifnames); getApIfaceNames() generates (StatusCode status, vec<string> ifnames); /** * Gets a HIDL interface object for the AP Iface corresponding * to the provided ifname. * * @param ifname Name of the iface. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * it exists, null otherwise. */ getApIface(string ifname) generates (IWifiApIface iface); getApIface(string ifname) generates (StatusCode status, IWifiApIface iface); /** * Create a NAN iface on the chip. Loading @@ -219,29 +266,41 @@ interface IWifiChip { * may fail if we've already reached the maximum allowed * (specified in |ChipIfaceCombination|) number of ifaces of the NAN type. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * successful, null otherwise. */ createNanIface() generates (IWifiNanIface iface); createNanIface() generates (StatusCode status, IWifiNanIface iface); /** * List all the NAN iface names configured on the chip. * The corresponding |IWifiNanIface| object for any iface are * retrieved using |getNanIface| method. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return ifnames List of all NAN iface names on the chip. */ getNanIfaceNames() generates (vec<string> ifnames); getNanIfaceNames() generates (StatusCode status, vec<string> ifnames); /** * Gets a HIDL interface object for the NAN Iface corresponding * to the provided ifname. * * @param ifname Name of the iface. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * it exists, null otherwise. */ getNanIface(string ifname) generates (IWifiNanIface iface); getNanIface(string ifname) generates (StatusCode status, IWifiNanIface iface); /** * Create a P2P iface on the chip. Loading @@ -250,29 +309,41 @@ interface IWifiChip { * may fail if we've already reached the maximum allowed * (specified in |ChipIfaceCombination|) number of ifaces of the P2P type. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * successful, null otherwise. */ createP2pIface() generates (IWifiP2pIface iface); createP2pIface() generates (StatusCode status, IWifiP2pIface iface); /** * List all the P2P iface names configured on the chip. * The corresponding |IWifiP2pIface| object for any iface are * retrieved using |getP2pIface| method. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return ifnames List of all P2P iface names on the chip. */ getP2pIfaceNames() generates (vec<string> ifnames); getP2pIfaceNames() generates (StatusCode status, vec<string> ifnames); /** * Gets a HIDL interface object for the P2P Iface corresponding * to the provided ifname. * * @param ifname Name of the iface. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * it exists, null otherwise. */ getP2pIface(string ifname) generates (IWifiP2pIface iface); getP2pIface(string ifname) generates (StatusCode status, IWifiP2pIface iface); /** * Create an STA iface on the chip. Loading @@ -281,29 +352,41 @@ interface IWifiChip { * may fail if we've already reached the maximum allowed * (specified in |ChipIfaceCombination|) number of ifaces of the STA type. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * successful, null otherwise. */ createStaIface() generates (IWifiStaIface iface); createStaIface() generates (StatusCode status, IWifiStaIface iface); /** * List all the STA iface names configured on the chip. * The corresponding |IWifiStaIface| object for any iface are * retrieved using |getStaIface| method. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return ifnames List of all STA iface names on the chip. */ getStaIfaceNames() generates (vec<string> ifnames); getStaIfaceNames() generates (StatusCode status, vec<string> ifnames); /** * Gets a HIDL interface object for the STA Iface corresponding * to the provided ifname. * * @param ifname Name of the iface. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| * @return iface HIDL interface object representing the iface if * it exists, null otherwise. */ getStaIface(string ifname) generates (IWifiStaIface iface); getStaIface(string ifname) generates (StatusCode status, IWifiStaIface iface); /** * Create a RTTController instance. Loading @@ -316,6 +399,11 @@ interface IWifiChip { * * @param boundIface HIDL interface object representing the iface if * the responder must be bound to a specific iface, null otherwise. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_CHIP_INVALID| */ createRttController(IWifiIface boundIface) generates (IWifiRttController rtt); createRttController(IWifiIface boundIface) generates (StatusCode status, IWifiRttController rtt); };
wifi/1.0/IWifiIface.hal +10 −2 Original line number Diff line number Diff line Loading @@ -23,14 +23,22 @@ interface IWifiIface { /** * Get the type of this iface. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| * @return type One of the supported iface types. */ getType() generates (IfaceType type); getType() generates (StatusCode status, IfaceType type); /** * Get the name of this iface. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| * @return name Name of the iface. */ getName() generates (string name); getName() generates (StatusCode status, string name); };
wifi/1.0/IWifiRttController.hal +5 −1 Original line number Diff line number Diff line Loading @@ -25,8 +25,12 @@ interface IWifiRttController { /** * Get the iface on which the RTT operations will be performed. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_RTT_CONTROLLER_INVALID| * @return boundIface HIDL interface object representing the iface if bound * to a specific iface, null otherwise */ getBoundIface() generates (IWifiIface boundIface); getBoundIface() generates (StatusCode status, IWifiIface boundIface); };
wifi/1.0/IWifiStaIface.hal +40 −9 Original line number Diff line number Diff line Loading @@ -213,24 +213,37 @@ interface IWifiStaIface extends IWifiIface { * * @param callback An instance of the |IWifiStaIfaceEventCallback| HIDL interface * object. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| */ oneway registerEventCallback(IWifiStaIfaceEventCallback callback); registerEventCallback(IWifiStaIfaceEventCallback callback) generates (StatusCode status); /** * Get the capabilities supported by this STA iface. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| * @return capabilities Bitset of |StaIfaceCapabilityMask| values. */ getCapabilities() generates (uint64_t capabilities); getCapabilities() generates (StatusCode status, uint64_t capabilities); /** * Used to query additional information about the chip's APF capabilities. * Will fail if |StaIfaceCapabilityMask.APF| is not set. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| * @return capabilities Instance of |ApfPacketFilterCapabilities|. */ getApfPacketFilterCapabilities() generates (ApfPacketFilterCapabilities capabilities); generates (StatusCode status, ApfPacketFilterCapabilities capabilities); /** * Installs an APF program on this iface, replacing an existing Loading @@ -238,18 +251,27 @@ interface IWifiStaIface extends IWifiIface { * Will fail if |StaIfaceCapabilityMask.APF| is not set. * * @param cmdId command Id to use for this invocation. * @param program APF Program to be set. */ oneway installApfPacketFilter(CommandId cmdId, vec<uint8_t> program); * @param APF Program to be set. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| */ installApfPacketFilter(CommandId cmdId, vec<uint8_t> program) generates (StatusCode status); /** * Used to query additional information about the chip's APF capabilities. * Will fail if |StaIfaceCapabilityMask.BACKGROUND_SCAN| is not set. * * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| * @return capabilities Instance of |BackgroundScanCapabilities|. */ getBackgroundScanCapabilities() generates (BackgroundScanCapabilities capabilities); generates (StatusCode status, BackgroundScanCapabilities capabilities); /** * Start a background scan using the given cmdId as an identifier. Only one Loading Loading @@ -278,14 +300,23 @@ interface IWifiStaIface extends IWifiIface { * WIFI_SCAN_FLAG_INTERRUPTED flag set. * * @param cmdId command Id to use for this invocation. * @param params Background scan parameters. */ oneway startBackgroundScan(CommandId cmdId, BackgroundScanParameters params); * @params Background scan parameters. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| */ startBackgroundScan(CommandId cmdId, BackgroundScanParameters params) generates (StatusCode status); /** * Stop the background scan started. * * @param cmdId command Id corresponding to the request. * @return status Status of the operation. * Possible status codes: * |StatusCode.SUCCESS|, * |StatusCode.ERROR_WIFI_IFACE_INVALID| */ oneway stopBackgroundScan(CommandId cmdId); stopBackgroundScan(CommandId cmdId) generates (StatusCode status); };
