Merge branch 'main' into qemu_demo_m4_mpu

.github/scripts/common/requirements.txt

@@ -10,5 +10,5 @@ gitdb
 idna
 requests
 smmap
-urllib3
+urllib3 >= 2.0.7
 wrapt

.github/workflows/freertos_demos.yml

@@ -24,7 +24,7 @@ jobs:
           stepName: Checkout Repository
         name: ${{ env.stepName }}
         uses: actions/checkout@v3
-          
+
       - env:
           stepName: Fetch Required Submodule
         name: ${{ env.stepName }}
@@ -62,7 +62,8 @@ jobs:
           $content = Get-Content -Path 'main.c' -Raw
           $newContent = $content -replace 'int\s+main(.*?)void(.*?)\r?\n\s*{', 'int main( void ){setvbuf( stdout, NULL, _IONBF, 0 );'
           $newContent | Set-Content -Path 'main.c'
-          msbuild WIN32.sln -t:rebuild
+          msbuild WIN32.sln /p:Platform=Win32 -t:rebuild
+          msbuild WIN32.sln /p:Platform=x64 -t:rebuild
           $exitStatus = $?
           echo "::endgroup::"
           if($exitStatus -eq 1) {
@@ -73,11 +74,21 @@ jobs:
           }
 
       - env:
-          stepName: Run and monitor WIN32-MSVC Full Demo
+          stepName: Run and monitor WIN32-MSVC Full Demo - Win32
+        name: ${{ env.stepName }}
+        uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main
+        with:
+          exe-path: FreeRTOS/Demo/WIN32-MSVC/Win32/Debug/RTOSDemo.exe
+          timeout-seconds: 60
+          success-line: "No errors - tick count"
+          retry-attempts: 3
+
+      - env:
+          stepName: Run and monitor WIN32-MSVC Full Demo - x64
         name: ${{ env.stepName }}
         uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main
         with:
-          exe-path: FreeRTOS/Demo/WIN32-MSVC/Debug/RTOSDemo.exe
+          exe-path: FreeRTOS/Demo/WIN32-MSVC/x64/Debug/RTOSDemo.exe
           timeout-seconds: 60
           success-line: "No errors - tick count"
           retry-attempts: 3
@@ -93,7 +104,8 @@ jobs:
           $content = Get-Content -Path 'main.c' -Raw
           $newContent = $content -replace '#define\s+mainCREATE_SIMPLE_BLINKY_DEMO_ONLY\s+0', '#define mainCREATE_SIMPLE_BLINKY_DEMO_ONLY    1'
           $newContent | Set-Content -Path 'main.c'
-          msbuild WIN32.sln -t:rebuild
+          msbuild WIN32.sln /p:Platform=Win32 -t:rebuild
+          msbuild WIN32.sln /p:Platform=x64 -t:rebuild
           echo "::endgroup::"
           $exitStatus = $?
           if($exitStatus -eq 1) {
@@ -104,11 +116,21 @@ jobs:
           }
 
       - env:
-          stepName: Run and monitor WIN32-MSVC Blinky Demo
+          stepName: Run and monitor WIN32-MSVC Blinky Demo - Win32
+        name: ${{ env.stepName }}
+        uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main
+        with:
+            exe-path: FreeRTOS/Demo/WIN32-MSVC/Win32/Debug/RTOSDemo.exe
+            timeout-seconds: 60
+            success-line: "Message received from software timer"
+            retry-attempts: 3
+
+      - env:
+          stepName: Run and monitor WIN32-MSVC Blinky Demo - x64
         name: ${{ env.stepName }}
         uses: FreeRTOS/CI-CD-GitHub-Actions/executable-monitor@main
         with:
-            exe-path: FreeRTOS/Demo/WIN32-MSVC/Debug/RTOSDemo.exe
+            exe-path: FreeRTOS/Demo/WIN32-MSVC/x64/Debug/RTOSDemo.exe
             timeout-seconds: 60
             success-line: "Message received from software timer"
             retry-attempts: 3

FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/FreeRTOSConfig.h

