tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[AWARE] Update cm HIDL to use mm HAL

Browse source 
Legacy HAL updated to use mm. The current HIDL is (still at) cm.
Add conversions.

Bug: 69428593
Test: integration tests passing (but ranging is still pending fw)
Change-Id: Ia431fcebedf5a1c66847c2f1627923b5704fece0
This commit is contained in:
Etan Cohen 2017-12-14 18:12:04 -08:00
parent b7c67a68a6
commit 7b8c5d78c8
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
wifi/1.2/default/hidl_struct_util.cpp
View file

@ -1250,10 +1250,10 @@ bool convertHidlNanPublishRequestToLegacy(
hidl_request.baseConfigs.rangingIntervalMsec;
legacy_request->ranging_cfg.config_ranging_indications =
hidl_request.baseConfigs.configRangingIndications;
legacy_request->ranging_cfg.distance_ingress_cm =
hidl_request.baseConfigs.distanceIngressCm;
legacy_request->ranging_cfg.distance_egress_cm =
hidl_request.baseConfigs.distanceEgressCm;
legacy_request->ranging_cfg.distance_ingress_mm =
hidl_request.baseConfigs.distanceIngressCm * 10;
legacy_request->ranging_cfg.distance_egress_mm =
hidl_request.baseConfigs.distanceEgressCm * 10;
legacy_request->ranging_auto_response =
hidl_request.baseConfigs.rangingRequired
? legacy_hal::NAN_RANGING_AUTO_RESPONSE_ENABLE
@ -1402,10 +1402,10 @@ bool convertHidlNanSubscribeRequestToLegacy(
hidl_request.baseConfigs.rangingIntervalMsec;
legacy_request->ranging_cfg.config_ranging_indications =
hidl_request.baseConfigs.configRangingIndications;
legacy_request->ranging_cfg.distance_ingress_cm =
hidl_request.baseConfigs.distanceIngressCm;
legacy_request->ranging_cfg.distance_egress_cm =
hidl_request.baseConfigs.distanceEgressCm;
legacy_request->ranging_cfg.distance_ingress_mm =
hidl_request.baseConfigs.distanceIngressCm * 10;
legacy_request->ranging_cfg.distance_egress_mm =
hidl_request.baseConfigs.distanceEgressCm * 10;
legacy_request->ranging_auto_response =
hidl_request.baseConfigs.rangingRequired
? legacy_hal::NAN_RANGING_AUTO_RESPONSE_ENABLE
@ -1847,7 +1847,7 @@ bool convertLegacyNanMatchIndToHidl(const legacy_hal::NanMatchInd& legacy_ind,
hidl_ind->peerRequiresRanging = legacy_ind.peer_sdea_params.ranging_state ==
legacy_hal::NAN_RANGING_ENABLE;
hidl_ind->rangingMeasurementInCm =
legacy_ind.range_info.range_measurement_cm;
legacy_ind.range_info.range_measurement_mm / 10;
hidl_ind->rangingIndicationType = legacy_ind.range_info.ranging_event_type;
return true;