Update WHD to v1.50

Author: cy-opm

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:bb:5c:af"
+#define NVRAM_GENERATED_MAC_ADDRESS        "macaddr=00:A0:50:13:e1:5d"

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

@@ -118,7 +118,9 @@ typedef struct wl_af_params whd_af_params_t;
 /**
  * The maximum size in bytes of the data part of an Ethernet frame
  */
+#ifndef WHD_PAYLOAD_MTU
 #define WHD_PAYLOAD_MTU           (1500)
+#endif
 
 /**
  * The maximum size in bytes of a packet used within whd.

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

@@ -1,3 +1,3 @@
-#define WHD_VERSION "v1.40.0"
-#define WHD_BRANCH "v1.40.0"
-#define WHD_DATE "2019-10-02 13:25:35 +0800"
+#define WHD_VERSION "v1.50.0-rc1"
+#define WHD_BRANCH "v1.50.0-rc1"
+#define WHD_DATE "2019-10-30 18:42:31 +0530"

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/TARGET_43012/43012A0.bin renamed to targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012A0.bin

@@ -20,9 +20,12 @@
 #include "wiced_resource.h"
 
 extern const resource_hnd_t wifi_firmware_image;
-extern const char wifi_firmware_image_data[360823];
+extern const unsigned char wifi_firmware_image_data[448820];
 extern const resource_hnd_t wifi_firmware_clm_blob;
-extern const char wifi_firmware_clm_blob_image_data[7697];
+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 resource_hnd_t wifi_mfg_firmware_clm_blob;
+extern const unsigned char wifi_mfg_firmware_clm_blob_image_data[7697];
 
 #endif /* ifndef INCLUDED_RESOURCES_H_ */
-

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/TARGET_43012/43012B0.bin renamed to targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012B0.bin

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2019, Cypress Semiconductor Corporation, All Rights Reserved
+ * SPDX-License-Identifier: LicenseRef-PBL
+ *
+ * This file and the related binary are licensed under the
+ * Permissive Binary License, Version 1.0 (the "License");
+ * you may not use these files except in compliance with the License.
+ *
+ * You may obtain a copy of the License here:
+ * LICENSE-permissive-binary-license-1.0.txt and at
+ * https://www.mbed.com/licenses/PBL-1.0
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* Automatically generated file - this comment ensures resources.h file creation */
+/* Auto-generated header file. Do not edit */
+#ifndef INCLUDED_RESOURCES_H_
+#define INCLUDED_RESOURCES_H_
+#include "wiced_resource.h"
+
+extern const resource_hnd_t wifi_firmware_image;
+extern const unsigned char wifi_firmware_image_data[420690];
+extern const resource_hnd_t wifi_firmware_clm_blob;
+extern const unsigned char wifi_firmware_clm_blob_image_data[7222];
+extern const resource_hnd_t wifi_mfg_firmware_image;
+extern const unsigned char wifi_mfg_firmware_image_data[391277];
+extern const resource_hnd_t wifi_mfg_firmware_clm_blob_image;
+extern const unsigned char wifi_mfg_firmware_clm_blob_image_data[7222];
+
+#endif /* ifndef INCLUDED_RESOURCES_H_ */

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

@@ -23642,3 +23642,5 @@ const unsigned char wifi_mfg_firmware_image_data[391277] =
     49, 45, 48, 56, 98, 98, 49, 100, 102, 51
 };
 
+const resource_hnd_t wifi_mfg_firmware_image =
+{ RESOURCE_IN_MEMORY, 391277, {.mem = { (const char *)wifi_mfg_firmware_image_data }}};

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

@@ -397,4 +397,5 @@ const unsigned char wifi_mfg_firmware_clm_blob_image_data[7222] =
     1, 255, 1, 52, 1, 14, 1, 15, 3, 28, 39, 49, 2, 19, 49, 166, 169, 0,
     0
 };
-
+const resource_hnd_t wifi_mfg_firmware_clm_blob =
+{ RESOURCE_IN_MEMORY, 7222, {.mem = { (const char *)wifi_mfg_firmware_clm_blob_image_data }}};

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

@@ -20,9 +20,12 @@
 #include "wiced_resource.h"
 
 extern const resource_hnd_t wifi_firmware_image;
+extern const unsigned char wifi_firmware_image_data[420690];
 extern const resource_hnd_t wifi_firmware_clm_blob;
