[9610] wlbt: Fix compilation erros for Android Q
authorTarun Karela <t.karela@samsung.com>
Wed, 3 Apr 2019 19:29:30 +0000 (20:29 +0100)
committerTarun Karela <t.karela@samsung.com>
Fri, 26 Apr 2019 12:26:03 +0000 (13:26 +0100)
Androi Q specific compilation error

Change-Id: Ia00cf8ad977c03520954ef0801e4cac59c5fd6a4
SCSC-Bug-Id: SSB-50778
Signed-off-by: Tarun Karela <t.karela@samsung.com>
rtt.cpp
wifi_logger.cpp
wifi_nan.cpp

diff --git a/rtt.cpp b/rtt.cpp
index 9e8a67fd5dc1cc45f5d040ca587e3e5f7c3303c8..2c9114d950a8f28758667b52dcbbf5bc97c56076 100755 (executable)
--- a/rtt.cpp
+++ b/rtt.cpp
@@ -132,7 +132,7 @@ static const strmap_entry_t err_info[] = {
 }*/
 class RttCommand : public WifiCommand
 {
-       int rtt_id;
+    int rtt_id;
     unsigned numTargetDevice;
     int mCompleted;
     int currentIdx;
@@ -416,11 +416,11 @@ public:
                                   } else if (nl_nested_itr.get_type() == SLSI_RTT_EVENT_ATTR_SUCCESS_NUM) {
                                          rtt_result->success_number = (unsigned)nl_nested_itr.get_u8();
                                   } else if (nl_nested_itr.get_type() == SLSI_RTT_EVENT_ATTR_NUM_PER_BURST_PEER) {
-                                         rtt_result->number_per_burst_peer = (byte)nl_nested_itr.get_u8();
+                                         rtt_result->number_per_burst_peer = (unsigned char)nl_nested_itr.get_u8();
                                   } else if (nl_nested_itr.get_type() == SLSI_RTT_EVENT_ATTR_STATUS) {
                                          rtt_result->status = (wifi_rtt_status)nl_nested_itr.get_u16();
                                   } else if (nl_nested_itr.get_type() == SLSI_RTT_EVENT_ATTR_RETRY_AFTER_DURATION) {
-                                         rtt_result->retry_after_duration = (byte)nl_nested_itr.get_u8();
+                                         rtt_result->retry_after_duration = (unsigned char)nl_nested_itr.get_u8();
                                   } else if (nl_nested_itr.get_type() == SLSI_RTT_EVENT_ATTR_TYPE) {
                                          rtt_result->type = (wifi_rtt_type)nl_nested_itr.get_u16();
                                   } else if (nl_nested_itr.get_type() == SLSI_RTT_EVENT_ATTR_RSSI) {
index 0d8eed2eef5109e5f4d0b73394c862ee09e0c089..4a3042232987e289fb2b0bff0322f2e6f05e7c14 100755 (executable)
@@ -1124,6 +1124,7 @@ public:
                            it.get_type(), it.get_len());\r
                      }\r
                  }\r
+               [[fallthrough]];\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
@@ -1172,6 +1173,7 @@ public:
                            it.get_type(), it.get_len());\r
                      }\r
                  }\r
+                [[fallthrough]];\r
            case GET_FW_VER:\r
             case GET_DRV_VER:\r
             case GET_RING_DATA:\r
index e5a60d1e8a5629b61e1f191dda56fe4a5c22187a..69105496e83eb2ceb45ce1a155728d6f76b0db66 100755 (executable)
@@ -475,6 +475,7 @@ class NanCommand : public WifiCommand {
                         break;
                     }
                 }
+               [[fallthrough]];
             case NAN_EVT_ATTR_MATCH_CLUSTER_ATTRIBUTE_LEN:
                 ind.cluster_attribute_len = nl_itr.get_u8();
                 break;