Skip to content

Cypress: Update WHD to version 1.91.2 #13198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 1, 2020
Merged

Cypress: Update WHD to version 1.91.2 #13198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c95356
PSoC: Update WHD to v1.91.2
Jun 26, 2020
c7a6a8f
WHD: Fix incorrect security type mapping
Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion features/netsocket/emac-drivers/TARGET_Cypress/COMPONENT_WHD/interface/WhdSTAInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/generated_mac_address.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 4 additions & 0 deletions targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down
6 changes: 3 additions & 3 deletions targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
11 changes: 6 additions & 5 deletions targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_wifi_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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)
*
Expand Down Expand Up @@ -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
*/
Expand Down
Binary file removed .../TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012A0.bin
View file
Open in desktop
Binary file not shown.
Binary file removed .../TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012B0.bin
View file
Open in desktop
Binary file not shown.
96 changes: 0 additions & 96 deletions ...ARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYESKIT_064B0S2_4343W/wifi_nvram_image.h
View file
Open in desktop

This file was deleted.

Loading