Merge pull request #12030 from miteshdedhia7/pr/whd_update_1.70

Updates the Cypress WiFi Host Driver to 1.7.0

Author: 0xc0170

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/generated_mac_address.txt

@@ -6,4 +6,4 @@
  * MAC address is printed during WHD power up
  */
 
-#define NVRAM_GENERATED_MAC_ADDRESS        "macaddr=00:A0:50:d6:93:82"
+#define NVRAM_GENERATED_MAC_ADDRESS        "macaddr=00:A0:50:2f:32:99"

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_version.h

@@ -1,3 +1,3 @@
-#define WHD_VERSION "v1.60.0-rc1"
-#define WHD_BRANCH "v1.60.0-rc1"
-#define WHD_DATE "2019-11-13 21:27:38 -0600"
+#define WHD_VERSION "v1.70.0"
+#define WHD_BRANCH "v1.70.0"
+#define WHD_DATE "2019-12-02 04:14:53 -0600"

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_events_int.h

@@ -166,9 +166,10 @@ typedef enum
     WLC_E_PFN_SCAN_COMPLETE = 138,     /* PFN completed scan of network list */
     WLC_E_RMC_EVENT = 139,     /* RMC Event */
     WLC_E_DPSTA_INTF_IND = 140,     /* DPSTA interface indication */
-    WLC_E_RRM = 141,     /* RRM Event */
-    WLC_E_ULP = 146,     /* ULP entry event */
-    WLC_E_LAST = 147,     /** highest val + 1 for range checking */
+    WLC_E_RRM = 141,                /* RRM Event */
+    WLC_E_ULP = 146,                /* ULP entry event */
+    WLC_E_TKO = 151,                /* TCP Keep Alive Offload Event */
+    WLC_E_LAST = 152,               /* highest val + 1 for range checking */
 } whd_event_num_t;
 
 #define WLC_SUP_STATUS_OFFSET      (256)

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_ap.c

@@ -746,12 +746,14 @@ uint32_t whd_wifi_stop_ap(whd_interface_t ifp)
         return result2;
     }
 
-    /* Disable AP mode */
-    data = (uint32_t *)whd_cdc_get_ioctl_buffer(whd_driver, &buffer, (uint16_t)4);
-    CHECK_IOCTL_BUFFER_WITH_SEMAPHORE(data, &ap->whd_wifi_sleep_flag);
-    *data = 0; /* Turn off AP */
-    CHECK_RETURN_WITH_SEMAPHORE(whd_cdc_send_ioctl(ifp, CDC_SET, WLC_SET_AP, buffer, 0),
-                                &ap->whd_wifi_sleep_flag);
+    /* Disable AP mode only if AP is on primary interface */
+    if (prim_ifp == ifp)
+    {
+        data = (uint32_t *)whd_cdc_get_ioctl_buffer(whd_driver, &buffer, (uint16_t)4);
+        CHECK_IOCTL_BUFFER(data);
+        *data = 0;
+        CHECK_RETURN(whd_cdc_send_ioctl(ifp, CDC_SET, WLC_SET_AP, buffer, 0) );
+    }
 
     CHECK_RETURN(whd_wifi_deregister_event_handler(ifp, ifp->event_reg_list[WHD_AP_EVENT_ENTRY]) );
     ifp->event_reg_list[WHD_AP_EVENT_ENTRY] = WHD_EVENT_NOT_REGISTERED;