Remove the 'death' tasks from the demo as on Win2K and WinXP the behaviour of the...

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1164 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/WIN32-MingW/CreateProjectDirectoryStructure.bat b/Demo/WIN32-MingW/CreateProjectDirectoryStructure.bat
index 26a75fa86def3878c13367dceca7ec69a399afed..a1986dc044ae07d43c907d4e84e2d1c4e6107c52 100644 (file)
--- a/Demo/WIN32-MingW/CreateProjectDirectoryStructure.bat
+++ b/Demo/WIN32-MingW/CreateProjectDirectoryStructure.bat
@@ -43,7 +43,6 @@ IF EXIST FreeRTOS Goto END
        copy ..\Common\include\QPeek.h DemoTasks\include\r
        copy ..\Common\include\flop.h DemoTasks\include\r
        copy ..\Common\include\recmutex.h DemoTasks\include\r
-       copy ..\Common\include\death.h DemoTasks\include\r
        copy ..\Common\Minimal\BlockQ.c DemoTasks\r
        copy ..\Common\Minimal\integer.c DemoTasks\r
        copy ..\Common\Minimal\semtest.c DemoTasks\r
@@ -51,6 +50,5 @@ IF EXIST FreeRTOS Goto END
        copy ..\Common\Minimal\GenQTest.c DemoTasks\r
        copy ..\Common\Minimal\QPeek.c DemoTasks\r
        copy ..\Common\Minimal\flop.c DemoTasks\r
-       copy ..\Common\Minimal\death.c DemoTasks\r
        \r
 : END
\ No newline at end of file

diff --git a/Demo/WIN32-MingW/FreeRTOSConfig.h b/Demo/WIN32-MingW/FreeRTOSConfig.h
index 9ca238bba354ef84ec2ca9a8e1206bc06ced84ab..c271c1036dae50d9550e5651b38afc7c512a3885 100644 (file)
--- a/Demo/WIN32-MingW/FreeRTOSConfig.h
+++ b/Demo/WIN32-MingW/FreeRTOSConfig.h
@@ -69,7 +69,7 @@
 #define configUSE_IDLE_HOOK                            1\r
 #define configUSE_TICK_HOOK                            0\r
 #define configTICK_RATE_HZ                             ( 50 ) /* In this non-real time simulated environment the tick frequency has to be at least a multiple of the Win32 tick frequency, and therefore very slow. */\r
-#define configMINIMAL_STACK_SIZE               ( ( unsigned portSHORT ) 50 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the win32 thread. */\r
+#define configMINIMAL_STACK_SIZE               ( ( unsigned portSHORT ) 20 ) /* In this simulated case, the stack only has to hold one small structure as the real stack is part of the win32 thread. */\r
 #define configTOTAL_HEAP_SIZE                  ( ( size_t ) 0 ) /* This parameter has no effect when heap_3.c is included in the project. */\r
 #define configMAX_TASK_NAME_LEN                        ( 12 )\r
 #define configUSE_TRACE_FACILITY               1\r

diff --git a/Demo/WIN32-MingW/main.c b/Demo/WIN32-MingW/main.c
index d8eb1a0d0cee0d9ca15a10d51542e02ceaf7ce74..bbcc0b691c849d5f7a8a3bce226c5e98932c218b 100644 (file)
--- a/Demo/WIN32-MingW/main.c
+++ b/Demo/WIN32-MingW/main.c
@@ -96,7 +96,6 @@
 #include "QPeek.h"\r
 #include "recmutex.h"\r
 #include "flop.h"\r
-#include "death.h"\r
 \r
 /* Priorities at which the tasks are created. */\r
 #define mainCHECK_TASK_PRIORITY                ( configMAX_PRIORITIES - 1 )\r
@@ -130,11 +129,6 @@ int main( void )
        vStartMathTasks( mainFLOP_TASK_PRIORITY );\r
        vStartRecursiveMutexTasks();\r
 \r
-       /* The suicide tasks must be created last as they need to know how many\r
-       tasks were running prior to their creation in order to ascertain whether\r
-       or not the correct/expected number of tasks are running at any given time. */\r
-       vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );\r
-\r
        /* Start the scheduler itself. */\r
        vTaskStartScheduler();\r
 \r
@@ -190,10 +184,6 @@ char *pcStatusMessage = "OK";
                {\r
                        pcStatusMessage = "Error: Flop";\r
                }\r
-               else if( xIsCreateTaskStillRunning() != pdPASS )\r
-               {\r
-                       pcStatusMessage = "Error: Create";\r
-               }\r
            else if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )\r
            {\r
                        pcStatusMessage = "Error: RecMutex";\r