diff options
| author | Wei Wang <weiwa@google.com> | 2016-04-11 20:23:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-11 20:23:11 +0000 |
| commit | 0a5a892506f1d23fac8de2c79d7e36cb0e5f3831 (patch) | |
| tree | 4da1b22303eebc568e62718b0e842fcd2eb45ebc | |
| parent | 8761318ed126a64715fba2c456e53ad8dc345f57 (diff) | |
| parent | 88aa64b95e2de18380721bda4e05f128cd5107a7 (diff) | |
| download | libhardware_legacy-0a5a892506f1d23fac8de2c79d7e36cb0e5f3831.tar.gz | |
Merge "Wifi-HAL: RTT API Enhancement" into nyc-dev
| -rw-r--r-- | include/hardware_legacy/rtt.h | 20 | ||||
| -rw-r--r-- | include/hardware_legacy/wifi_hal.h | 6 |
2 files changed, 17 insertions, 9 deletions
diff --git a/include/hardware_legacy/rtt.h b/include/hardware_legacy/rtt.h index 1077858..65c6e18 100644 --- a/include/hardware_legacy/rtt.h +++ b/include/hardware_legacy/rtt.h @@ -139,8 +139,8 @@ typedef struct { wifi_timestamp ts; // time of the measurement (in microseconds since boot) int burst_duration; // in ms, actual time taken by the FW to finish one burst // measurement. Applies to 1-sided and 2-sided RTT. - int negotiated_burst_num; // Number of bursts allowed by the responder. Applies - // to 2-sided RTT only. + int negotiated_burst_num; // Number of bursts allowed by the responder. Applies + // to 2-sided RTT only. wifi_information_element *LCI; // for 11mc only wifi_information_element *LCR; // for 11mc only } wifi_rtt_result; @@ -274,9 +274,18 @@ wifi_error wifi_set_lcr(wifi_request_id id, wifi_interface_handle iface, wifi_lcr_information *lcr); /** - * Get available WiFi channel to enable RTT responder on. + * RTT Responder information */ -wifi_error wifi_rtt_get_available_channel(wifi_interface_handle iface, wifi_channel_info* channel); +typedef struct { + wifi_channel_info channel; + wifi_rtt_preamble preamble; +} wifi_rtt_responder; + +/** + * Get RTT responder information e.g. WiFi channel to enable responder on. + */ +wifi_error wifi_rtt_get_responder_info(wifi_interface_handle iface, + wifi_rtt_responder *responder_info); /** * Enable RTT responder mode. @@ -286,7 +295,7 @@ wifi_error wifi_rtt_get_available_channel(wifi_interface_handle iface, wifi_chan */ wifi_error wifi_enable_responder(wifi_request_id id, wifi_interface_handle iface, wifi_channel_info channel_hint, unsigned max_duration_seconds, - wifi_channel_info* channel_used); + wifi_rtt_responder *responder_info); /** * Disable RTT responder mode. @@ -294,4 +303,3 @@ wifi_error wifi_enable_responder(wifi_request_id id, wifi_interface_handle iface wifi_error wifi_disable_responder(wifi_request_id id, wifi_interface_handle iface); #endif - diff --git a/include/hardware_legacy/wifi_hal.h b/include/hardware_legacy/wifi_hal.h index 3622eda..264d8f8 100644 --- a/include/hardware_legacy/wifi_hal.h +++ b/include/hardware_legacy/wifi_hal.h @@ -252,11 +252,11 @@ typedef struct { wifi_error (* wifi_rtt_range_cancel)(wifi_request_id, wifi_interface_handle, unsigned, mac_addr[]); wifi_error (* wifi_get_rtt_capabilities)(wifi_interface_handle, wifi_rtt_capabilities *); - wifi_error (* wifi_rtt_get_available_channel)(wifi_interface_handle iface, - wifi_channel_info* channel); + wifi_error (* wifi_rtt_get_responder_info)(wifi_interface_handle iface, + wifi_rtt_responder *responder_info); wifi_error (* wifi_enable_responder)(wifi_request_id id, wifi_interface_handle iface, wifi_channel_info channel_hint, unsigned max_duration_seconds, - wifi_channel_info* channel_used); + wifi_rtt_responder *responder_info); wifi_error (* wifi_disable_responder)(wifi_request_id id, wifi_interface_handle iface); wifi_error (* wifi_set_nodfs_flag)(wifi_interface_handle, u32); wifi_error (* wifi_start_logging)(wifi_interface_handle, u32, u32, u32, u32, char *); |