@@ -205,19 +205,22 @@ extern void vAssertCalled( const char * const pcFileName,
  * 208.67.220.220. Used in ipconfigUSE_DNS is set to 0, or ipconfigUSE_DNS is set
  * to 1 but a DNS server cannot be contacted.*/
 
-#define configDNS_SERVER_ADDR0    10
-#define configDNS_SERVER_ADDR1    4
-#define configDNS_SERVER_ADDR2    4
-#define configDNS_SERVER_ADDR3    10
+#define configDNS_SERVER_ADDR0                 10
+#define configDNS_SERVER_ADDR1                 4
+#define configDNS_SERVER_ADDR2                 4
+#define configDNS_SERVER_ADDR3                 10
 
 /* Default netmask configuration. Used in ipconfigUSE_DNS is set to 0, or
  * ipconfigUSE_DNS is set to 1 but a DNS server cannot be contacted. */
-#define configNET_MASK0           255
-#define configNET_MASK1           255
-#define configNET_MASK2           240
-#define configNET_MASK3           0
+#define configNET_MASK0                        255
+#define configNET_MASK1                        255
+#define configNET_MASK2                        240
+#define configNET_MASK3                        0
 
 /* The UDP port to which print messages are sent. */
-#define configPRINT_PORT          ( 15000 )
+#define configPRINT_PORT                       ( 15000 )
+
+/* Use kernel provided static memory for timer and idle tasks. */
+#define configKERNEL_PROVIDED_STATIC_MEMORY    1
 
 #endif /* FREERTOS_CONFIG_H */

FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/main.c

@@ -83,12 +83,6 @@ void vApplicationIdleHook( void );
 void vApplicationStackOverflowHook( TaskHandle_t pxTask,
                                     char * pcTaskName );
 void vApplicationTickHook( void );
-void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,
-                                    StackType_t ** ppxIdleTaskStackBuffer,
-                                    uint32_t * pulIdleTaskStackSize );
-void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,
-                                     StackType_t ** ppxTimerTaskStackBuffer,
-                                     uint32_t * pulTimerTaskStackSize );
 
 /*
  * Writes trace data to a disk file when the trace recording is stopped.
@@ -322,58 +316,6 @@ static void prvSaveTraceFile( void )
 }
 /*-----------------------------------------------------------*/
 
-/* configUSE_STATIC_ALLOCATION is set to 1, so the application must provide an
- * implementation of vApplicationGetIdleTaskMemory() to provide the memory that is
- * used by the Idle task. */
-void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,
-                                    StackType_t ** ppxIdleTaskStackBuffer,
-                                    uint32_t * pulIdleTaskStackSize )
-{
-/* If the buffers to be provided to the Idle task are declared inside this
- * function then they must be declared static - otherwise they will be allocated on
- * the stack and so not exists after this function exits. */
-    static StaticTask_t xIdleTaskTCB;
-    static StackType_t uxIdleTaskStack[ configMINIMAL_STACK_SIZE ];
-
-    /* Pass out a pointer to the StaticTask_t structure in which the Idle task's
-     * state will be stored. */
-    *ppxIdleTaskTCBBuffer = &xIdleTaskTCB;
-
-    /* Pass out the array that will be used as the Idle task's stack. */
-    *ppxIdleTaskStackBuffer = uxIdleTaskStack;
-
-    /* Pass out the size of the array pointed to by *ppxIdleTaskStackBuffer.
-     * Note that, as the array is necessarily of type StackType_t,
-     * configMINIMAL_STACK_SIZE is specified in words, not bytes. */
-    *pulIdleTaskStackSize = configMINIMAL_STACK_SIZE;
-}
-/*-----------------------------------------------------------*/
-
-/* configUSE_STATIC_ALLOCATION and configUSE_TIMERS are both set to 1, so the
- * application must provide an implementation of vApplicationGetTimerTaskMemory()
- * to provide the memory that is used by the Timer service task. */
-void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,
-                                     StackType_t ** ppxTimerTaskStackBuffer,
-                                     uint32_t * pulTimerTaskStackSize )
-{
-/* If the buffers to be provided to the Timer task are declared inside this
- * function then they must be declared static - otherwise they will be allocated on
- * the stack and so not exists after this function exits. */
-    static StaticTask_t xTimerTaskTCB;
-
-    /* Pass out a pointer to the StaticTask_t structure in which the Timer
-     * task's state will be stored. */
-    *ppxTimerTaskTCBBuffer = &xTimerTaskTCB;
-
-    /* Pass out the array that will be used as the Timer task's stack. */
-    *ppxTimerTaskStackBuffer = uxTimerTaskStack;
-
-    /* Pass out the size of the array pointed to by *ppxTimerTaskStackBuffer.
-     * Note that, as the array is necessarily of type StackType_t,
-     * configMINIMAL_STACK_SIZE is specified in words, not bytes. */
-    *pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH;
-}
-
 static uint32_t ulEntryTime = 0U;
 
 void vTraceTimerReset( void )
@@ -390,3 +332,5 @@ uint32_t uiTraceTimerGetValue( void )
 {
     return( xTaskGetTickCount() - ulEntryTime );
 }
+
+/*-----------------------------------------------------------*/