Merge pull request #13198 from kyle-cypress/pr/whd-1.91.2

Cypress: Update WHD to version 1.91.2

Author: 0xc0170

features/netsocket/emac-drivers/TARGET_Cypress/COMPONENT_WHD/interface/WhdSTAInterface.cpp

@@ -113,13 +113,16 @@ static nsapi_security_t whd_tosecurity(whd_security_t sec)
         case WHD_SECURITY_WEP_PSK:
         case WHD_SECURITY_WEP_SHARED:
             return NSAPI_SECURITY_WEP;
+        case WHD_SECURITY_WPA_MIXED_PSK:
         case WHD_SECURITY_WPA_TKIP_PSK:
         case WHD_SECURITY_WPA_TKIP_ENT:
             return NSAPI_SECURITY_WPA;
-        case WHD_SECURITY_WPA2_MIXED_PSK:
+        case WHD_SECURITY_WPA2_WPA_AES_PSK:
+        case WHD_SECURITY_WPA2_WPA_MIXED_PSK:
             return NSAPI_SECURITY_WPA_WPA2;
         case WHD_SECURITY_WPA2_MIXED_ENT:
             return NSAPI_SECURITY_WPA2_ENT;
+        case WHD_SECURITY_WPA2_MIXED_PSK:
         case WHD_SECURITY_WPA2_AES_PSK:
         case WHD_SECURITY_WPA2_AES_ENT:
         case WHD_SECURITY_WPA2_FBT_PSK:

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:83:ef:22"
+#define NVRAM_GENERATED_MAC_ADDRESS        "macaddr=00:A0:50:6f:b2:ea"

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

@@ -44,6 +44,7 @@ extern "C"
 #define WPA_SECURITY       0x00200000  /**< Flag to enable WPA Security        */
 #define WPA2_SECURITY      0x00400000  /**< Flag to enable WPA2 Security       */
 #define WPA3_SECURITY      0x01000000  /**< Flag to enable WPA3 PSK Security   */
+#define SECURITY_MASK      (WEP_ENABLED | TKIP_ENABLED | AES_ENABLED) /**< Flag to Security mask */
 
 #define ENTERPRISE_ENABLED 0x02000000  /**< Flag to enable Enterprise Security */
 #define WPS_ENABLED        0x10000000  /**< Flag to enable WPS Security        */
@@ -191,6 +192,9 @@ typedef enum
     WHD_SECURITY_WPA2_MIXED_PSK   = (WPA2_SECURITY | AES_ENABLED | TKIP_ENABLED),                      /**< WPA2 PSK Security with AES & TKIP                     */
     WHD_SECURITY_WPA2_FBT_PSK     = (WPA2_SECURITY | AES_ENABLED | FBT_ENABLED),                       /**< WPA2 FBT PSK Security with AES & TKIP */
     WHD_SECURITY_WPA3_SAE         = (WPA3_SECURITY | AES_ENABLED),                                     /**< WPA3 Security with AES */
+    WHD_SECURITY_WPA2_WPA_AES_PSK  = (WPA2_SECURITY | WPA_SECURITY | AES_ENABLED),                     /**< WPA2 WPA PSK Security with AES                        */
+    WHD_SECURITY_WPA2_WPA_MIXED_PSK = (WPA2_SECURITY | WPA_SECURITY | AES_ENABLED | TKIP_ENABLED),      /**< WPA2 WPA PSK Security with AES & TKIP                 */
+
     WHD_SECURITY_WPA3_WPA2_PSK    = (WPA3_SECURITY | WPA2_SECURITY | AES_ENABLED),                     /**< WPA3 WPA2 PSK Security with AES */
 
     WHD_SECURITY_WPA_TKIP_ENT     = (ENTERPRISE_ENABLED | WPA_SECURITY | TKIP_ENABLED),                /**< WPA Enterprise Security with TKIP                     */

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

@@ -1,3 +1,3 @@
-#define WHD_VERSION "v1.90.2"
-#define WHD_BRANCH "v1.90.2"
-#define WHD_DATE "2020-04-13 02:49:57 -0500"
+#define WHD_VERSION "v1.91.2"
+#define WHD_BRANCH "v1.91.2"
+#define WHD_DATE "2020-06-25 02:15:47 -0500"

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

@@ -289,7 +289,8 @@ extern uint32_t whd_wifi_join(whd_interface_t ifp, const whd_ssid_t *ssid, whd_s
  *  On successful return, the system is ready to send data packets.
  *
  *  @param   ifp           Pointer to handle instance of whd interface
- *  @param   ap            A pointer to a whd_scan_result_t structure containing AP details
+ *  @param   ap            A pointer to a whd_scan_result_t structure containing AP details and
+ *                         set ap.channel to 0 for unspecificed channel
  *  @param   security_key  A byte array containing either the cleartext security key for WPA/WPA2
  *                         secured networks
  *  @param   key_length    The length of the security_key in bytes.
@@ -804,7 +805,7 @@ whd_result_t whd_arp_cache_clear(whd_interface_t ifp);
 /** Get ARP Offload Feature Flags from Device (WLAN)
  *
  * @param[in]    ifp        : pointer to handle instance of whd interface
- * @param[out]   features   : ptr to store currently set features - bit flags @ref CY_ARP_OL_AGENT_ENABLE, etc.
+ * @param[out]   features   : ptr to store currently set features - bit flags CY_ARP_OL_AGENT_ENABLE, etc.
  *                            ARL_OL_AGENT | ARL_OL_SNOOP | ARP_OL_HOST_AUTO_REPLY | ARP_OL_PEER_AUTO_REPLY
  *
  * @return whd_result_t
@@ -814,7 +815,7 @@ whd_result_t whd_arp_features_get(whd_interface_t ifp, uint32_t *features);
 /** Set ARP Offload Feature Flags in Device (WLAN)
  *
  * @param[in]    ifp        : pointer to handle instance of whd interface
- * @param[in]    features   : features to set value (you can OR ('|') multiple flags) @ref CY_ARP_OL_AGENT_ENABLE, etc.
+ * @param[in]    features   : features to set value (you can OR ('|') multiple flags) CY_ARP_OL_AGENT_ENABLE, etc.
  *                           ARL_OL_AGENT | ARL_OL_SNOOP | ARP_OL_HOST_AUTO_REPLY | ARP_OL_PEER_AUTO_REPLY
  *
  * @return whd_result_t
@@ -823,7 +824,7 @@ whd_result_t whd_arp_features_set(whd_interface_t ifp, uint32_t features);
 
 /** Print ARP Offload Feature Flags in Human readable form to console
  *
- * @param[in]    features   : feature flags to set (you can OR '|' multiple flags) @ref CY_ARP_OL_AGENT_ENABLE, etc.
+ * @param[in]    features   : feature flags to set (you can OR '|' multiple flags) CY_ARP_OL_AGENT_ENABLE, etc.
  *                            ARL_OL_AGENT | ARL_OL_SNOOP | ARP_OL_HOST_AUTO_REPLY | ARP_OL_PEER_AUTO_REPLY
  * @param[in]    title      : Optional: Title for output (NULL == no title)
  *
@@ -898,7 +899,7 @@ whd_result_t whd_arp_stats_clear(whd_interface_t ifp);
 /** Get ARP Offload statistics from Device (WLAN)
  *
  * @param[in]    ifp        : pointer to handle instance of whd interface
- * @param[out]   stats      : Ptr to store statistics @ref whd_arp_stats_t
+ * @param[out]   stats      : Ptr to store statistics whd_arp_stats_t
  *
  * @return whd_result_t
  */