diff options
| author | xin He <xinhe@google.com> | 2015-05-13 16:59:42 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2015-05-13 16:59:43 +0000 |
| commit | 22be4eab58f47ab54ee84cc3c0d375fd011edc64 (patch) | |
| tree | b2ea77472d15de3b2507689bd24cb5ab059d943c /bcmdhd | |
| parent | dee2763112928ba86e084ed0551c05d1d94d287e (diff) | |
| parent | b3b31174c61e38a970b956cb50cb66cd1903ca9b (diff) | |
| download | hardware_broadcom_wlan-22be4eab58f47ab54ee84cc3c0d375fd011edc64.zip hardware_broadcom_wlan-22be4eab58f47ab54ee84cc3c0d375fd011edc64.tar.gz hardware_broadcom_wlan-22be4eab58f47ab54ee84cc3c0d375fd011edc64.tar.bz2 | |
Merge "Wifi HAL fix for 64bit addressing" into m-wireless-dev
Diffstat (limited to 'bcmdhd')
| -rw-r--r-- | bcmdhd/wifi_hal/common.h | 4 | ||||
| -rw-r--r-- | bcmdhd/wifi_hal/wifi_logger.cpp | 8 |
2 files changed, 7 insertions, 5 deletions
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; |