Skip to content

Commit

Permalink
[Infineon] Update assets to latest version to fix wifi connectivity
Browse files Browse the repository at this point in the history
  • Loading branch information
@praveenCY
praveenCY committed Oct 30, 2023
1 parent a16d6e9 commit c6c3270
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 27 deletions.
8 changes: 4 additions & 4 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,6 @@
path = third_party/infineon/psoc6/psoc6_sdk/libs/wifi-host-driver
url = https://github.com/Infineon/wifi-host-driver
platforms = infineon
[submodule "p6/wifi-mw-core"]
path = third_party/infineon/psoc6/psoc6_sdk/libs/wifi-mw-core
url = https://github.com/Infineon/wifi-mw-core
platforms = infineon
[submodule "p6/TARGET_CY8CKIT-062S2-43012"]
path = third_party/infineon/psoc6/psoc6_sdk/libs/TARGET_CY8CKIT-062S2-43012
url = https://github.com/Infineon/TARGET_CY8CKIT-062S2-43012
Expand Down Expand Up @@ -324,3 +320,7 @@
url = https://github.com/STMicroelectronics/STM32CubeWB.git
branch = v1.17.0
platforms = stm32
[submodule "p6/lwip-network-interface-integration"]
path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
url = https://github.com/Infineon/lwip-network-interface-integration.git
platforms = infineon
2 changes: 1 addition & 1 deletion src/platform/Infineon/PSOC6/ConfigurationManagerImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ CHIP_ERROR ConfigurationManagerImpl::GetPrimaryWiFiMACAddress(uint8_t * buf)
CHIP_ERROR err = CHIP_NO_ERROR;
cy_rslt_t result = CY_RSLT_SUCCESS;
cy_wcm_mac_t mac;
result = cy_wcm_get_mac_addr(CY_WCM_INTERFACE_TYPE_STA, &mac, 1);
result = cy_wcm_get_mac_addr(CY_WCM_INTERFACE_TYPE_STA, &mac);
if (result != CY_RSLT_SUCCESS)
{
err = CHIP_ERROR_INTERNAL;
Expand Down
4 changes: 2 additions & 2 deletions src/platform/Infineon/PSOC6/ConnectivityManagerImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
#include <lwip/nd6.h>
#include <lwip/netif.h>

#include "cy_network_mw_core.h"
#include "lwip/opt.h"
#include <cy_lwip.h>
#include <platform/Infineon/PSOC6/NetworkCommissioningDriver.h>
#include <type_traits>

Expand Down Expand Up @@ -634,7 +634,7 @@ void ConnectivityManagerImpl::UpdateInternetConnectivityState(void)
// If the WiFi station is currently in the connected state...
if ((mWiFiStationState == kWiFiStationState_Connected) || stationConnected)
{
net_interface = cy_lwip_get_interface(CY_LWIP_STA_NW_INTERFACE);
net_interface = (netif *) cy_network_get_nw_interface(CY_NETWORK_WIFI_STA_INTERFACE, 0);
if (net_interface != NULL && netif_is_up(net_interface) && netif_is_link_up(net_interface))
{
if (!ip4_addr_isany(netif_ip4_addr(net_interface)) && !ip4_addr_isany(netif_ip4_gw(net_interface)))
Expand Down
4 changes: 2 additions & 2 deletions src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

#include <platform/internal/CHIPDeviceLayerInternal.h>

#include "cy_network_mw_core.h"
#include "cyhal_system.h"
#include <cy_lwip.h>
#include <lib/support/CHIPMemString.h>
#include <lib/support/logging/CHIPLogging.h>
#include <platform/DiagnosticDataProvider.h>
Expand Down Expand Up @@ -155,7 +155,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
struct netif * net_interface;
CHIP_ERROR err = CHIP_NO_ERROR;
NetworkInterface * ifp = new NetworkInterface();
net_interface = cy_lwip_get_interface(CY_LWIP_STA_NW_INTERFACE);
net_interface = (netif *) cy_network_get_nw_interface(CY_NETWORK_WIFI_STA_INTERFACE, 0);
if (net_interface)
{
/* Update Network Interface list */
Expand Down
6 changes: 3 additions & 3 deletions src/platform/Infineon/PSOC6/P6Utils.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/* this file behaves like a config.h, comes first */
#include <platform/internal/CHIPDeviceLayerInternal.h>

#include <cy_lwip.h>
#include "cy_network_mw_core.h"
#include <cy_wcm.h>
#include <lib/core/ErrorStr.h>
#include <lib/support/CodeUtils.h>
Expand Down Expand Up @@ -472,7 +472,7 @@ CHIP_ERROR P6Utils::p6_start_ap(void)
}
/* Link Local IPV6 AP address for AP */
cy_wcm_ip_address_t ipv6_addr;
result = cy_wcm_get_ipv6_addr(CY_WCM_INTERFACE_TYPE_AP, CY_WCM_IPV6_LINK_LOCAL, &ipv6_addr, 1);
result = cy_wcm_get_ipv6_addr(CY_WCM_INTERFACE_TYPE_AP, CY_WCM_IPV6_LINK_LOCAL, &ipv6_addr);
if (result != CY_RSLT_SUCCESS)
{
ChipLogError(DeviceLayer, "cy_wcm_get_ipv6_addr() failed result %ld", result);
Expand Down Expand Up @@ -727,7 +727,7 @@ CHIP_ERROR P6Utils::ping_init(void)
{
CHIP_ERROR err = CHIP_NO_ERROR;
struct netif * net_interface = NULL;
net_interface = cy_lwip_get_interface(CY_LWIP_STA_NW_INTERFACE);
net_interface = (netif *) cy_network_get_nw_interface(CY_NETWORK_WIFI_STA_INTERFACE, 0);
ping_target = &net_interface->gw;

/* Ping to Gateway address */
Expand Down
11 changes: 6 additions & 5 deletions third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Debug/GCC_ARM.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,9 @@
"-I./libs/wifi-host-driver/WiFi_Host_Driver/src",
"-I./libs/wifi-host-driver/WiFi_Host_Driver/src/bus_protocols",
"-I./libs/wifi-host-driver/WiFi_Host_Driver/src/include",
"-I./libs/wifi-mw-core",
"-I./libs/wifi-mw-core/lwip-whd-port",
"-I./libs/lwip-network-interface-integration",
"-I./libs/lwip-network-interface-integration/source",
"-I./libs/lwip-network-interface-integration/include",
"-I./ota/config"
],
"defines": [
Expand Down Expand Up @@ -557,8 +558,8 @@
"./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi.c",
"./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi_api.c",
"./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi_p2p.c",
"./libs/wifi-mw-core/lwip-whd-port/cy_lwip.c",
"./libs/wifi-mw-core/lwip-whd-port/cy_lwip_dhcp_server.c",
"./libs/lwip-network-interface-integration/source/cy_network_mw_core.c",
"./libs/lwip-network-interface-integration/source/cy_lwip_dhcp_server.c",
"./libs/clib-support/TOOLCHAIN_GCC_ARM/cy_clib_support_newlib.c",
"./libs/TARGET_CY8CKIT-062S2-43012/bluetooth/cybsp_bt_config.c",
"./libs/TARGET_CY8CKIT-062S2-43012/cybsp.c",
Expand Down Expand Up @@ -616,7 +617,7 @@
"./libs/secure-sockets/source/COMPONENT_MBEDTLS/cy_tls.c",
"./libs/secure-sockets/source/COMPONENT_MBEDTLS/iot_crypto.c",
"./libs/whd-bsp-integration/COMPONENT_LWIP/cy_network_buffer_lwip.c",
"./libs/wifi-connection-manager/source/COMPONENT_LWIP/cy_wcm.c",
"./libs/wifi-connection-manager/source/cy_wcm.c",
"./libs/wifi-connection-manager/source/COMPONENT_MBEDTLS/cy_wps_aes_ctr_ccm.c",
"./libs/wifi-connection-manager/source/COMPONENT_MBEDTLS/cy_wps_crypto.c",
"./libs/wifi-host-driver/WiFi_Host_Driver/resources/clm/COMPONENT_43012/43012C0-mfgtest_clm_blob.c",
Expand Down
11 changes: 6 additions & 5 deletions third_party/infineon/psoc6/psoc6_sdk/build/CY8CKIT-062S2-43012/Release/GCC_ARM.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,9 @@
"-I./libs/wifi-host-driver/WiFi_Host_Driver/src",
"-I./libs/wifi-host-driver/WiFi_Host_Driver/src/bus_protocols",
"-I./libs/wifi-host-driver/WiFi_Host_Driver/src/include",
"-I./libs/wifi-mw-core",
"-I./libs/wifi-mw-core/lwip-whd-port",
"-I./libs/lwip-network-interface-integration",
"-I./libs/lwip-network-interface-integration/source",
"-I./libs/lwip-network-interface-integration/include",
"-I./ota/config"
],
"defines": [
Expand Down Expand Up @@ -557,8 +558,8 @@
"./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi.c",
"./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi_api.c",
"./libs/wifi-host-driver/WiFi_Host_Driver/src/whd_wifi_p2p.c",
"./libs/wifi-mw-core/lwip-whd-port/cy_lwip.c",
"./libs/wifi-mw-core/lwip-whd-port/cy_lwip_dhcp_server.c",
"./libs/lwip-network-interface-integration/source/cy_network_mw_core.c",
"./libs/lwip-network-interface-integration/source/cy_lwip_dhcp_server.c",
"./libs/clib-support/TOOLCHAIN_GCC_ARM/cy_clib_support_newlib.c",
"./libs/TARGET_CY8CKIT-062S2-43012/bluetooth/cybsp_bt_config.c",
"./libs/TARGET_CY8CKIT-062S2-43012/cybsp.c",
Expand Down Expand Up @@ -616,7 +617,7 @@
"./libs/secure-sockets/source/COMPONENT_MBEDTLS/cy_tls.c",
"./libs/secure-sockets/source/COMPONENT_MBEDTLS/iot_crypto.c",
"./libs/whd-bsp-integration/COMPONENT_LWIP/cy_network_buffer_lwip.c",
"./libs/wifi-connection-manager/source/COMPONENT_LWIP/cy_wcm.c",
"./libs/wifi-connection-manager/source/cy_wcm.c",
"./libs/wifi-connection-manager/source/COMPONENT_MBEDTLS/cy_wps_aes_ctr_ccm.c",
"./libs/wifi-connection-manager/source/COMPONENT_MBEDTLS/cy_wps_crypto.c",
"./libs/wifi-host-driver/WiFi_Host_Driver/resources/clm/COMPONENT_43012/43012C0-mfgtest_clm_blob.c",
Expand Down
2 changes: 1 addition & 1 deletion third_party/infineon/psoc6/psoc6_sdk/libs/connectivity-utilities
Submodule connectivity-utilities updated 178 files
1 change: 1 addition & 0 deletions third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
Submodule lwip-network-interface-integration added at 9e1660
2 changes: 1 addition & 1 deletion third_party/infineon/psoc6/psoc6_sdk/libs/secure-sockets
Submodule secure-sockets updated 149 files
2 changes: 1 addition & 1 deletion third_party/infineon/psoc6/psoc6_sdk/libs/wifi-connection-manager
Submodule wifi-connection-manager updated 80 files
+11 −10 LICENSE.txt
+105 −44 README.md
+87 −37 RELEASE.md
+0 −1 deps/wifi-mw-core.lib
+0 −1 deps/wpa3-external-supplicant.lib
+722 −37 docs/api_reference_manual/html/group__cy__wcm__error.html
+89 −1 docs/api_reference_manual/html/group__cy__wcm__error.js
+69 −30 docs/api_reference_manual/html/group__group__wcm__enums.html
+6 −0 docs/api_reference_manual/html/group__group__wcm__enums.js
+96 −96 docs/api_reference_manual/html/group__group__wcm__functions.html
+7 −6 docs/api_reference_manual/html/group__group__wcm__functions.js
+6 −1 docs/api_reference_manual/html/group__group__wcm__macros.html
+1 −0 docs/api_reference_manual/html/group__group__wcm__macros.js
+2 −2 docs/api_reference_manual/html/group__group__wcm__mscs.html
+11 −2 docs/api_reference_manual/html/group__group__wcm__structures.html
+12 −1 docs/api_reference_manual/html/group__group__wcm__structures.js
+2 −2 docs/api_reference_manual/html/group__group__wcm__typedefs.html
+627 −147 docs/api_reference_manual/html/index.html
+3 −3 docs/api_reference_manual/html/modules.html
+2 −2 docs/api_reference_manual/html/modules.js
+1 −1 docs/api_reference_manual/html/navtreedata.js
+182 −182 docs/api_reference_manual/html/navtreeindex0.js
+102 −0 docs/api_reference_manual/html/navtreeindex1.js
+4 −3 docs/api_reference_manual/html/search/all_11.js
+296 −200 docs/api_reference_manual/html/search/all_2.js
+4 −1 docs/api_reference_manual/html/search/all_4.js
+1 −1 docs/api_reference_manual/html/search/all_9.js
+4 −3 docs/api_reference_manual/html/search/all_d.js
+12 −9 docs/api_reference_manual/html/search/classes_0.js
+12 −10 docs/api_reference_manual/html/search/enums_0.js
+183 −101 docs/api_reference_manual/html/search/enumvalues_0.js
+25 −24 docs/api_reference_manual/html/search/functions_0.js
+1 −1 docs/api_reference_manual/html/search/groups_0.js
+1 −1 docs/api_reference_manual/html/search/groups_2.js
+4 −1 docs/api_reference_manual/html/search/variables_4.js
+4 −3 docs/api_reference_manual/html/search/variables_d.js
+2 −2 docs/api_reference_manual/html/structcy__wcm__ap__config__t.html
+113 −0 docs/api_reference_manual/html/structcy__wcm__deregister__event__callback__params__t.html
+134 −0 docs/api_reference_manual/html/structcy__wcm__event__callback__params__t.html
+113 −0 docs/api_reference_manual/html/structcy__wcm__register__event__callback__params__t.html
+2 −2 docs/api_reference_manual/html/structcy__wcm__scan__filter__t.html
+1 −1 docs/api_reference_manual/html/structcy__wcm__wlan__statistics__t.html
+ − docs/api_reference_manual/html/uml_wps_enrollee.png
+4 −0 docs/api_reference_manual/html/unioncy__wcm__event__data__t.html
+145 −96 include/cy_wcm.h
+134 −20 include/cy_wcm_error.h
+99 −0 include/cy_wcm_internal.h
+1 −1 include/cy_wcm_log.h
+34 −0 porting_guide.md
+2 −2 source/COMPONENT_43012/cy_chip_constants.h
+2 −2 source/COMPONENT_43438/cy_chip_constants.h
+2 −2 source/COMPONENT_43439/cy_chip_constants.h
+2 −2 source/COMPONENT_4343W/cy_chip_constants.h
+2 −2 source/COMPONENT_4373/cy_chip_constants.h
+2 −2 source/COMPONENT_4390X/cy_chip_constants.h
+43 −0 source/COMPONENT_55500/cy_chip_constants.h
+43 −0 source/COMPONENT_55900/cy_chip_constants.h
+16 −16 source/COMPONENT_MBEDTLS/cy_wps_aes_ctr_ccm.c
+11 −7 source/COMPONENT_MBEDTLS/cy_wps_crypto.c
+6 −6 source/COMPONENT_MBEDTLS/cy_wps_crypto.h
+1 −1 source/COMPONENT_WPS/Utilities/TLV/tlv.c
+5 −1 source/COMPONENT_WPS/Utilities/TLV/tlv.h
+1 −1 source/COMPONENT_WPS/cy_eapol.c
+1 −2 source/COMPONENT_WPS/cy_wcm_wps.c
+1 −2 source/COMPONENT_WPS/cy_wps.c
+4 −4 source/COMPONENT_WPS/cy_wps_common.c
+1 −1 source/COMPONENT_WPS/cy_wps_enrollee.c
+1 −2 source/COMPONENT_WPS/include/cy_eapol.h
+1 −1 source/COMPONENT_WPS/include/cy_template_wps_packets.h
+1 −1 source/COMPONENT_WPS/include/cy_wps.h
+5 −1 source/COMPONENT_WPS/include/cy_wps_common.h
+1 −1 source/COMPONENT_WPS/include/cy_wps_constants.h
+1 −1 source/COMPONENT_WPS/include/cy_wps_memory.h
+1 −1 source/COMPONENT_WPS/include/cy_wps_result.h
+1 −1 source/COMPONENT_WPS/include/cy_wps_structures.h
+1 −1 source/COMPONENT_WPS/include/wps_helper_utility.h
+1 −1 source/COMPONENT_WPS/nn.c
+1 −1 source/COMPONENT_WPS/nn.h
+990 −727 source/cy_wcm.c
+1 −1 version.xml
2 changes: 1 addition & 1 deletion third_party/infineon/psoc6/psoc6_sdk/libs/wifi-host-driver
Submodule wifi-host-driver updated 358 files
1 change: 0 additions & 1 deletion third_party/infineon/psoc6/psoc6_sdk/libs/wifi-mw-core
Submodule wifi-mw-core deleted from 1024db

0 comments on commit c6c3270

Please sign in to comment.