Skip to content

[pull] main from FreeRTOS:main #19

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
pull merged 1 commit into from
Mar 16, 2026
Merged

[pull] main from FreeRTOS:main #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
#include <io.h>
#include <ctype.h>

/* Windows includes. */
#include <windows.h>

/* FreeRTOS includes. */
#include "FreeRTOS.h"
#include "task.h"
Expand Down
3 changes: 3 additions & 0 deletions FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/Run-time-stats-utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
/* FreeRTOS includes. */
#include <FreeRTOS.h>

/* Windows includes for performance counter APIs. */
#include <windows.h>

/* Variables used in the creation of the run time stats time base. Run time
* stats record how much time each task spends in the Running state. */
static long long llInitialRunTimeCounterValue = 0LL, llTicksPerHundredthMillisecond = 0LL;
Expand Down
3 changes: 3 additions & 0 deletions ...OS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Run-time-stats-utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
/* FreeRTOS includes. */
#include <FreeRTOS.h>

/* Windows includes for performance counter APIs. */
#include <windows.h>

/* Variables used in the creation of the run time stats time base. Run time
* stats record how much time each task spends in the Running state. */
static long long llInitialRunTimeCounterValue = 0LL, llTicksPerHundredthMillisecond = 0LL;
Expand Down
1 change: 1 addition & 0 deletions ...TOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/Sample-CLI-commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

/* FreeRTOS+CLI includes. */
#include "FreeRTOS_CLI.h"
Expand Down
3 changes: 3 additions & 0 deletions FreeRTOS-Plus/Demo/FreeRTOS_Plus_Reliance_Edge_and_CLI_Windows_Simulator/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
#include <stdio.h>
#include <stdint.h>

/* Windows includes. */
#include <windows.h>

/* FreeRTOS includes. */
#include <FreeRTOS.h>
#include "task.h"
Expand Down
2 changes: 1 addition & 1 deletion ...S-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/FreeRTOS_Plus_TCP_Minimal.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Iphlpapi.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_with_Libslirp|Win32'">
Expand Down
3 changes: 3 additions & 0 deletions FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
#include <stdio.h>
#include <time.h>

/* Windows includes. */
#include <windows.h>

/* FreeRTOS includes. */
#include <FreeRTOS.h>
#include "task.h"
Expand Down
3 changes: 3 additions & 0 deletions FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/Run-time-stats-utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
/* FreeRTOS includes. */
#include <FreeRTOS.h>

/* Windows includes for performance counter APIs. */
#include <windows.h>

/* Variables used in the creation of the run time stats time base. Run time
* stats record how much time each task spends in the Running state. */
static long long llInitialRunTimeCounterValue = 0LL, llTicksPerHundredthMillisecond = 0LL;
Expand Down
3 changes: 3 additions & 0 deletions FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
#include <stdio.h>
#include <stdint.h>

/* Windows includes. */
#include <windows.h>

/* FreeRTOS includes. */
#include <FreeRTOS.h>
#include "task.h"
Expand Down
3 changes: 3 additions & 0 deletions FreeRTOS-Plus/Demo/FreeRTOS_Plus_WolfSSL_Windows_Simulator/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@
#include <stdio.h>
#include <stdint.h>

/* Windows includes. */
#include <windows.h>

