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

wifi: Remove unused methods in IWifiRttController

Browse Source 
am: 824e475cd1

Change-Id: I287973dbe29ac40494a3fb62e5e1a8d2ac925a1c
This commit is contained in:
Roshan Pius
2016-12-09 02:05:40 +00:00
committed by android-build-merger
parent ca2c7d355f 824e475cd1
commit e272814d13
7 changed files with 0 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
wifi/1.0/Android.mk
View File

@@ -1175,25 +1175,6 @@ $(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttChannelMap)
#
GEN := $(intermediates)/android/hardware/wifi/1.0/RttChannelMap.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 \
-randroid.hidl:system/libhidl/transport \
android.hardware.wifi@1.0::types.RttChannelMap
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttConfig)
#
@@ -1213,63 +1194,6 @@ $(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttDebugFormat)
#
GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugFormat.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 \
-randroid.hidl:system/libhidl/transport \
android.hardware.wifi@1.0::types.RttDebugFormat
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttDebugInfo)
#
GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugInfo.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 \
-randroid.hidl:system/libhidl/transport \
android.hardware.wifi@1.0::types.RttDebugInfo
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttDebugType)
#
GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugType.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 \
-randroid.hidl:system/libhidl/transport \
android.hardware.wifi@1.0::types.RttDebugType
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttLciInformation)
#
@@ -3736,25 +3660,6 @@ $(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttChannelMap)
#
GEN := $(intermediates)/android/hardware/wifi/1.0/RttChannelMap.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 \
-randroid.hidl:system/libhidl/transport \
android.hardware.wifi@1.0::types.RttChannelMap
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttConfig)
#
@@ -3774,63 +3679,6 @@ $(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttDebugFormat)
#
GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugFormat.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 \
-randroid.hidl:system/libhidl/transport \
android.hardware.wifi@1.0::types.RttDebugFormat
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttDebugInfo)
#
GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugInfo.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 \
-randroid.hidl:system/libhidl/transport \
android.hardware.wifi@1.0::types.RttDebugInfo
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttDebugType)
#
GEN := $(intermediates)/android/hardware/wifi/1.0/RttDebugType.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 \
-randroid.hidl:system/libhidl/transport \
android.hardware.wifi@1.0::types.RttDebugType
$(GEN): $(LOCAL_PATH)/types.hal
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (RttLciInformation)
#

65
wifi/1.0/IWifiRttController.hal
View File

