Skip to content

Commit 738269c

Browse files
McuxCIBotkaranNXP
McuxCIBot
authored and
karanNXP
committed
Pull request #41: Add files for release/2.16.000_major_rfp_gh_review from CI Generation
Merge in MCUCORE/mcux-sdk-wifi-nxp from release/2.16.000_major_rfp_gh_review to release/2.16.000_major_rfp_gh
1 parent a1372ff commit 738269c

32 files changed

+575
-70
lines changed

‎incl/port/osa/osa.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ static inline void OSA_Srand(uint32_t seed)
333333
*/
334334
static inline uint32_t OSA_Rand()
335335
{
336-
if (wm_rand_seed == -1)
336+
if (wm_rand_seed == 0xFFFFFFFFU)
337337
OSA_Srand(OSA_TimeGetMsec());
338338
wm_rand_seed = (uint32_t)((((uint64_t)wm_rand_seed * 279470273UL) % 4294967291UL) & 0xFFFFFFFFUL);
339339
return wm_rand_seed;

‎incl/wlcmgr/wlan.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
#include <wifi_events.h>
131131
#include <wifi.h>
132132

133-
#define WLAN_DRV_VERSION "v1.3.r48.p15"
133+
#define WLAN_DRV_VERSION "v1.3.r48.p16"
134134

135135
#if CONFIG_WPA2_ENTP
136136
#include <wm_mbedtls_helper_api.h>

‎manifests/middleware_nxp_wifi_MCXN547_manifest_v3_14.xml‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<definition extID="middleware.lwip.MCXN547"/>
1111
<definition extID="middleware.lwip.apps.lwiperf.MCXN547"/>
1212
<definition extID="utility.debug_console.MCXN547"/>
13+
<definition extID="utility.debug_console_lite.MCXN547"/>
1314
<definition extID="middleware.sdmmc.sdio.MCXN547"/>
1415
<definition extID="middleware.sdmmc.host.usdhc.MCXN547"/>
1516
<definition extID="middleware.sdmmc.host.usdhc.freertos.MCXN547"/>
@@ -346,7 +347,20 @@
346347
<component id="middleware.wifi.wifidriver.MCXN547" name="nxp_wifi_driver" brief="NXP Wi-Fi driver" version="1.3.46" full_name="NXP Wi-Fi driver" category="Wireless/NXP Wi-Fi" user_visible="false" type="middleware" package_base_path=".././" project_base_path="wifi">
347348
<dependencies>
348349
<all>
349-
<component_dependency value="utility.debug_console.MCXN547"/>
350+
<any_of>
351+
<all>
352+
<not>
353+
<component_dependency value="utility.debug_console_lite.MCXN547"/>
354+
</not>
355+
<component_dependency value="utility.debug_console.MCXN547"/>
356+
</all>
357+
<all>
358+
<not>
359+
<component_dependency value="utility.debug_console.MCXN547"/>
360+
</not>
361+
<component_dependency value="utility.debug_console_lite.MCXN547"/>
362+
</all>
363+
</any_of>
350364
<component_dependency value="middleware.wifi.template.MCXN547"/>
351365
<component_dependency value="middleware.wifi.osa.MCXN547"/>
352366
<component_dependency value="middleware.wifi.net.MCXN547"/>
@@ -469,7 +483,20 @@
469483
<component id="middleware.wifi.MCXN547" name="wifi_nxp" brief="NXP Wi-Fi functionality enables customers to quickly develop applications of interest to add connectivity to different sensors and appliances" version="1.3.46" full_name="NXP Wi-Fi" category="Wireless/NXP Wi-Fi" user_visible="true" type="middleware" package_base_path=".././" project_base_path="wifi">
470484
<dependencies>
471485
<all>
472-
<component_dependency value="utility.debug_console.MCXN547"/>
486+
<any_of>
487+
<all>
488+
<not>
489+
<component_dependency value="utility.debug_console_lite.MCXN547"/>
490+
</not>
491+
<component_dependency value="utility.debug_console.MCXN547"/>
492+
</all>
493+
<all>
494+
<not>
495+
<component_dependency value="utility.debug_console.MCXN547"/>
496+
</not>
497+
<component_dependency value="utility.debug_console_lite.MCXN547"/>
498+
</all>
499+
</any_of>
473500
<component_dependency value="middleware.wifi.template.MCXN547"/>
474501
<component_dependency value="middleware.wifi.wifidriver.MCXN547"/>
475502
<device_dependency value="MCXN547"/>

‎manifests/middleware_nxp_wifi_MCXN947_manifest_v3_14.xml‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<definition extID="middleware.lwip.MCXN947"/>
1212
<definition extID="middleware.lwip.apps.lwiperf.MCXN947"/>
1313
<definition extID="utility.debug_console.MCXN947"/>
14+
<definition extID="utility.debug_console_lite.MCXN947"/>
1415
<definition extID="middleware.sdmmc.sdio.MCXN947"/>
1516
<definition extID="middleware.sdmmc.host.usdhc.MCXN947"/>
1617
<definition extID="middleware.sdmmc.host.usdhc.freertos.MCXN947"/>
@@ -397,7 +398,20 @@
397398
<component id="middleware.wifi.wifidriver.MCXN947" name="nxp_wifi_driver" brief="NXP Wi-Fi driver" version="1.3.46" full_name="NXP Wi-Fi driver" category="Wireless/NXP Wi-Fi" user_visible="false" type="middleware" package_base_path=".././" project_base_path="wifi">
398399
<dependencies>
399400
<all>
400-
<component_dependency value="utility.debug_console.MCXN947"/>
401+
<any_of>
402+
<all>
403+
<not>
404+
<component_dependency value="utility.debug_console_lite.MCXN947"/>
405+
</not>
406+
<component_dependency value="utility.debug_console.MCXN947"/>
407+
</all>
408+
<all>
409+
<not>
410+
<component_dependency value="utility.debug_console.MCXN947"/>
411+
</not>
412+
<component_dependency value="utility.debug_console_lite.MCXN947"/>
413+
</all>
414+
</any_of>
401415
<component_dependency value="middleware.wifi.template.MCXN947"/>
402416
<component_dependency value="middleware.wifi.osa.MCXN947"/>
403417
<component_dependency value="middleware.wifi.net.MCXN947"/>
@@ -520,7 +534,20 @@
520534
<component id="middleware.wifi.MCXN947" name="wifi_nxp" brief="NXP Wi-Fi functionality enables customers to quickly develop applications of interest to add connectivity to different sensors and appliances" version="1.3.46" full_name="NXP Wi-Fi" category="Wireless/NXP Wi-Fi" user_visible="true" type="middleware" package_base_path=".././" project_base_path="wifi">
521535
<dependencies>
522536
<all>
523-
<component_dependency value="utility.debug_console.MCXN947"/>
537+
<any_of>
538+
<all>
539+
<not>
540+
<component_dependency value="utility.debug_console_lite.MCXN947"/>
541+
</not>
542+
<component_dependency value="utility.debug_console.MCXN947"/>
543+
</all>
544+
<all>
545+
<not>
546+
<component_dependency value="utility.debug_console.MCXN947"/>
547+
</not>
548+
<component_dependency value="utility.debug_console_lite.MCXN947"/>
549+
</all>
550+
</any_of>
524551
<component_dependency value="middleware.wifi.template.MCXN947"/>
525552
<component_dependency value="middleware.wifi.wifidriver.MCXN947"/>
526553
<device_dependency value="MCXN947"/>

‎manifests/middleware_nxp_wifi_MIMXRT1021_manifest_v3_14.xml‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<definition extID="middleware.lwip.MIMXRT1021"/>
1212
<definition extID="middleware.lwip.apps.lwiperf.MIMXRT1021"/>
1313
<definition extID="utility.debug_console.MIMXRT1021"/>
14+
<definition extID="utility.debug_console_lite.MIMXRT1021"/>
1415
<definition extID="middleware.sdmmc.sdio.MIMXRT1021"/>
1516
<definition extID="middleware.sdmmc.host.usdhc.MIMXRT1021"/>
1617
<definition extID="middleware.sdmmc.host.usdhc.freertos.MIMXRT1021"/>
@@ -397,7 +398,20 @@
397398
<component id="middleware.wifi.wifidriver.MIMXRT1021" name="nxp_wifi_driver" brief="NXP Wi-Fi driver" version="1.3.46" full_name="NXP Wi-Fi driver" category="Wireless/NXP Wi-Fi" user_visible="false" type="middleware" package_base_path=".././" project_base_path="wifi">
398399
<dependencies>
399400
<all>
400-
<component_dependency value="utility.debug_console.MIMXRT1021"/>
401+
<any_of>
402+
<all>
403+
<not>
404+
<component_dependency value="utility.debug_console_lite.MIMXRT1021"/>
405+
</not>
406+
<component_dependency value="utility.debug_console.MIMXRT1021"/>
407+
</all>
408+
<all>
409+
<not>
410+
<component_dependency value="utility.debug_console.MIMXRT1021"/>
411+
</not>
412+
<component_dependency value="utility.debug_console_lite.MIMXRT1021"/>
413+
</all>
414+
</any_of>
401415
<component_dependency value="middleware.wifi.template.MIMXRT1021"/>
402416
<component_dependency value="middleware.wifi.osa.MIMXRT1021"/>
403417
<component_dependency value="middleware.wifi.net.MIMXRT1021"/>
@@ -520,7 +534,20 @@
520534
<component id="middleware.wifi.MIMXRT1021" name="wifi_nxp" brief="NXP Wi-Fi functionality enables customers to quickly develop applications of interest to add connectivity to different sensors and appliances" version="1.3.46" full_name="NXP Wi-Fi" category="Wireless/NXP Wi-Fi" user_visible="true" type="middleware" package_base_path=".././" project_base_path="wifi">
521535
<dependencies>
522536
<all>
523-
<component_dependency value="utility.debug_console.MIMXRT1021"/>
537+
<any_of>
538+
<all>
539+
<not>
540+
<component_dependency value="utility.debug_console_lite.MIMXRT1021"/>
541+
</not>
542+
<component_dependency value="utility.debug_console.MIMXRT1021"/>
543+
</all>
544+
<all>
545+
<not>
546+
<component_dependency value="utility.debug_console.MIMXRT1021"/>
547+
</not>
548+
<component_dependency value="utility.debug_console_lite.MIMXRT1021"/>
549+
</all>
550+
</any_of>
524551
<component_dependency value="middleware.wifi.template.MIMXRT1021"/>
525552
<component_dependency value="middleware.wifi.wifidriver.MIMXRT1021"/>
526553
<device_dependency value="MIMXRT1021xxxxx"/>

‎manifests/middleware_nxp_wifi_MIMXRT1024_manifest_v3_14.xml‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<definition extID="middleware.lwip.MIMXRT1024"/>
1212
<definition extID="middleware.lwip.apps.lwiperf.MIMXRT1024"/>
1313
<definition extID="utility.debug_console.MIMXRT1024"/>
14+
<definition extID="utility.debug_console_lite.MIMXRT1024"/>
1415
<definition extID="middleware.sdmmc.sdio.MIMXRT1024"/>
1516
<definition extID="middleware.sdmmc.host.usdhc.MIMXRT1024"/>
1617
<definition extID="middleware.sdmmc.host.usdhc.freertos.MIMXRT1024"/>
@@ -397,7 +398,20 @@
397398
<component id="middleware.wifi.wifidriver.MIMXRT1024" name="nxp_wifi_driver" brief="NXP Wi-Fi driver" version="1.3.46" full_name="NXP Wi-Fi driver" category="Wireless/NXP Wi-Fi" user_visible="false" type="middleware" package_base_path=".././" project_base_path="wifi">
398399
<dependencies>
399400
<all>
400-
<component_dependency value="utility.debug_console.MIMXRT1024"/>
401+
<any_of>
402+
<all>
403+
<not>
404+
<component_dependency value="utility.debug_console_lite.MIMXRT1024"/>
405+
</not>
406+
<component_dependency value="utility.debug_console.MIMXRT1024"/>
407+
</all>
408+
<all>
409+
<not>
410+
<component_dependency value="utility.debug_console.MIMXRT1024"/>
411+
</not>
412+
<component_dependency value="utility.debug_console_lite.MIMXRT1024"/>
413+
</all>
414+
</any_of>
401415
<component_dependency value="middleware.wifi.template.MIMXRT1024"/>
402416
<component_dependency value="middleware.wifi.osa.MIMXRT1024"/>
403417
<component_dependency value="middleware.wifi.net.MIMXRT1024"/>
@@ -520,7 +534,20 @@
520534
<component id="middleware.wifi.MIMXRT1024" name="wifi_nxp" brief="NXP Wi-Fi functionality enables customers to quickly develop applications of interest to add connectivity to different sensors and appliances" version="1.3.46" full_name="NXP Wi-Fi" category="Wireless/NXP Wi-Fi" user_visible="true" type="middleware" package_base_path=".././" project_base_path="wifi">
521535
<dependencies>
522536
<all>
523-
<component_dependency value="utility.debug_console.MIMXRT1024"/>
537+
<any_of>
538+
<all>
539+
<not>
540+
<component_dependency value="utility.debug_console_lite.MIMXRT1024"/>
541+
</not>
542+
<component_dependency value="utility.debug_console.MIMXRT1024"/>
543+
</all>
544+
<all>
545+
<not>
546+
<component_dependency value="utility.debug_console.MIMXRT1024"/>
547+
</not>
548+
<component_dependency value="utility.debug_console_lite.MIMXRT1024"/>
549+
</all>
550+
</any_of>
524551
<component_dependency value="middleware.wifi.template.MIMXRT1024"/>
525552
<component_dependency value="middleware.wifi.wifidriver.MIMXRT1024"/>
526553
<device_dependency value="MIMXRT1024xxxxx"/>

‎manifests/middleware_nxp_wifi_MIMXRT1042_manifest_v3_14.xml‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<definition extID="middleware.lwip.MIMXRT1042"/>
1212
<definition extID="middleware.lwip.apps.lwiperf.MIMXRT1042"/>
1313
<definition extID="utility.debug_console.MIMXRT1042"/>
14+
<definition extID="utility.debug_console_lite.MIMXRT1042"/>
1415
<definition extID="middleware.sdmmc.sdio.MIMXRT1042"/>
1516
<definition extID="middleware.sdmmc.host.usdhc.MIMXRT1042"/>
1617
<definition extID="middleware.sdmmc.host.usdhc.freertos.MIMXRT1042"/>
@@ -397,7 +398,20 @@
397398
<component id="middleware.wifi.wifidriver.MIMXRT1042" name="nxp_wifi_driver" brief="NXP Wi-Fi driver" version="1.3.46" full_name="NXP Wi-Fi driver" category="Wireless/NXP Wi-Fi" user_visible="false" type="middleware" package_base_path=".././" project_base_path="wifi">
398399
<dependencies>
399400
<all>
400-
<component_dependency value="utility.debug_console.MIMXRT1042"/>
401+
<any_of>
402+
<all>
403+
<not>
404+
<component_dependency value="utility.debug_console_lite.MIMXRT1042"/>
405+
</not>
406+
<component_dependency value="utility.debug_console.MIMXRT1042"/>
407+
</all>
408+
<all>
409+
<not>
410+
<component_dependency value="utility.debug_console.MIMXRT1042"/>
411+
</not>
412+
<component_dependency value="utility.debug_console_lite.MIMXRT1042"/>
413+
</all>
414+
</any_of>
401415
<component_dependency value="middleware.wifi.template.MIMXRT1042"/>
402416
<component_dependency value="middleware.wifi.osa.MIMXRT1042"/>
403417
<component_dependency value="middleware.wifi.net.MIMXRT1042"/>
@@ -520,7 +534,20 @@
520534
<component id="middleware.wifi.MIMXRT1042" name="wifi_nxp" brief="NXP Wi-Fi functionality enables customers to quickly develop applications of interest to add connectivity to different sensors and appliances" version="1.3.46" full_name="NXP Wi-Fi" category="Wireless/NXP Wi-Fi" user_visible="true" type="middleware" package_base_path=".././" project_base_path="wifi">
521535
<dependencies>
522536
<all>
523-
<component_dependency value="utility.debug_console.MIMXRT1042"/>
537+
<any_of>
538+
<all>
539+
<not>
540+
<component_dependency value="utility.debug_console_lite.MIMXRT1042"/>
541+
</not>
542+
<component_dependency value="utility.debug_console.MIMXRT1042"/>
543+
</all>
544+
<all>
545+
<not>
546+
<component_dependency value="utility.debug_console.MIMXRT1042"/>
547+
</not>
548+
<component_dependency value="utility.debug_console_lite.MIMXRT1042"/>
549+
</all>
550+
</any_of>
524551
<component_dependency value="middleware.wifi.template.MIMXRT1042"/>
525552
<component_dependency value="middleware.wifi.wifidriver.MIMXRT1042"/>
526553
<device_dependency value="MIMXRT1042xxxxB"/>

‎manifests/middleware_nxp_wifi_MIMXRT1052_manifest_v3_14.xml‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<definition extID="middleware.lwip.MIMXRT1052"/>
1212
<definition extID="middleware.lwip.apps.lwiperf.MIMXRT1052"/>
1313
<definition extID="utility.debug_console.MIMXRT1052"/>
14+
<definition extID="utility.debug_console_lite.MIMXRT1052"/>
1415
<definition extID="middleware.sdmmc.sdio.MIMXRT1052"/>
1516
<definition extID="middleware.sdmmc.host.usdhc.MIMXRT1052"/>
1617
<definition extID="middleware.sdmmc.host.usdhc.freertos.MIMXRT1052"/>
@@ -397,7 +398,20 @@
397398
<component id="middleware.wifi.wifidriver.MIMXRT1052" name="nxp_wifi_driver" brief="NXP Wi-Fi driver" version="1.3.46" full_name="NXP Wi-Fi driver" category="Wireless/NXP Wi-Fi" user_visible="false" type="middleware" package_base_path=".././" project_base_path="wifi">
398399
<dependencies>
399400
<all>
400-
<component_dependency value="utility.debug_console.MIMXRT1052"/>
401+
<any_of>
402+
<all>
403+
<not>
404+
<component_dependency value="utility.debug_console_lite.MIMXRT1052"/>
405+
</not>
406+
<component_dependency value="utility.debug_console.MIMXRT1052"/>
407+
</all>
408+
<all>
409+
<not>
410+
<component_dependency value="utility.debug_console.MIMXRT1052"/>
411+
</not>
412+
<component_dependency value="utility.debug_console_lite.MIMXRT1052"/>
413+
</all>
414+
</any_of>
401415
<component_dependency value="middleware.wifi.template.MIMXRT1052"/>
402416
<component_dependency value="middleware.wifi.osa.MIMXRT1052"/>
403417
<component_dependency value="middleware.wifi.net.MIMXRT1052"/>
@@ -520,7 +534,20 @@
520534
<component id="middleware.wifi.MIMXRT1052" name="wifi_nxp" brief="NXP Wi-Fi functionality enables customers to quickly develop applications of interest to add connectivity to different sensors and appliances" version="1.3.46" full_name="NXP Wi-Fi" category="Wireless/NXP Wi-Fi" user_visible="true" type="middleware" package_base_path=".././" project_base_path="wifi">
521535
<dependencies>
522536
<all>
523-
<component_dependency value="utility.debug_console.MIMXRT1052"/>
537+
<any_of>
538+
<all>
539+
<not>
540+
<component_dependency value="utility.debug_console_lite.MIMXRT1052"/>
541+
</not>
542+
<component_dependency value="utility.debug_console.MIMXRT1052"/>
543+
</all>
544+
<all>
545+
<not>
546+
<component_dependency value="utility.debug_console.MIMXRT1052"/>
547+
</not>
548+
<component_dependency value="utility.debug_console_lite.MIMXRT1052"/>
549+
</all>
550+
</any_of>
524551
<component_dependency value="middleware.wifi.template.MIMXRT1052"/>
525552
<component_dependency value="middleware.wifi.wifidriver.MIMXRT1052"/>
526553
<device_dependency value="MIMXRT1052xxxxB"/>

0 commit comments

Comments
 (0)