Merge pull request #11885 from morser499/pr/whd1.60

Update to WHD 1.60 release

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:13:e1:5d"
+#define NVRAM_GENERATED_MAC_ADDRESS        "macaddr=00:A0:50:d6:93:82"

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

@@ -1,3 +1,3 @@
-#define WHD_VERSION "v1.50.0-rc1"
-#define WHD_BRANCH "v1.50.0-rc1"
-#define WHD_DATE "2019-10-30 18:42:31 +0530"
+#define WHD_VERSION "v1.60.0-rc1"
+#define WHD_BRANCH "v1.60.0-rc1"
+#define WHD_DATE "2019-11-13 21:27:38 -0600"

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.bin

@@ -19,8 +19,8 @@
 CY_SECTION_WHD(CY_STORAGE_WIFI_DATA) __attribute__((used))
 #endif
 const unsigned char wifi_mfg_firmware_clm_blob_image_data[7697] = {
-        66, 76, 79, 66, 60, 0, 0, 0, 119, 14, 187, 250, 1, 0, 0, 0, 2, 0, 0,
-        0, 0, 0, 0, 0, 60, 0, 0, 0, 209, 29, 0, 0, 66, 38, 18, 29, 0, 0, 0,
+        66, 76, 79, 66, 60, 0, 0, 0, 152, 171, 222, 29, 1, 0, 0, 0, 2, 0, 0,
+        0, 0, 0, 0, 0, 60, 0, 0, 0, 209, 29, 0, 0, 12, 188, 123, 67, 0, 0, 0,
         0, 0, 0, 0, 0, 13, 30, 0, 0, 4, 0, 0, 0, 147, 68, 77, 121, 0, 0, 0,
         0, 67, 76, 77, 32, 68, 65, 84, 65, 0, 0, 18, 0, 2, 0, 57, 46, 49, 48,
         46, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 46, 51, 54, 46,
@@ -257,7 +257,7 @@ const unsigned char wifi_mfg_firmware_clm_blob_image_data[7697] = {
         2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 4, 0, 1, 2, 3, 8, 12, 13, 14, 15, 16,
         17, 18, 19, 8, 4, 5, 6, 7, 8, 9, 10, 11, 21, 2, 2, 18, 4, 5, 6, 7, 8,
         9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 50, 48, 49, 57, 45,
-        49, 48, 45, 50, 57, 32, 50, 49, 58, 53, 48, 58, 52, 56, 0, 0, 3, 0,
+        49, 48, 45, 51, 49, 32, 48, 51, 58, 48, 49, 58, 52, 50, 0, 0, 3, 0,
         0, 0, 196, 11, 0, 0, 1, 14, 1, 0, 3, 0, 0, 0, 120, 14, 0, 0, 42, 58,
         16, 106, 138, 16, 155, 171, 16, 0, 0, 0, 3, 0, 0, 0, 28, 23, 0, 0, 21,
         2, 2, 0, 9, 0, 19, 0, 22, 0, 24, 0, 32, 0, 35, 0, 42, 0, 53, 0, 59,

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.clm_blob

@@ -20,11 +20,11 @@
 #include "wiced_resource.h"
 
 extern const resource_hnd_t wifi_firmware_image;
-extern const unsigned char wifi_firmware_image_data[448820];
+extern const unsigned char wifi_firmware_image_data[389776];
 extern const resource_hnd_t wifi_firmware_clm_blob;
 extern const unsigned char wifi_firmware_clm_blob_image_data[7697];
 extern const resource_hnd_t wifi_mfg_firmware_image;
-extern const unsigned char wifi_mfg_firmware_image_data[529375];
+extern const unsigned char wifi_mfg_firmware_image_data[470331];
 extern const resource_hnd_t wifi_mfg_firmware_clm_blob;
 extern const unsigned char wifi_mfg_firmware_clm_blob_image_data[7697];
 

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c

@@ -775,11 +775,6 @@ static void *whd_wifi_join_events_handler(whd_interface_t ifp, const whd_event_h
         case WLC_E_DISASSOC_IND:
             whd_driver->internal_info.whd_join_status[event_header->bsscfgidx] &=
                 ~(JOIN_AUTHENTICATED | JOIN_LINK_READY);
-            if (ifp->event_reg_list[WHD_JOIN_EVENT_ENTRY] != WHD_EVENT_NOT_REGISTERED)
-            {
-                whd_wifi_deregister_event_handler(ifp, ifp->event_reg_list[WHD_JOIN_EVENT_ENTRY]);
-                ifp->event_reg_list[WHD_JOIN_EVENT_ENTRY] = WHD_EVENT_NOT_REGISTERED;
-            }
             break;
 
         case WLC_E_AUTH:
@@ -1279,6 +1274,12 @@ static uint32_t whd_wifi_prepare_join(whd_interface_t ifp, whd_security_t auth_t
     *wpa_auth = htod32(*wpa_auth);
     CHECK_RETURN(whd_cdc_send_ioctl(ifp, CDC_SET, WLC_SET_WPA_AUTH, buffer, 0) );
 
+    if (ifp->event_reg_list[WHD_JOIN_EVENT_ENTRY] != WHD_EVENT_NOT_REGISTERED)
+    {
+        whd_wifi_deregister_event_handler(ifp, ifp->event_reg_list[WHD_JOIN_EVENT_ENTRY]);
+        ifp->event_reg_list[WHD_JOIN_EVENT_ENTRY] = WHD_EVENT_NOT_REGISTERED;
+    }
+
     CHECK_RETURN(whd_management_set_event_handler(ifp, join_events, whd_wifi_join_events_handler, (void *)semaphore,
                                                   &event_entry) );
     if (event_entry >= WHD_EVENT_ENTRY_MAX)
@@ -2238,6 +2239,12 @@ uint32_t whd_wifi_scan(whd_interface_t ifp,
         }
         param_size = ( uint16_t )(param_size + channel_list_size * sizeof(uint16_t) );
     }
+
+    if (ifp->event_reg_list[WHD_SCAN_EVENT_ENTRY] != WHD_EVENT_NOT_REGISTERED)
+    {
+        whd_wifi_deregister_event_handler(ifp, ifp->event_reg_list[WHD_SCAN_EVENT_ENTRY]);
+        ifp->event_reg_list[WHD_SCAN_EVENT_ENTRY] = WHD_EVENT_NOT_REGISTERED;
+    }
     CHECK_RETURN(whd_management_set_event_handler(ifp, scan_events, whd_wifi_scan_events_handler, user_data,
                                                   &event_entry) );
     if (event_entry >= WHD_MAX_EVENT_SUBSCRIPTION)