From b3b31174c61e38a970b956cb50cb66cd1903ca9b Mon Sep 17 00:00:00 2001 From: Jerry Lee Date: Mon, 11 May 2015 15:06:02 -0700 Subject: Wifi HAL fix for 64bit addressing 1) Bug: 20950010 2) minor wifi HAL event enum fix which breaks loghandler Change-Id: I48a052d703e3f3b14b47aedf9faaa53ebbfa0300 Signed-off-by: Jerry Lee --- bcmdhd/wifi_hal/common.h | 4 ++-- bcmdhd/wifi_hal/wifi_logger.cpp | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'bcmdhd/wifi_hal') diff --git a/bcmdhd/wifi_hal/common.h b/bcmdhd/wifi_hal/common.h index ac5af91..3259f62 100644 --- a/bcmdhd/wifi_hal/common.h +++ b/bcmdhd/wifi_hal/common.h @@ -112,9 +112,9 @@ typedef enum { GSCAN_EVENT_COMPLETE_SCAN, GSCAN_EVENT_HOTLIST_RESULTS_LOST, GSCAN_EVENT_EPNO_EVENT, - GSCAN_EVENT_ANQPO_HOTSPOT_MATCH, GOOGLE_DEBUG_RING_EVENT, - GOOGLE_DEBUG_MEM_DUMP_EVENT + GOOGLE_DEBUG_MEM_DUMP_EVENT, + GSCAN_EVENT_ANQPO_HOTSPOT_MATCH } WIFI_EVENT; typedef void (*wifi_internal_event_handler) (wifi_handle handle, int events); diff --git a/bcmdhd/wifi_hal/wifi_logger.cpp b/bcmdhd/wifi_hal/wifi_logger.cpp index 58aee6f..b78192c 100644 --- a/bcmdhd/wifi_hal/wifi_logger.cpp +++ b/bcmdhd/wifi_hal/wifi_logger.cpp @@ -618,8 +618,9 @@ public: ALOGE("Failed to put get memory dump request; result = %d", result); return result; } - result = request.put_u32(LOGGER_ATTRIBUTE_FW_DUMP_DATA, - (uint32_t)(mBuff+buffer_size)); + + result = request.put_u64(LOGGER_ATTRIBUTE_FW_DUMP_DATA, + (uint64_t)(mBuff+buffer_size)); if (result != WIFI_SUCCESS) { ALOGE("Failed to put get memory dump request; result = %d", result); return result; @@ -724,7 +725,8 @@ public: ALOGE("Failed to put get memory dump request; result = %d", result); return result; } - result = request.put_u32(LOGGER_ATTRIBUTE_FW_DUMP_DATA, (uint32_t)mBuff); + + result = request.put_u64(LOGGER_ATTRIBUTE_FW_DUMP_DATA, (uint64_t)mBuff); if (result != WIFI_SUCCESS) { ALOGE("Failed to put get memory dump request; result = %d", result); return result; -- cgit v1.1 From 8413100c292c64a6562cd975689652cd8aeebfe3 Mon Sep 17 00:00:00 2001 From: Pierre Vandwalle Date: Mon, 11 May 2015 21:58:12 -0700 Subject: fix reseting pno list Change-Id: If5b93c225783c0417b3aadfa41a92782a3669128 --- bcmdhd/wifi_hal/gscan.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'bcmdhd/wifi_hal') diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp index 2aa686b..3ece5bf 100644 --- a/bcmdhd/wifi_hal/gscan.cpp +++ b/bcmdhd/wifi_hal/gscan.cpp @@ -1565,22 +1565,19 @@ wifi_error wifi_reset_epno_list(wifi_request_id id, wifi_interface_handle iface) cmd->releaseRef(); return WIFI_SUCCESS; } - return WIFI_ERROR_INVALID_ARGS; } wifi_error wifi_set_epno_list(wifi_request_id id, wifi_interface_handle iface, int num_networks, wifi_epno_network *networks, wifi_epno_handler handler) { - - if (num_networks == 0 || networks == NULL) { - return wifi_reset_epno_list(id, iface); - } - wifi_handle handle = getWifiHandle(iface); ePNOCommand *cmd = new ePNOCommand(iface, id, num_networks, networks, handler); wifi_register_cmd(handle, id, cmd); + if (num_networks == 0 || networks == NULL) { + return wifi_reset_epno_list(id, iface); + } return (wifi_error)cmd->start(); } -- cgit v1.1 From f060fbe12899e67fc4c491af52718ef5e5f1e3ee Mon Sep 17 00:00:00 2001 From: Pierre Vandwalle Date: Tue, 12 May 2015 11:31:16 -0700 Subject: fix to enable lazy roam Change-Id: Id8a2bd78f924d06ebfe7c3f29758f836d4eff48f --- bcmdhd/wifi_hal/gscan.cpp | 11 +++++------ bcmdhd/wifi_hal/wifi_hal.cpp | 5 +++++ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'bcmdhd/wifi_hal') diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp index 3ece5bf..8acc498 100644 --- a/bcmdhd/wifi_hal/gscan.cpp +++ b/bcmdhd/wifi_hal/gscan.cpp @@ -1683,7 +1683,7 @@ public: return result; } - nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA); + nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA); result = request.put_u32(GSCAN_ATTRIBUTE_A_BAND_BOOST_THRESHOLD, mParams->A_band_boost_threshold); if (result < 0) { @@ -1773,16 +1773,15 @@ public: nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA); - result = request.put_u32(GSCAN_ATTRIBUTE_LAZY_ROAM_ENABLE, mEnable); - if (result < 0) { - return result; - } + result = request.put_u32(GSCAN_ATTRIBUTE_LAZY_ROAM_ENABLE, mEnable); + if (result < 0) { + return result; + } request.attr_end(data); return result; } int start() { - ALOGI("Enabling Lazy roam"); WifiRequest request(familyId(), ifaceId()); int result = createRequest(request); if (result < 0) { diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp index 1d94e71..a1d37e1 100644 --- a/bcmdhd/wifi_hal/wifi_hal.cpp +++ b/bcmdhd/wifi_hal/wifi_hal.cpp @@ -139,6 +139,11 @@ wifi_error init_wifi_vendor_hal_func_table(wifi_hal_fn *fn) fn->wifi_get_logger_supported_feature_set = wifi_get_logger_supported_feature_set; fn->wifi_get_ring_data = wifi_get_ring_data; fn->wifi_get_driver_version = wifi_get_driver_version; + fn->wifi_set_ssid_white_list = wifi_set_ssid_white_list; + fn->wifi_set_gscan_roam_params = wifi_set_gscan_roam_params; + fn->wifi_set_bssid_preference = wifi_set_bssid_preference; + fn->wifi_set_bssid_blacklist = wifi_set_bssid_blacklist; + fn->wifi_enable_lazy_roam = wifi_enable_lazy_roam; return WIFI_SUCCESS; } -- cgit v1.1