[9610] wlbt: Fix strange compilation error on upstream

[GitHub/LineageOS/android_hardware_samsung_slsi_scsc_wifibt_wifi_hal.git] / wifi_logger.cpp

diff --git a/wifi_logger.cpp b/wifi_logger.cpp
index 8e5f420f5b6dfc32eb906b335348cbb052cfe875..4ab5d740a14aeb3dbf32e54a56f3bfc1456d1bdd 100755 (executable)
--- a/wifi_logger.cpp
+++ b/wifi_logger.cpp
@@ -27,7 +27,7 @@
 #include "common.h"\r
 #include "cpp_bindings.h"\r
 \r
-using namespace android;\r
+/* using namespace android; */\r
 \r
 typedef enum {\r
     ENHANCE_LOGGER_START_LOGGING = ANDROID_NL80211_SUBCMD_DEBUG_RANGE_START,\r
@@ -380,9 +380,8 @@ public:
             case GET_FEATURE:\r
             {\r
                 void *data = reply.get_vendor_data();\r
-                int len = reply.get_vendor_data_len();\r
 \r
-                ALOGD("len = %d, expected len = %d", len, sizeof(unsigned int));\r
+                ALOGD("len = %d, expected len = %lu", reply.get_vendor_data_len(), (unsigned long)sizeof(unsigned int));\r
                 memcpy(mSupport, data, sizeof(unsigned int));\r
                 break;\r
             }\r
@@ -677,7 +676,6 @@ public:
     }\r
 \r
     virtual int handleEvent(WifiEvent& event) {\r
-        wifi_ring_buffer_id ring_id;\r
         char *buffer = NULL;\r
         int buffer_size = 0;\r
 \r
@@ -944,7 +942,7 @@ public:
         for (nl_iterator it(vendor_data); it.has_next(); it.next()) {\r
             if (it.get_type() == ENHANCE_LOGGER_ATTRIBUTE_PKT_FATE_NUM) {\r
                 *mNoProvidedFates = it.get_u32();\r
-                ALOGI("No: of pkt fates provided is %d\n", *mNoProvidedFates);\r
+                ALOGI("No: of pkt fates provided is %zu\n", *mNoProvidedFates);\r
             } else {\r
                 ALOGE("Ignoring invalid attribute type = %d, size = %d\n",\r
                         it.get_type(), it.get_len());\r
@@ -1002,19 +1000,19 @@ class MemoryDumpCommand: public WifiCommand
     int mBuffSize;\r
     char *mBuff;\r
     GetCmdType mType;\r
-       \r
+\r
 public:\r
     MemoryDumpCommand(wifi_interface_handle iface, wifi_firmware_memory_dump_handler handler, GetCmdType cmdtype )\r
         : WifiCommand(iface, 0), mHandler(handler), mBuffSize(0), mBuff(NULL), mType(cmdtype)\r
-    { \r
-       memset(&mHandler,0,sizeof(wifi_firmware_memory_dump_handler));\r
-       }\r
+    {\r
+        memset(&mcallback, 0, sizeof(wifi_driver_memory_dump_callbacks));\r
+    }\r
 \r
     MemoryDumpCommand(wifi_interface_handle iface, wifi_driver_memory_dump_callbacks callback, GetCmdType cmdtype)\r
         : WifiCommand(iface, 0), mcallback(callback), mBuffSize(0), mBuff(NULL), mType(cmdtype)\r
     {\r
-       memset(&mcallback,0,sizeof(wifi_driver_memory_dump_callbacks));\r
-       }\r
+        memset(&mHandler, 0, sizeof(wifi_firmware_memory_dump_handler));\r
+    }\r
 \r
      int createRequest(WifiRequest &request) {\r
         int result;\r
@@ -1126,6 +1124,7 @@ public:
                            it.get_type(), it.get_len());\r
                      }\r
                  }\r
+                 break;\r
             case GET_DRIVER_DUMP :\r
                  for (nl_iterator it(vendor_data); it.has_next(); it.next()) {\r
                      if (it.get_type() == ENHANCE_LOGGER_ATTRIBUTE_DRIVER_DUMP_LEN) {\r
@@ -1174,6 +1173,17 @@ public:
                            it.get_type(), it.get_len());\r
                      }\r
                  }\r
+                 break;\r
+            case GET_FW_VER:\r
+            case GET_DRV_VER:\r
+            case GET_RING_DATA:\r
+            case GET_RING_STATUS:\r
+            case GET_FEATURE:\r
+            case START_RING_LOG:\r
+            default:\r
+                   {\r
+                          ALOGW("Ignoring GetCmdType %d \n", mType);\r
+                   }\r
             }\r
         return NL_OK;\r
     }\r