-extern const unsigned char wifi_firmware_image_data[416801];
 extern const unsigned char wifi_firmware_clm_blob_image_data[7222];
+extern const resource_hnd_t wifi_mfg_firmware_image;
+extern const unsigned char wifi_mfg_firmware_image_data[391277];
+extern const resource_hnd_t wifi_mfg_firmware_clm_blob;
+extern const unsigned char wifi_mfg_firmware_clm_blob_image_data[7222];
 
 #endif /* ifndef INCLUDED_RESOURCES_H_ */
-

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

@@ -68,8 +68,14 @@ resource_result_t resource_read(const resource_hnd_t *resource, uint32_t offset,
 *               Variable Definitions
 ******************************************************/
 
+#ifdef WLAN_MFG_FIRMWARE
+extern const resource_hnd_t wifi_mfg_firmware_image;
+extern const resource_hnd_t wifi_mfg_firmware_clm_blob;
+#else
 extern const resource_hnd_t wifi_firmware_image;
 extern const resource_hnd_t wifi_firmware_clm_blob;
+#endif
+
 unsigned char r_buffer[BLOCK_BUFFER_SIZE];
 
 #if defined(WHD_DYNAMIC_NVRAM)
@@ -172,10 +178,14 @@ uint32_t host_platform_resource_size(whd_driver_t whd_drv, whd_resource_type_t r
             return ( whd_result_t )RESOURCE_UNSUPPORTED;
         }
         wiced_waf_app_get_size(&wifi_app, size_out);
+#else
+#ifdef WLAN_MFG_FIRMWARE
+        *size_out = (uint32_t)resource_get_size(&wifi_mfg_firmware_image);
 #else
         *size_out = (uint32_t)resource_get_size(&wifi_firmware_image);
-#endif
-#endif
+#endif /* WLAN_MFG_FIRMWARE */
+#endif /* WIFI_FIRMWARE_IN_MULTI_APP */
+#endif /* NO_WIFI_FIRMWARE */
 
     }
     else if (resource == WHD_RESOURCE_WLAN_NVRAM)
@@ -184,7 +194,11 @@ uint32_t host_platform_resource_size(whd_driver_t whd_drv, whd_resource_type_t r
     }
     else
     {
+#ifdef WLAN_MFG_FIRMWARE
+        *size_out = (uint32_t)resource_get_size(&wifi_mfg_firmware_clm_blob);
+#else
         *size_out = (uint32_t)resource_get_size(&wifi_firmware_clm_blob);
+#endif /* WLAN_MFG_FIRMWARE */
     }
     return WHD_SUCCESS;
 }