/* FreeRTOS includes. */
#include <FreeRTOS.h>
#include "task.h"
Expand Down
2 changes: 1 addition & 1 deletion FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP
Open in desktop
Submodule FreeRTOS-Plus-TCP updated 216 files
2 changes: 1 addition & 1 deletion FreeRTOS/Source
Open in desktop
Submodule Source updated 70 files
+15 −0 .github/.cSpellWords.txt
+4 −0 .github/scripts/kernel_checker.py
+8 −0 CMakeLists.txt
+115 −0 History.txt
+88 −0 MISRA.md
+3 −3 event_groups.c
+1 −1 examples/cmake_example/main.c
+2 −2 examples/template_configuration/FreeRTOSConfig.h
+6 −6 include/queue.h
+12 −6 include/task.h
+4 −4 portable/ARMv8M/ReadMe.txt
+84 −70 portable/ARMv8M/copy_files.py
+4 −4 portable/ARMv8M/non_secure/ReadMe.txt
+80 −0 portable/ARMv8M/non_secure/portable/GCC/ARM_STAR_MC3/portmacro.h
+87 −0 portable/ARMv8M/non_secure/portable/IAR/ARM_STAR_MC3/portmacro.h
+4 −4 portable/ARMv8M/secure/ReadMe.txt
+65 −9 portable/CMakeLists.txt
+7 −1 portable/GCC/ARM_CR82/README.md
+944 −0 portable/GCC/ARM_CR82/mpu_wrappers_v2_asm.c
+1,145 −232 portable/GCC/ARM_CR82/port.c
+701 −205 portable/GCC/ARM_CR82/portASM.S
+278 −34 portable/GCC/ARM_CR82/portmacro.h
+1 −1 portable/GCC/ARM_CRx_MPU/port.c
+5 −1 portable/GCC/ARM_CRx_No_GIC/port.c
+2,056 −0 portable/GCC/ARM_STAR_MC3/non_secure/mpu_wrappers_v2_asm.c
+2,280 −0 portable/GCC/ARM_STAR_MC3/non_secure/port.c
+621 −0 portable/GCC/ARM_STAR_MC3/non_secure/portasm.c
+114 −0 portable/GCC/ARM_STAR_MC3/non_secure/portasm.h
+80 −0 portable/GCC/ARM_STAR_MC3/non_secure/portmacro.h
+582 −0 portable/GCC/ARM_STAR_MC3/non_secure/portmacrocommon.h
+354 −0 portable/GCC/ARM_STAR_MC3/secure/secure_context.c
+138 −0 portable/GCC/ARM_STAR_MC3/secure/secure_context.h
+97 −0 portable/GCC/ARM_STAR_MC3/secure/secure_context_port.c
+485 −0 portable/GCC/ARM_STAR_MC3/secure/secure_heap.c
+66 −0 portable/GCC/ARM_STAR_MC3/secure/secure_heap.h
+106 −0 portable/GCC/ARM_STAR_MC3/secure/secure_init.c
+54 −0 portable/GCC/ARM_STAR_MC3/secure/secure_init.h
+140 −0 portable/GCC/ARM_STAR_MC3/secure/secure_port_macros.h
+2,055 −0 portable/GCC/ARM_STAR_MC3_NTZ/non_secure/mpu_wrappers_v2_asm.c
+2,280 −0 portable/GCC/ARM_STAR_MC3_NTZ/non_secure/port.c
+524 −0 portable/GCC/ARM_STAR_MC3_NTZ/non_secure/portasm.c
+114 −0 portable/GCC/ARM_STAR_MC3_NTZ/non_secure/portasm.h
+80 −0 portable/GCC/ARM_STAR_MC3_NTZ/non_secure/portmacro.h
+582 −0 portable/GCC/ARM_STAR_MC3_NTZ/non_secure/portmacrocommon.h
+1,242 −0 portable/IAR/ARM_STAR_MC3/non_secure/mpu_wrappers_v2_asm.S
+2,280 −0 portable/IAR/ARM_STAR_MC3/non_secure/port.c
+114 −0 portable/IAR/ARM_STAR_MC3/non_secure/portasm.h
+543 −0 portable/IAR/ARM_STAR_MC3/non_secure/portasm.s
+87 −0 portable/IAR/ARM_STAR_MC3/non_secure/portmacro.h
+582 −0 portable/IAR/ARM_STAR_MC3/non_secure/portmacrocommon.h
+354 −0 portable/IAR/ARM_STAR_MC3/secure/secure_context.c
+138 −0 portable/IAR/ARM_STAR_MC3/secure/secure_context.h
+86 −0 portable/IAR/ARM_STAR_MC3/secure/secure_context_port_asm.s
+485 −0 portable/IAR/ARM_STAR_MC3/secure/secure_heap.c
+66 −0 portable/IAR/ARM_STAR_MC3/secure/secure_heap.h
+106 −0 portable/IAR/ARM_STAR_MC3/secure/secure_init.c
+54 −0 portable/IAR/ARM_STAR_MC3/secure/secure_init.h
+140 −0 portable/IAR/ARM_STAR_MC3/secure/secure_port_macros.h
+1,242 −0 portable/IAR/ARM_STAR_MC3_NTZ/non_secure/mpu_wrappers_v2_asm.S
+2,280 −0 portable/IAR/ARM_STAR_MC3_NTZ/non_secure/port.c
+114 −0 portable/IAR/ARM_STAR_MC3_NTZ/non_secure/portasm.h
+456 −0 portable/IAR/ARM_STAR_MC3_NTZ/non_secure/portasm.s
+87 −0 portable/IAR/ARM_STAR_MC3_NTZ/non_secure/portmacro.h
+582 −0 portable/IAR/ARM_STAR_MC3_NTZ/non_secure/portmacrocommon.h
+53 −0 portable/IAR/RXv2/port_asm.s
+4 −4 portable/ThirdParty/GCC/ARM_TFM/README.md
+5 −0 portable/ThirdParty/GCC/RP2040/include/portmacro.h
+2 −0 queue.c
+3 −0 stream_buffer.c
+11 −10 tasks.c
4 changes: 2 additions & 2 deletions manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ license: "MIT"

dependencies:
- name: "FreeRTOS-Kernel"
version: "1dbc776"
version: "fcc6653"
repository:
type: "git"
url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git"
path: "FreeRTOS/Source"

- name: "FreeRTOS-Plus-TCP"
version: "fbb668ac"
version: "1f1ffec"
repository:
type: "git"
url: "https://github.com/FreeRTOS/FreeRTOS-Plus-TCP.git"
Expand Down
Loading