summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinit Deshpande <vinitd@google.com>2015-03-14 22:10:54 -0700
committerVinit Deshpande <vinitd@google.com>2015-03-14 22:10:54 -0700
commit7012fe0f5183b622339addd93ad143e50e1fe64e (patch)
tree4797e91e9ea7d56cc7d80068d4f68cad12560420
parent62fdbb6418aa2808007dd8cdd4e2b306637dbb91 (diff)
parent9f1683255c912b87b49ef7f48aa04f92c5a5db83 (diff)
downloadhardware_libhardware_legacy-7012fe0f5183b622339addd93ad143e50e1fe64e.zip
hardware_libhardware_legacy-7012fe0f5183b622339addd93ad143e50e1fe64e.tar.gz
hardware_libhardware_legacy-7012fe0f5183b622339addd93ad143e50e1fe64e.tar.bz2
am "small fixes to gscan interface"
merged from goog/mirror-m-wireless-internal-release 9f16832 small fixes to gscan interface
-rw-r--r--include/hardware_legacy/gscan.h10
-rw-r--r--include/hardware_legacy/wifi_logger.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/include/hardware_legacy/gscan.h b/include/hardware_legacy/gscan.h
index 85f79c6..fa4b46f 100644
--- a/include/hardware_legacy/gscan.h
+++ b/include/hardware_legacy/gscan.h
@@ -190,7 +190,7 @@ typedef struct {
unsigned num_results, wifi_scan_result *results);
void (*on_hotlist_ssid_lost)(wifi_request_id id,
unsigned num_results, wifi_scan_result *results);
-} wifi_hotlist_ssid_found_handler;
+} wifi_hotlist_ssid_handler;
typedef struct {
char ssid[32+1]; // SSID
@@ -208,7 +208,7 @@ typedef struct {
/* Set the SSID Hotlist */
wifi_error wifi_set_ssid_hotlist(wifi_request_id id, wifi_interface_handle iface,
- wifi_ssid_hotlist_params params, wifi_hotlist_ssid_found_handler handler);
+ wifi_ssid_hotlist_params params, wifi_hotlist_ssid_handler handler);
/* Clear the SSID Hotlist */
wifi_error wifi_reset_ssid_hotlist(wifi_request_id id, wifi_interface_handle iface);
@@ -394,18 +394,18 @@ wifi_error wifi_set_gscan_roam_params(wifi_request_id id, wifi_interface_handle
/**
* Enable/Disable "Lazy" roam
*/
-wifi_error wifi_set_lazy_roam(wifi_request_id id, wifi_interface_handle iface, int enable);
+wifi_error wifi_enable_lazy_roam(wifi_request_id id, wifi_interface_handle iface, int enable);
/**
* Per BSSID preference
*/
typedef struct {
char bssid[6];
- int rssi_modifier; // modifier applied to the RSSI of the BSSIDfor the purpose of comparing
+ int rssi_modifier; // modifier applied to the RSSI of the BSSID for the purpose of comparing
// it with other roam candidate
} wifi_bssid_preference;
-wifi_error wifi_set_lazy_roam(wifi_request_id id, wifi_interface_handle iface,
+wifi_error wifi_set_bssid_preference(wifi_request_id id, wifi_interface_handle iface,
int num_bssid, wifi_bssid_preference *prefs);
diff --git a/include/hardware_legacy/wifi_logger.h b/include/hardware_legacy/wifi_logger.h
index f24545c..5f4fdd4 100644
--- a/include/hardware_legacy/wifi_logger.h
+++ b/include/hardware_legacy/wifi_logger.h
@@ -199,7 +199,7 @@ wifi_error wifi_get_driver_version(wifi_request_id id,
/* api to collect driver records */
wifi_error wifi_get_ringdata(wifi_request_id id,
- wifi_interface_handle iface, wifi_ring_buffer_id ring_id, char * buffer, int buffer_size, wifi_ring_buffer_status *status);
+ wifi_interface_handle iface, wifi_ring_buffer_id ring_id);
/* Feature set */