Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-03 12:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "[AWARE] Modify the discovery session handle to uint8_t"

Browse Source
This commit is contained in:
Etan Cohen
2017-02-10 02:48:42 +00:00
committed by Gerrit Code Review
parent 06da29ffae 073bb9943a
commit ff14eb32cd
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wifi/1.0/IWifiNanIface.hal
View File

@@ -122,7 +122,7 @@ interface IWifiNanIface extends IWifiIface {
* |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|, * |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
* |WifiStatusCode.ERROR_UNKNOWN| * |WifiStatusCode.ERROR_UNKNOWN|
*/ */
stopPublishRequest(CommandIdShort cmdId, uint16_t sessionId) stopPublishRequest(CommandIdShort cmdId, uint8_t sessionId)
generates (WifiStatus status); generates (WifiStatus status);
/** /**
@@ -151,7 +151,7 @@ interface IWifiNanIface extends IWifiIface {
* |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|, * |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
* |WifiStatusCode.ERROR_UNKNOWN| * |WifiStatusCode.ERROR_UNKNOWN|
*/ */
stopSubscribeRequest(CommandIdShort cmdId, uint16_t sessionId) stopSubscribeRequest(CommandIdShort cmdId, uint8_t sessionId)
generates (WifiStatus status); generates (WifiStatus status);
/** /**

10
wifi/1.0/IWifiNanIfaceEventCallback.hal
View File

@@ -79,7 +79,7 @@ interface IWifiNanIfaceEventCallback {
* |NanStatusType.INVALID_SESSION_ID| * |NanStatusType.INVALID_SESSION_ID|
* @param sessionId ID of the new publish session (if successfully created). * @param sessionId ID of the new publish session (if successfully created).
*/ */
oneway notifyStartPublishResponse(CommandIdShort id, WifiNanStatus status, uint16_t sessionId); oneway notifyStartPublishResponse(CommandIdShort id, WifiNanStatus status, uint8_t sessionId);
/** /**
* Callback invoked in response to a stop publish request |stopPublishRequest|. * Callback invoked in response to a stop publish request |stopPublishRequest|.
@@ -104,7 +104,7 @@ interface IWifiNanIfaceEventCallback {
* |NanStatusType.INVALID_SESSION_ID| * |NanStatusType.INVALID_SESSION_ID|
* @param sessionId ID of the new subscribe session (if successfully created). * @param sessionId ID of the new subscribe session (if successfully created).
*/ */
oneway notifyStartSubscribeResponse(CommandIdShort id, WifiNanStatus status, uint16_t sessionId); oneway notifyStartSubscribeResponse(CommandIdShort id, WifiNanStatus status, uint8_t sessionId);
/** /**
* Callback invoked in response to a stop subscribe request |stopSubscribeRequest|. * Callback invoked in response to a stop subscribe request |stopSubscribeRequest|.
@@ -223,7 +223,7 @@ interface IWifiNanIfaceEventCallback {
* Possible status codes are: * Possible status codes are:
* |NanStatusType.SUCCESS| * |NanStatusType.SUCCESS|
*/ */
oneway eventPublishTerminated(uint16_t sessionId, WifiNanStatus status); oneway eventPublishTerminated(uint8_t sessionId, WifiNanStatus status);
/** /**
* Asynchronous callback indicating that an active subscribe session has terminated. * Asynchronous callback indicating that an active subscribe session has terminated.
@@ -233,7 +233,7 @@ interface IWifiNanIfaceEventCallback {
* Possible status codes are: * Possible status codes are:
* |NanStatusType.SUCCESS| * |NanStatusType.SUCCESS|
*/ */
oneway eventSubscribeTerminated(uint16_t sessionId, WifiNanStatus status); oneway eventSubscribeTerminated(uint8_t sessionId, WifiNanStatus status);
/** /**
* Asynchronous callback indicating that a match has occurred: i.e. a service has been * Asynchronous callback indicating that a match has occurred: i.e. a service has been
@@ -249,7 +249,7 @@ interface IWifiNanIfaceEventCallback {
* @param discoverySessionId: The discovery session ID of the expired match. * @param discoverySessionId: The discovery session ID of the expired match.
* @param peerId: The peer ID of the expired match. * @param peerId: The peer ID of the expired match.
*/ */
oneway eventMatchExpired(uint16_t discoverySessionId, uint32_t peerId); oneway eventMatchExpired(uint8_t discoverySessionId, uint32_t peerId);
/** /**
* Asynchronous callback indicating that a followup message has been received from a peer. * Asynchronous callback indicating that a followup message has been received from a peer.

8
wifi/1.0/default/wifi_nan_iface.cpp
View File

@@ -495,7 +495,7 @@ Return<void> WifiNanIface::startPublishRequest(uint16_t cmd_id,
Return<void> WifiNanIface::stopPublishRequest( Return<void> WifiNanIface::stopPublishRequest(
uint16_t cmd_id, uint16_t cmd_id,
uint16_t sessionId, uint8_t sessionId,
stopPublishRequest_cb hidl_status_cb) { stopPublishRequest_cb hidl_status_cb) {
return validateAndCall(this, return validateAndCall(this,
WifiStatusCode::ERROR_WIFI_IFACE_INVALID, WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
@@ -519,7 +519,7 @@ Return<void> WifiNanIface::startSubscribeRequest(
Return<void> WifiNanIface::stopSubscribeRequest( Return<void> WifiNanIface::stopSubscribeRequest(
uint16_t cmd_id, uint16_t cmd_id,
uint16_t sessionId, uint8_t sessionId,
stopSubscribeRequest_cb hidl_status_cb) { stopSubscribeRequest_cb hidl_status_cb) {
return validateAndCall(this, return validateAndCall(this,
WifiStatusCode::ERROR_WIFI_IFACE_INVALID, WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
@@ -665,7 +665,7 @@ WifiStatus WifiNanIface::startPublishRequestInternal(uint16_t cmd_id,
} }
WifiStatus WifiNanIface::stopPublishRequestInternal( WifiStatus WifiNanIface::stopPublishRequestInternal(
uint16_t cmd_id, uint16_t sessionId) { uint16_t cmd_id, uint8_t sessionId) {
legacy_hal::NanPublishCancelRequest legacy_msg; legacy_hal::NanPublishCancelRequest legacy_msg;
legacy_msg.publish_id = sessionId; legacy_msg.publish_id = sessionId;
legacy_hal::wifi_error legacy_status = legacy_hal::wifi_error legacy_status =
@@ -686,7 +686,7 @@ WifiStatus WifiNanIface::startSubscribeRequestInternal(
} }
WifiStatus WifiNanIface::stopSubscribeRequestInternal( WifiStatus WifiNanIface::stopSubscribeRequestInternal(
uint16_t cmd_id, uint16_t sessionId) { uint16_t cmd_id, uint8_t sessionId) {
legacy_hal::NanSubscribeCancelRequest legacy_msg; legacy_hal::NanSubscribeCancelRequest legacy_msg;
legacy_msg.subscribe_id = sessionId; legacy_msg.subscribe_id = sessionId;
legacy_hal::wifi_error legacy_status = legacy_hal::wifi_error legacy_status =

8
wifi/1.0/default/wifi_nan_iface.h
View File

@@ -60,13 +60,13 @@ class WifiNanIface : public IWifiNanIface {
const NanPublishRequest& msg, const NanPublishRequest& msg,
startPublishRequest_cb hidl_status_cb) override; startPublishRequest_cb hidl_status_cb) override;
Return<void> stopPublishRequest(uint16_t cmd_id, Return<void> stopPublishRequest(uint16_t cmd_id,
uint16_t sessionId, uint8_t sessionId,
stopPublishRequest_cb hidl_status_cb) override; stopPublishRequest_cb hidl_status_cb) override;
Return<void> startSubscribeRequest(uint16_t cmd_id, Return<void> startSubscribeRequest(uint16_t cmd_id,
const NanSubscribeRequest& msg, const NanSubscribeRequest& msg,
startSubscribeRequest_cb hidl_status_cb) override; startSubscribeRequest_cb hidl_status_cb) override;
Return<void> stopSubscribeRequest(uint16_t cmd_id, Return<void> stopSubscribeRequest(uint16_t cmd_id,
uint16_t sessionId, uint8_t sessionId,
stopSubscribeRequest_cb hidl_status_cb) override; stopSubscribeRequest_cb hidl_status_cb) override;
Return<void> transmitFollowupRequest(uint16_t cmd_id, Return<void> transmitFollowupRequest(uint16_t cmd_id,
const NanTransmitFollowupRequest& msg, const NanTransmitFollowupRequest& msg,
@@ -102,10 +102,10 @@ class WifiNanIface : public IWifiNanIface {
WifiStatus disableRequestInternal(uint16_t cmd_id); WifiStatus disableRequestInternal(uint16_t cmd_id);
WifiStatus startPublishRequestInternal(uint16_t cmd_id, WifiStatus startPublishRequestInternal(uint16_t cmd_id,
const NanPublishRequest& msg); const NanPublishRequest& msg);
WifiStatus stopPublishRequestInternal(uint16_t cmd_id, uint16_t sessionId); WifiStatus stopPublishRequestInternal(uint16_t cmd_id, uint8_t sessionId);
WifiStatus startSubscribeRequestInternal(uint16_t cmd_id, WifiStatus startSubscribeRequestInternal(uint16_t cmd_id,
const NanSubscribeRequest& msg); const NanSubscribeRequest& msg);
WifiStatus stopSubscribeRequestInternal(uint16_t cmd_id, uint16_t sessionId); WifiStatus stopSubscribeRequestInternal(uint16_t cmd_id, uint8_t sessionId);
WifiStatus transmitFollowupRequestInternal( WifiStatus transmitFollowupRequestInternal(
uint16_t cmd_id, const NanTransmitFollowupRequest& msg); uint16_t cmd_id, const NanTransmitFollowupRequest& msg);
WifiStatus createDataInterfaceRequestInternal(uint16_t cmd_id, WifiStatus createDataInterfaceRequestInternal(uint16_t cmd_id,

10
wifi/1.0/types.hal
View File

@@ -867,7 +867,7 @@ struct NanDiscoveryCommonConfig {
* The ID of the discovery session being configured. A value of 0 specifies a request to create * The ID of the discovery session being configured. A value of 0 specifies a request to create
* a new discovery session. * a new discovery session.
*/ */
uint16_t sessionId; uint8_t sessionId;
/** /**
* The lifetime of the discovery session in seconds. A value of 0 means run forever or until * The lifetime of the discovery session in seconds. A value of 0 means run forever or until
* canceled. * canceled.
@@ -1042,7 +1042,7 @@ struct NanTransmitFollowupRequest {
* ID of an active publish or subscribe discovery session. Follow-up message is transmitted in the * ID of an active publish or subscribe discovery session. Follow-up message is transmitted in the
* context of the discovery session. * context of the discovery session.
*/ */
uint16_t discoverySessionId; uint8_t discoverySessionId;
/** /**
* ID of the peer. Obtained as part of an earlier |eventMatch| or |eventFollowupReceived|. * ID of the peer. Obtained as part of an earlier |eventMatch| or |eventFollowupReceived|.
*/ */
@@ -1228,7 +1228,7 @@ struct NanMatchInd {
/** /**
* Publish or subscribe discovery session ID of an existing discovery session. * Publish or subscribe discovery session ID of an existing discovery session.
*/ */
uint16_t discoverySessionId; uint8_t discoverySessionId;
/** /**
* A unique ID of the peer. Can be subsequently used in |transmitFollowupRequest|. * A unique ID of the peer. Can be subsequently used in |transmitFollowupRequest|.
*/ */
@@ -1313,7 +1313,7 @@ struct NanFollowupReceivedInd {
* Discovery session (publish or subscribe) ID of a previously created discovery session. The * Discovery session (publish or subscribe) ID of a previously created discovery session. The
* message is received in the context of this discovery session. * message is received in the context of this discovery session.
*/ */
uint16_t discoverySessionId; uint8_t discoverySessionId;
/** /**
* A unique ID of the peer. Can be subsequently used in |transmitFollowupRequest|. * A unique ID of the peer. Can be subsequently used in |transmitFollowupRequest|.
*/ */
@@ -1378,7 +1378,7 @@ struct NanDataPathRequestInd {
* ID of an active publish or subscribe discovery session - the data-path request is in the * ID of an active publish or subscribe discovery session - the data-path request is in the
* context of this discovery session. * context of this discovery session.
*/ */
uint16_t discoverySessionId; uint8_t discoverySessionId;
/** /**
* MAC address of the Initiator peer. This is the MAC address of the peer's management/discovery * MAC address of the Initiator peer. This is the MAC address of the peer's management/discovery
* NAN interface. * NAN interface.