@@ -211,8 +225,13 @@ uint32_t host_get_resource_block(whd_driver_t whd_drv, whd_resource_type_t type,
 
     if (type == WHD_RESOURCE_WLAN_FIRMWARE)
     {
+#ifdef WLAN_MFG_FIRMWARE
+        result = resource_read( (const resource_hnd_t *)&wifi_mfg_firmware_image, read_pos, block_size, size_out,
+                                r_buffer );
+#else
         result = resource_read( (const resource_hnd_t *)&wifi_firmware_image, read_pos, block_size, size_out,
                                 r_buffer );
+#endif /* WLAN_MFG_FIRMWARE */
         if (result != WHD_SUCCESS)
         {
             return result;
@@ -242,9 +261,15 @@ uint32_t host_get_resource_block(whd_driver_t whd_drv, whd_resource_type_t type,
     }
     else
     {
+#ifdef WLAN_MFG_FIRMWARE
+        result = resource_read( (const resource_hnd_t *)&wifi_mfg_firmware_clm_blob, read_pos, block_size,
+                                size_out,
+                                r_buffer );
+#else
         result = resource_read( (const resource_hnd_t *)&wifi_firmware_clm_blob, read_pos, block_size,
                                 size_out,
                                 r_buffer );
+#endif /* WLAN_MFG_FIRMWARE */
         if (result != WHD_SUCCESS)
         {
             return result;

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

@@ -54,18 +54,27 @@ extern "C"
 #define whd_minor_assert(error_string, \
                          assertion)   do { if (!(assertion) ) WPRINT_MACRO( (error_string) ); } while (0)
 #else
-#define whd_assert(error_string, assertion)         do { if (!(assertion) ) WPRINT_MACRO( (error_string) ); } while (0)
+#define whd_assert(error_string, \
+                   assertion)         do { if (!(assertion) ){ WPRINT_MACRO( (error_string) ); } } while (0)
 #define whd_minor_assert(error_string, assertion)   do { (void)(assertion); } while (0)
 #endif
 
 /******************************************************
 *             Print declarations
 ******************************************************/
+/* IF MFG TEST is enabled then disable all LOGGING VIA UART as
+ + * this interrupts communication between WL TOOL and MFG Test APP
+ + * via STDIO UART causing Wrong Message Exchange and failure.
+ + */
+#ifdef WLAN_MFG_FIRMWARE
+#define WPRINT_MACRO(args)
+#else
 #if defined(WHD_LOGGING_BUFFER_ENABLE)
 #define WPRINT_MACRO(args) do { whd_buffer_printf args; } while (0 == 1)
 #else
 #define WPRINT_MACRO(args) do { printf args;} while (0 == 1)
 #endif
+#endif
 
 
 /* WICED printing macros for Wiced Wi-Fi Driver*/

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/TARGET_43012/43012C0.clm_blob renamed to targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0.clm_blob

@@ -180,7 +180,7 @@ static void *whd_handle_apsta_event(whd_interface_t ifp, const whd_event_header_
         {
             whd_result_t result;
             result = cy_rtos_set_semaphore(&ap->whd_wifi_sleep_flag, WHD_FALSE);
-            whd_assert("failed to post AP link semaphore", result == WHD_SUCCESS);
+            WPRINT_WHD_DEBUG( ("%s failed to post AP link semaphore at %d\n", __func__, __LINE__) );
             REFERENCE_DEBUG_ONLY_VARIABLE(result);
         }
     }
@@ -191,31 +191,50 @@ static void *whd_handle_apsta_event(whd_interface_t ifp, const whd_event_header_
 uint32_t whd_wifi_init_ap(whd_interface_t ifp, whd_ssid_t *ssid, whd_security_t auth_type,
                           const uint8_t *security_key, uint8_t key_length, uint8_t channel)
 {
+    whd_driver_t whd_driver;
     whd_bool_t wait_for_interface = WHD_FALSE;
     whd_result_t result;
     whd_buffer_t response;
     whd_buffer_t buffer;
-    uint32_t *data;
+    whd_interface_t prim_ifp;
     whd_ap_int_info_t *ap;
+    uint32_t *data;
     uint32_t bss_index;
     uint16_t wlan_chip_id;
     uint16_t event_entry = (uint16_t)0xFF;
-    whd_interface_t prim_ifp;
-    whd_driver_t whd_driver;
+
 
     CHECK_IFP_NULL(ifp);
 
     whd_driver = ifp->whd_driver;
 
     CHECK_DRIVER_NULL(whd_driver);
 
+    ap = &whd_driver->ap_info;
+
     prim_ifp = whd_get_primary_interface(whd_driver);
     if (prim_ifp == NULL)
     {
         WPRINT_WHD_ERROR( ("%s failed at %d \n", __func__, __LINE__) );
         return WHD_UNKNOWN_INTERFACE;
     }
-    ap = &whd_driver->ap_info;
+
+    /* Turn off APSTA when creating AP mode on primary interface */
+    if (ifp == prim_ifp)
+    {
+        CHECK_RETURN(whd_wifi_set_ioctl_buffer(prim_ifp, WLC_DOWN, NULL, 0) );
+        data = (uint32_t *)whd_cdc_get_iovar_buffer(whd_driver, &buffer, (uint16_t)4, IOVAR_STR_APSTA);
+        CHECK_IOCTL_BUFFER(data);
+        *data = 0;
+        result = whd_cdc_send_iovar(ifp, CDC_SET, buffer, 0);
+        if ( (result != WHD_SUCCESS) && (result != WHD_WLAN_UNSUPPORTED) )
+        {
+            WPRINT_WHD_ERROR( ("Could not turn off apsta\n") );
+            return result;
+        }
+        CHECK_RETURN(whd_wifi_set_ioctl_buffer(prim_ifp, WLC_UP, NULL, 0) );
+    }
+
     bss_index = ifp->bsscfgidx;
     /* Get the Chip Number */
     wlan_chip_id = whd_chip_get_chip_id(whd_driver);

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0_bin.c

@@ -42,6 +42,7 @@
 
 #define MINIMUM_WHD_STACK_SIZE        (1024 + 1200 + 2500)
 
+#define DEFAULT_PM2_SLEEP_RET_TIME  200
 /******************************************************
 *             Static Variables
 ******************************************************/
@@ -329,7 +330,6 @@ uint32_t whd_wifi_on(whd_driver_t whd_driver, whd_interface_t *ifpp)
         return retval;
     }
 
-#if 0
     /* Turn APSTA on */
     data = (uint32_t *)whd_cdc_get_iovar_buffer(whd_driver, &buffer, (uint16_t)sizeof(*data), IOVAR_STR_APSTA);
     if (data == NULL)
@@ -340,12 +340,15 @@ uint32_t whd_wifi_on(whd_driver_t whd_driver, whd_interface_t *ifpp)
     *data = htod32( (uint32_t)1 );
     /* This will fail on manufacturing test build since it does not have APSTA available */
     retval = whd_cdc_send_iovar(ifp, CDC_SET, buffer, 0);
-    if ( (retval != WHD_SUCCESS) && (retval != WHD_WLAN_UNSUPPORTED) )
+    if (retval == WHD_WLAN_UNSUPPORTED)
     {
-        /* Could not turn on APSTA */
-        WPRINT_WHD_DEBUG( ("Could not turn on APSTA\n") );
+        WPRINT_WHD_DEBUG( ("Firmware does not support APSTA\n") );
+    }
+    else if (retval != WHD_SUCCESS)
+    {
+        WPRINT_WHD_ERROR( ("Could not turn on APSTA\n") );
+        return retval;
     }
-#endif
 
     /* Send set country command */
     /* This is the first time that the WLAN chip is required to respond
@@ -414,7 +417,7 @@ uint32_t whd_wifi_on(whd_driver_t whd_driver, whd_interface_t *ifpp)
     /* Send UP command */
     CHECK_RETURN(whd_wifi_set_up(ifp) );
 
-    whd_wifi_enable_powersave_with_throughput(ifp, 0);
+    whd_wifi_enable_powersave_with_throughput(ifp, DEFAULT_PM2_SLEEP_RET_TIME);
     /* Set the GMode */
     data = (uint32_t *)whd_cdc_get_ioctl_buffer(whd_driver, &buffer, (uint16_t)4);
     if (data == NULL)

targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0_clm_blob.c

@@ -2680,11 +2680,7 @@ uint32_t whd_wifi_enable_powersave_with_throughput(whd_interface_t ifp, uint16_t
 
     CHECK_DRIVER_NULL(whd_driver);
 
-    if (return_to_sleep_delay_ms == 0)
-    {
-        return WHD_BADARG;
-    }
-    else if (return_to_sleep_delay_ms < PM2_SLEEP_RET_TIME_MIN)
+    if (return_to_sleep_delay_ms < PM2_SLEEP_RET_TIME_MIN)
     {
         WPRINT_WHD_ERROR( ("Delay too short, %s failed at line %d \n", __func__, __LINE__) );
         return WHD_DELAY_TOO_SHORT;
@@ -3102,7 +3098,7 @@ uint32_t whd_wifi_get_ioctl_value(whd_interface_t ifp, uint32_t ioctl, uint32_t
     CHECK_IOCTL_BUFFER(whd_cdc_get_ioctl_buffer(whd_driver, &buffer, (uint16_t)sizeof(*value) ) );
     CHECK_RETURN_UNSUPPORTED_OK(whd_cdc_send_ioctl(ifp, CDC_GET, ioctl, buffer, &response) );
 
-    *value = dtoh32(*whd_buffer_get_current_piece_data_pointer(whd_driver, response) );
+    *value = dtoh32(*(uint32_t *)whd_buffer_get_current_piece_data_pointer(whd_driver, response) );
 
     CHECK_RETURN(whd_buffer_release(whd_driver, response, WHD_NETWORK_RX) );
 
@@ -3138,6 +3134,7 @@ uint32_t whd_wifi_get_ioctl_buffer(whd_interface_t ifp, uint32_t ioctl, uint8_t
     whd_driver = ifp->whd_driver;
     data = (uint32_t *)whd_cdc_get_ioctl_buffer(whd_driver, &buffer, out_length);
     CHECK_IOCTL_BUFFER(data);
+    memcpy(data, out_buffer, out_length);
 
     result = whd_cdc_send_ioctl(ifp, CDC_GET, ioctl, buffer, &response);