syna wifi hal: Fix typos am: f0a8aa19c5 am: b1048f0454

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/synaptics/wlan/+/23275521

Change-Id: I3ac254d286e51b12e8679b0464eaa901d7cf034d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5 files changed, 24 insertions, 22 deletions

diff --git a/synadhd/wifi_hal/gscan.cpp b/synadhd/wifi_hal/gscan.cpp
index 995c989..16772ff 100755
--- a/synadhd/wifi_hal/gscan.cpp
+++ b/synadhd/wifi_hal/gscan.cpp
@@ -209,7 +209,7 @@ class GetCapabilitiesCommand : public WifiCommand
     }
 
     virtual int create() {
-        ALOGV("Creating message to get scan capablities; iface = %d", mIfaceInfo->id);
+        ALOGV("Creating message to get scan capabilities; iface = %d", mIfaceInfo->id);
 
         int ret = mMsg.create(GOOGLE_OUI, mRequesttype);
         if (ret < 0) {
diff --git a/synadhd/wifi_hal/nan.cpp b/synadhd/wifi_hal/nan.cpp
index 88d0655..8536564 100755
--- a/synadhd/wifi_hal/nan.cpp
+++ b/synadhd/wifi_hal/nan.cpp
@@ -305,7 +305,7 @@ typedef enum {
     NAN_REQUEST_CONFIG                          = 8,
     NAN_REQUEST_TCA                             = 9,
     NAN_REQUEST_EVENT_CHECK                     = 10,
-    NAN_REQUEST_GET_CAPABILTIES                 = 11,
+    NAN_REQUEST_GET_CAPABILITIES                = 11,
     NAN_DATA_PATH_IFACE_CREATE                  = 12,
     NAN_DATA_PATH_IFACE_DELETE                  = 13,
     NAN_DATA_PATH_INIT_REQUEST                  = 14,
@@ -634,7 +634,7 @@ class NanDiscEnginePrimitive : public WifiCommand
         } else if (mType == NAN_REQUEST_TRANSMIT_FOLLOWUP) {
             return createTransmitFollowupRequest(request,
                     (NanTransmitFollowupRequest *)mParams);
-        } else if (mType == NAN_REQUEST_GET_CAPABILTIES) {
+        } else if (mType == NAN_REQUEST_GET_CAPABILITIES) {
             return getCapabilitiesRequest(request);
         } else {
             ALOGE("%s Unknown Nan request\n", __func__);
@@ -3678,7 +3678,7 @@ static const char *NanCmdToString(int cmd)
             C2S(NAN_REQUEST_CONFIG)
             C2S(NAN_REQUEST_TCA)
             C2S(NAN_REQUEST_EVENT_CHECK)
-            C2S(NAN_REQUEST_GET_CAPABILTIES)
+            C2S(NAN_REQUEST_GET_CAPABILITIES)
             C2S(NAN_DATA_PATH_IFACE_CREATE)
             C2S(NAN_DATA_PATH_IFACE_DELETE)
             C2S(NAN_DATA_PATH_INIT_REQUEST)
@@ -4550,9 +4550,9 @@ wifi_error nan_get_capabilities(transaction_id id, wifi_interface_handle iface)
 {
     wifi_error ret = WIFI_SUCCESS;
     wifi_handle handle = getWifiHandle(iface);
-    ALOGI("Get Nan Capabilties, id=%d, halHandle=%p\n", id, handle);
+    ALOGI("Get Nan Capabilities, id=%d, halHandle=%p\n", id, handle);
 
-    NanRequestType cmdType = NAN_REQUEST_GET_CAPABILTIES;
+    NanRequestType cmdType = NAN_REQUEST_GET_CAPABILITIES;
     NanDiscEnginePrimitive *cmd = new NanDiscEnginePrimitive(iface, id, NULL, cmdType);
     NULL_CHECK_RETURN(cmd, "memory allocation failure", WIFI_ERROR_OUT_OF_MEMORY);
 
diff --git a/synadhd/wifi_hal/rtt.cpp b/synadhd/wifi_hal/rtt.cpp
index 6bb0a49..b3791a2 100644
--- a/synadhd/wifi_hal/rtt.cpp
+++ b/synadhd/wifi_hal/rtt.cpp
@@ -81,7 +81,7 @@ typedef enum {
     RTT_ATTRIBUTE_RESULTS_PER_TARGET        = 31,
     RTT_ATTRIBUTE_RESULT_CNT                = 32,
     RTT_ATTRIBUTE_RESULT                    = 33,
-    RTT_ATTRIBUTE_RESUTL_DETAIL             = 34,
+    RTT_ATTRIBUTE_RESULT_DETAIL             = 34,
     /* Add any new RTT_ATTRIBUTE prior to RTT_ATTRIBUTE_MAX */
     RTT_ATTRIBUTE_MAX
 } RTT_ATTRIBUTE;
@@ -107,7 +107,7 @@ typedef struct dot11_rm_ie dot11_rm_ie_t;
 static const strmap_entry_t err_info[] = {
     {RTT_STATUS_SUCCESS, String8("Success")},
     {RTT_STATUS_FAILURE, String8("Failure")},
-    {RTT_STATUS_FAIL_NO_RSP, String8("No reponse")},
+    {RTT_STATUS_FAIL_NO_RSP, String8("No response")},
     {RTT_STATUS_FAIL_INVALID_TS, String8("Invalid Timestamp")},
     {RTT_STATUS_FAIL_PROTOCOL, String8("Protocol error")},
     {RTT_STATUS_FAIL_REJECTED, String8("Rejected")},
@@ -148,7 +148,7 @@ public:
     }
 
     virtual int create() {
-        ALOGD("Creating message to get scan capablities; iface = %d", mIfaceInfo->id);
+        ALOGD("Creating message to get scan capabilities; iface = %d", mIfaceInfo->id);
 
         int ret = mMsg.create(GOOGLE_OUI, RTT_SUBCMD_GETCAPABILITY);
         if (ret < 0) {
@@ -556,7 +556,7 @@ public:
                 for (nl_iterator it2(it.get()); it2.has_next(); it2.next()) {
                     if (it2.get_type() == RTT_ATTRIBUTE_TARGET_MAC) {
                         memcpy(bssid, it2.get_data(), sizeof(mac_addr));
-                        ALOGI("retrived target mac : %02x:%02x:%02x:%02x:%02x:%02x\n",
+                        ALOGI("retrieved target mac : %02x:%02x:%02x:%02x:%02x:%02x\n",
                                 bssid[0],
                                 bssid[1],
                                 bssid[2],
@@ -609,16 +609,18 @@ public:
                             }
                         }
                         totalCnt++;
-                        ALOGI("retrived rtt_result : \n\tburst_num :%d, measurement_number : %d, success_number : %d\n"
-                                "\tnumber_per_burst_peer : %d, status : %s, retry_after_duration : %d s\n"
-				"\trssi : %d dbm, rx_rate : %d Kbps, rtt : %lu ns, rtt_sd : %lu\n"
-				"\tdistance : %d cm, burst_duration : %d ms, negotiated_burst_num : %d\n",
+                        ALOGI("retrieved rtt_result : \n\tburst_num :%d, measurement_number : %d,"
+                                "success_number : %d\n\tnumber_per_burst_peer : %d, status : %s,"
+                                "retry_after_duration : %d s\n\trssi : %d dbm, rx_rate : %d Kbps,"
+                                "rtt : %lu ns, rtt_sd : %lu\n\tdistance : %d cm, burst_duration"
+                                ": %d ms, negotiated_burst_num : %d\n",
                                 rtt_result->burst_num, rtt_result->measurement_number,
                                 rtt_result->success_number, rtt_result->number_per_burst_peer,
                                 get_err_info(rtt_result->status), rtt_result->retry_after_duration,
                                 rtt_result->rssi, rtt_result->rx_rate.bitrate * 100,
-				(unsigned long)rtt_result->rtt/1000, (unsigned long)rtt_result->rtt_sd,
-			       	rtt_result->distance_mm / 10,
+                                (unsigned long)rtt_result->rtt/1000,
+                                (unsigned long)rtt_result->rtt_sd,
+                                rtt_result->distance_mm / 10,
                                 rtt_result->burst_duration, rtt_result->negotiated_burst_num);
                         currentIdx++;
                     }
diff --git a/synadhd/wifi_hal/wifi_hal.cpp b/synadhd/wifi_hal/wifi_hal.cpp
index c7f31d4..239a0c1 100755
--- a/synadhd/wifi_hal/wifi_hal.cpp
+++ b/synadhd/wifi_hal/wifi_hal.cpp
@@ -887,7 +887,7 @@ public:
 
     virtual int handleResponse(WifiEvent& reply) {
 
-        // ALOGI("handling reponse in %s", __func__);
+        // ALOGI("handling response in %s", __func__);
 
         struct nlattr **tb = reply.attributes();
         struct nlattr *mcgrp = NULL;
@@ -2902,7 +2902,7 @@ public:
         nlattr *data = mMsg.attr_start(NL80211_ATTR_VENDOR_DATA);
         ret = mMsg.put_u32(ANDR_WIFI_ATTRIBUTE_DTIM_MULTIPLIER, multiplier);
         if (ret < 0) {
-             ALOGE("Failed to set dtim mutiplier %d\n", multiplier);
+             ALOGE("Failed to set dtim multiplier %d\n", multiplier);
              return ret;
         }
 
diff --git a/synadhd/wifi_hal/wifi_logger.cpp b/synadhd/wifi_hal/wifi_logger.cpp
index c1a6f26..0338270 100755
--- a/synadhd/wifi_hal/wifi_logger.cpp
+++ b/synadhd/wifi_hal/wifi_logger.cpp
@@ -2365,14 +2365,14 @@ public:
         ALOGI("Id = %0x, subcmd = %d, len = %d", id, subcmd, len);
 
         if (mReqType == TX_PACKET_FATE) {
-            ALOGI("Response recieved for get TX pkt fate command\n");
+            ALOGI("Response received for get TX pkt fate command\n");
         } else if (mReqType == RX_PACKET_FATE) {
-            ALOGI("Response recieved for get RX pkt fate command\n");
+            ALOGI("Response received for get RX pkt fate command\n");
         } else if (mReqType == PACKET_MONITOR_START) {
-            ALOGI("Response recieved for monitor pkt fate command\n");
+            ALOGI("Response received for monitor pkt fate command\n");
             return NL_OK;
         } else {
-            ALOGE("Response recieved for unknown pkt fate command\n");
+            ALOGE("Response received for unknown pkt fate command\n");
             return NL_SKIP;
         }