From: Etan Cohen <etancohen@google.com>
Date: Tue, 31 Mar 2015 01:17:34 +0000 (-0700)
Subject: Merge commit '4c50959717fcf4b5bf10721b4dda0d2c2f423eaf' into merge
X-Git-Tag: android-x86-6.0-r1~26^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=546cfd47e74d4a537329ae32db7cf8d7d929855c;p=android-x86%2Fhardware-libhardware_legacy.git

Merge commit '4c50959717fcf4b5bf10721b4dda0d2c2f423eaf' into merge
---

546cfd47e74d4a537329ae32db7cf8d7d929855c
diff --cc include/hardware_legacy/wifi_logger.h
index 089f138,fb4edbb..69326da
--- a/include/hardware_legacy/wifi_logger.h
+++ b/include/hardware_legacy/wifi_logger.h
@@@ -279,18 -288,20 +288,19 @@@ wifi_error wifi_get_firmware_version(wi
  
  /* api to collect a driver version string */
  wifi_error wifi_get_driver_version(wifi_request_id id,
-         wifi_interface_handle iface, char *buffer, int buffer_size);
- 
- 
- /* api to collect driver records */
- wifi_error wifi_get_ringdata(wifi_request_id id,
-         wifi_interface_handle iface, wifi_ring_buffer_id ring_id);
+         wifi_interface_handle iface, char **buffer, int *buffer_size);
  
 -
  /* Feature set */
- #define WIFI_LOGGER_MEMORY_DUMP_SUPPORTED 1
- #define WIFI_LOGGER_PER_PACKET_TX_RX_STATUS_SUPPORTED 2
- 
- wifi_error wifi_get_logger_supported_feature_set(wifi_interface_handle handle, unsigned int *support);
+ enum {
+     WIFI_LOGGER_MEMORY_DUMP_SUPPORTED = (1 << (0)), // Memory dump of FW
+     WIFI_LOGGER_PER_PACKET_TX_RX_STATUS_SUPPORTED = (1 << (1)), // PKT status
+     WIFI_LOGGER_CONNECT_EVENT_SUPPORTED = (1 << (2)), // Connectivity event
+     WIFI_LOGGER_POWER_EVENT_SUPPORTED = (1 << (3)), // POWER of Driver
+     WIFI_LOGGER_WAKE_LOCK_SUPPORTED = (1 << (4)), // WAKE LOCK of Driver
+     WIFI_LOGGER_VERBOSE_SUPPORTED = (1 << (5)), // verbose log of FW
+     WIFI_LOGGER_WATCHDOG_TIMER_SUPPORTED = (1 << (6)) // monitor the health of FW
+ };
+ wifi_error wifi_get_logger_supported_feature_set(wifi_request_id id, wifi_interface_handle iface, unsigned int *support);
  
  
  #ifdef __cplusplus