Merge branch 'main' into release_changelog_pre_v420

FreeRTOS · Jun 24, 2024 · 61e04e7 · 61e04e7
2 parents 8b617f4 + 9a88c9f
commit 61e04e7
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile
@@ -48,7 +48,7 @@ PROJECT_NAME = FreeRTOS-Plus-TCP
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = V4.1.0
+PROJECT_NUMBER = V4.2.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/manifest.yml b/manifest.yml
@@ -1,12 +1,12 @@
 name: "FreeRTOS-Plus-TCP"
-version: "V4.1.0"
+version: "V4.2.0"
 description:
  "Thread safe FreeRTOS TCP/IP stack working on top of the FreeRTOS-Kernel to
  implement the TCP/IP protocol. Suitable for microcontrollers."
 license: "MIT"
 dependencies:
  - name: "FreeRTOS-Kernel"
- version: "V11.0.1"
+ version: "V11.1.0"
  license: "MIT"
  repository:
  type: "git"

diff --git a/test/FreeRTOS-Kernel b/test/FreeRTOS-Kernel
diff --git a/test/cbmc/proofs/DNS_ParseDNSReply/Configurations.json b/test/cbmc/proofs/DNS_ParseDNSReply/Configurations.json
@@ -1,8 +1,8 @@
 {
  "ENTRY": "DNS_ParseDNSReply",
- "TEST_PAYLOAD_SIZE": 5,
- "TEST_IPV4_PACKET_SIZE": 59,
- "TEST_IPV6_PACKET_SIZE": 79,
+ "TEST_PAYLOAD_SIZE": 2,
+ "TEST_IPV4_PACKET_SIZE": 29,
+ "TEST_IPV6_PACKET_SIZE": 49,
  "CBMCFLAGS":
  [
  "--unwind 1",

diff --git a/test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_stubs.c b/test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_stubs.c
@@ -78,7 +78,7 @@ void vApplicationDaemonTaskStartupHook( void )
 }
 void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,
  StackType_t ** ppxTimerTaskStackBuffer,
- uint32_t * pulTimerTaskStackSize )
+ configSTACK_DEPTH_TYPE * puxTimerTaskStackSize )
 {
 }
 void vPortDeleteThread( void * pvTaskToDelete )
@@ -125,7 +125,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete,
 }
 void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,
  StackType_t ** ppxIdleTaskStackBuffer,
- uint32_t * pulIdleTaskStackSize )
+ configSTACK_DEPTH_TYPE * puxIdleTaskStackSize )
 {
 }
 void vConfigureTimerForRunTimeStats( void )

diff --git a/...-test/FreeRTOS_ARP_DataLenLessThanMinPacket/FreeRTOS_ARP_DataLenLessThanMinPacket_stubs.c b/...-test/FreeRTOS_ARP_DataLenLessThanMinPacket/FreeRTOS_ARP_DataLenLessThanMinPacket_stubs.c
@@ -74,7 +74,7 @@ void vApplicationDaemonTaskStartupHook( void )
 }
 void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,
  StackType_t ** ppxTimerTaskStackBuffer,
- uint32_t * pulTimerTaskStackSize )
+ configSTACK_DEPTH_TYPE * puxTimerTaskStackSize )
 {
 }
 void vPortDeleteThread( void * pvTaskToDelete )
@@ -121,7 +121,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete,
 }
 void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,
  StackType_t ** ppxIdleTaskStackBuffer,
- uint32_t * pulIdleTaskStackSize )
+ configSTACK_DEPTH_TYPE * puxIdleTaskStackSize )
 {
 }
 void vConfigureTimerForRunTimeStats( void )

diff --git a/test/unit-test/FreeRTOS_DHCP/FreeRTOS_DHCP_stubs.c b/test/unit-test/FreeRTOS_DHCP/FreeRTOS_DHCP_stubs.c
@@ -134,7 +134,7 @@ void vApplicationDaemonTaskStartupHook( void )
 }
 void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,
  StackType_t ** ppxTimerTaskStackBuffer,
- uint32_t * pulTimerTaskStackSize )
+ configSTACK_DEPTH_TYPE * puxTimerTaskStackSize )
 {
 }
 void vPortDeleteThread( void * pvTaskToDelete )
@@ -181,7 +181,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete,
 }
 void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,
  StackType_t ** ppxIdleTaskStackBuffer,
- uint32_t * pulIdleTaskStackSize )
+ configSTACK_DEPTH_TYPE * puxIdleTaskStackSize )
 {
 }
 void vConfigureTimerForRunTimeStats( void )

diff --git a/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_stubs.c b/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_stubs.c
@@ -95,7 +95,7 @@ void vApplicationDaemonTaskStartupHook( void )
 
 void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,
  StackType_t ** ppxTimerTaskStackBuffer,
- uint32_t * pulTimerTaskStackSize )
+ configSTACK_DEPTH_TYPE * puxTimerTaskStackSize )
 {
 }
 
@@ -144,7 +144,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete,
 
 void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,
  StackType_t ** ppxIdleTaskStackBuffer,
- uint32_t * pulIdleTaskStackSize )
+ configSTACK_DEPTH_TYPE * puxIdleTaskStackSize )
 {
 }
 

diff --git a/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOS_Tiny_TCP_stubs.c b/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOS_Tiny_TCP_stubs.c
@@ -88,7 +88,7 @@ void vApplicationDaemonTaskStartupHook( void )
 }
 void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,
  StackType_t ** ppxTimerTaskStackBuffer,
- uint32_t * pulTimerTaskStackSize )
+ configSTACK_DEPTH_TYPE * puxTimerTaskStackSize )
 {
 }
 void vPortDeleteThread( void * pvTaskToDelete )
@@ -135,7 +135,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete,
 }
 void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,
  StackType_t ** ppxIdleTaskStackBuffer,
- uint32_t * pulIdleTaskStackSize )
+ configSTACK_DEPTH_TYPE * puxIdleTaskStackSize )
 {
 }
 void vConfigureTimerForRunTimeStats( void )