@@ -82,45 +82,6 @@ interface IWifiRttController {
rangeCancel(CommandId cmdId, vec<MacAddress> addrs)
generates (WifiStatus status);
/**
* API to start publishing the channel map on responder device in an NBD
* cluster.
* Responder device must take this request and schedule broadcasting the
* channel map in a NBD ranging attribute in a Service Discovery Frame.
* DE must automatically remove the ranging attribute from the OTA queue
* after number of Discovery Window specified by numDw where each
* Discovery Window is 512 TUs apart.
*
* @param cmdId command Id to use for this invocation.
* @param params Instance of |RttChannelMap|.
* @return status WifiStatus of the operation.
* Possible status codes:
* |WifiStatusCode.SUCCESS|,
* |WifiStatusCode.ERROR_WIFI_RTT_CONTROLLER_INVALID|,
* |WifiStatusCode.ERROR_INVALID_ARGS|,
* |WifiStatusCode.ERROR_NOT_AVAILABLE|,
* |WifiStatusCode.ERROR_UNKNOWN|
*/
setChannelMap(CommandId cmdId, RttChannelMap params, uint32_t numDw)
generates (WifiStatus status);
/**
* API to clear the channel map on the responder device in an NBD cluster.
* Responder device must cancel future ranging channel request, starting from
* next Discovery Window interval and must also stop broadcasting NBD
* ranging attribute in Service Discovery Frame.
*
* @param cmdId command Id corresponding to the original request.
* @return status WifiStatus of the operation.
* Possible status codes:
* |WifiStatusCode.SUCCESS|,
* |WifiStatusCode.ERROR_WIFI_RTT_CONTROLLER_INVALID|,
* |WifiStatusCode.ERROR_INVALID_ARGS|,
* |WifiStatusCode.ERROR_NOT_AVAILABLE|,
* |WifiStatusCode.ERROR_UNKNOWN|
*/
clearChannelMap(CommandId cmdId) generates (WifiStatus status);
/**
* RTT capabilities of the device.
*
@@ -133,32 +94,6 @@ interface IWifiRttController {
*/
getCapabilities() generates (WifiStatus status, RttCapabilities capabilities);
/**
* Set configuration for debug.
*
* @param type debug level to be set.
* @return status WifiStatus of the operation.
* Possible status codes:
* |WifiStatusCode.SUCCESS|,
* |WifiStatusCode.ERROR_WIFI_RTT_CONTROLLER_INVALID|,
* |WifiStatusCode.ERROR_INVALID_ARGS|,
* |WifiStatusCode.ERROR_NOT_AVAILABLE|,
* |WifiStatusCode.ERROR_UNKNOWN|
*/
setDebugCfg(RttDebugType Type) generates (WifiStatus status);
/**
* Get the debug information.
*
* @return status WifiStatus of the operation.
* Possible status codes:
* |WifiStatusCode.ERROR_WIFI_RTT_CONTROLLER_INVALID|,
* |WifiStatusCode.ERROR_NOT_AVAILABLE|,
* |WifiStatusCode.ERROR_UNKNOWN|
* @return info Instance of |RttDebugInfo|.
*/
getDebugInfo() generates (WifiStatus status, RttDebugInfo info);
/**
* API to configure the LCI(Location civic information).
* Used in RTT Responder mode only.

12
wifi/1.0/default/hidl_struct_util.cpp
View File

@@ -1155,18 +1155,6 @@ bool convertHidlRttConfigToLegacy(const RttConfig& hidl_config,
return true;
}
bool convertHidlRttChannelMapToLegacy(
const RttChannelMap& hidl_map, legacy_hal::wifi_channel_map* legacy_map) {
if (!legacy_map) {
return false;
}
CHECK(hidl_map.availablity.size() == sizeof(legacy_map->availablity));
memcpy(legacy_map->availablity,
hidl_map.availablity.data(),
hidl_map.availablity.size());
return true;
}
bool convertHidlRttLciInformationToLegacy(
const RttLciInformation& hidl_info,
legacy_hal::wifi_lci_information* legacy_info) {

2
wifi/1.0/default/hidl_struct_util.h
View File

@@ -147,8 +147,6 @@ bool convertLegacyNanTransmitFollowupIndToHidl(
// RTT controller conversion methods.
bool convertHidlRttConfigToLegacy(const RttConfig& hidl_config,
legacy_hal::wifi_rtt_config* legacy_config);
bool convertHidlRttChannelMapToLegacy(const RttChannelMap& hidl_map,
legacy_hal::wifi_channel_map* legacy_map);
bool convertHidlRttLciInformationToLegacy(
const RttLciInformation& hidl_info,
legacy_hal::wifi_lci_information* legacy_info);

61
wifi/1.0/default/wifi_rtt_controller.cpp
View File

@@ -83,28 +83,6 @@ Return<void> WifiRttController::rangeCancel(
addrs);
}
Return<void> WifiRttController::setChannelMap(uint32_t cmd_id,
const RttChannelMap& params,
uint32_t num_dw,
setChannelMap_cb hidl_status_cb) {
return validateAndCall(this,
WifiStatusCode::ERROR_WIFI_RTT_CONTROLLER_INVALID,
&WifiRttController::setChannelMapInternal,
hidl_status_cb,
cmd_id,
params,
num_dw);
}
Return<void> WifiRttController::clearChannelMap(
uint32_t cmd_id, clearChannelMap_cb hidl_status_cb) {
return validateAndCall(this,
WifiStatusCode::ERROR_WIFI_RTT_CONTROLLER_INVALID,
&WifiRttController::clearChannelMapInternal,
hidl_status_cb,
cmd_id);
}
Return<void> WifiRttController::getCapabilities(
getCapabilities_cb hidl_status_cb) {
return validateAndCall(this,
@@ -113,22 +91,6 @@ Return<void> WifiRttController::getCapabilities(
hidl_status_cb);
}
Return<void> WifiRttController::setDebugCfg(RttDebugType type,
setDebugCfg_cb hidl_status_cb) {
return validateAndCall(this,
WifiStatusCode::ERROR_WIFI_RTT_CONTROLLER_INVALID,
&WifiRttController::setDebugCfgInternal,
hidl_status_cb,
type);
}
Return<void> WifiRttController::getDebugInfo(getDebugInfo_cb hidl_status_cb) {
return validateAndCall(this,
WifiStatusCode::ERROR_WIFI_RTT_CONTROLLER_INVALID,
&WifiRttController::getDebugInfoInternal,
hidl_status_cb);
}
Return<void> WifiRttController::setLci(uint32_t cmd_id,
const RttLciInformation& lci,
setLci_cb hidl_status_cb) {
@@ -209,35 +171,12 @@ WifiStatus WifiRttController::rangeCancelInternal(
return createWifiStatus(WifiStatusCode::SUCCESS);
}
WifiStatus WifiRttController::setChannelMapInternal(
uint32_t /* cmd_id */,
const RttChannelMap& /* params */,
uint32_t /* num_dw */) {
// TODO implement
return createWifiStatus(WifiStatusCode::SUCCESS);
}
WifiStatus WifiRttController::clearChannelMapInternal(uint32_t /* cmd_id */) {
// TODO implement
return createWifiStatus(WifiStatusCode::SUCCESS);
}
std::pair<WifiStatus, RttCapabilities>
WifiRttController::getCapabilitiesInternal() {
// TODO implement
return {createWifiStatus(WifiStatusCode::SUCCESS), {}};
}
WifiStatus WifiRttController::setDebugCfgInternal(RttDebugType /* type */) {
// TODO implement
return createWifiStatus(WifiStatusCode::SUCCESS);
}
std::pair<WifiStatus, RttDebugInfo> WifiRttController::getDebugInfoInternal() {
// TODO implement
return {createWifiStatus(WifiStatusCode::SUCCESS), {}};
}
WifiStatus WifiRttController::setLciInternal(
uint32_t /* cmd_id */, const RttLciInformation& /* lci */) {
// TODO implement

15
wifi/1.0/default/wifi_rtt_controller.h
View File

@@ -52,16 +52,7 @@ class WifiRttController : public IWifiRttController {
Return<void> rangeCancel(uint32_t cmd_id,
const hidl_vec<hidl_array<uint8_t, 6>>& addrs,
rangeCancel_cb hidl_status_cb) override;
Return<void> setChannelMap(uint32_t cmd_id,
const RttChannelMap& params,
uint32_t num_dw,
setChannelMap_cb hidl_status_cb) override;
Return<void> clearChannelMap(uint32_t cmd_id,
clearChannelMap_cb hidl_status_cb) override;
Return<void> getCapabilities(getCapabilities_cb hidl_status_cb) override;
Return<void> setDebugCfg(RttDebugType type,
setDebugCfg_cb hidl_status_cb) override;
Return<void> getDebugInfo(getDebugInfo_cb hidl_status_cb) override;
Return<void> setLci(uint32_t cmd_id,
const RttLciInformation& lci,
setLci_cb hidl_status_cb) override;
@@ -86,13 +77,7 @@ class WifiRttController : public IWifiRttController {
const std::vector<RttConfig>& rtt_configs);
WifiStatus rangeCancelInternal(
uint32_t cmd_id, const std::vector<hidl_array<uint8_t, 6>>& addrs);
WifiStatus setChannelMapInternal(uint32_t cmd_id,
const RttChannelMap& params,
uint32_t num_dw);
WifiStatus clearChannelMapInternal(uint32_t cmd_id);
std::pair<WifiStatus, RttCapabilities> getCapabilitiesInternal();
WifiStatus setDebugCfgInternal(RttDebugType type);
std::pair<WifiStatus, RttDebugInfo> getDebugInfoInternal();
WifiStatus setLciInternal(uint32_t cmd_id, const RttLciInformation& lci);
WifiStatus setLcrInternal(uint32_t cmd_id, const RttLcrInformation& lcr);
std::pair<WifiStatus, RttResponder> getResponderInfoInternal();

46
wifi/1.0/types.hal
View File

@@ -2182,13 +2182,6 @@ struct RttResult {
WifiInformationElement lcr;
};
/**
* NBD ranging channel map.
*/
struct RttChannelMap {
WifiChannelInMhz[32] availablity;
};
/**
* RTT Capabilities.
*/
@@ -2230,45 +2223,6 @@ struct RttCapabilities {
uint8_t mcVersion;
};
/**
* Debugging definitions.
*/
enum RttDebugType : uint32_t {
DISABLE,
LOG,
PROTO,
BURST,
ACCURACY,
LOGDETAIL,
};
enum RttDebugFormat : uint32_t {
TXT,
BINARY,
};
/**
* Debug info.
*/
struct RttDebugInfo {
/**
* Version info.
*/
uint32_t version;
/**
* Debug data type.
*/
RttDebugType type;
/**
* Debug data format.
*/
RttDebugFormat format;
/**
* Debug data content.
*/
vec<uint8_t> data;
};
/**
* Structs for setting LCI/LCR information to be provided to a requestor.
*/