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@1163 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/WIN32-MSVC/WIN32.suo b/Demo/WIN32-MSVC/WIN32.suo
index a6a78775b5325202320169eb8b0390c67a30dbd4..84fd5718cbc17eef3ab1bdc3cc25356bff2183a9 100644 (file)
Binary files a/Demo/WIN32-MSVC/WIN32.suo and b/Demo/WIN32-MSVC/WIN32.suo differ

diff --git a/Demo/WIN32-MSVC/WIN32.vcxproj b/Demo/WIN32-MSVC/WIN32.vcxproj
index a92b9185fbd935b0dc96a67989b6c3ec229cafaf..ee994e1dabb5b47c7738ff3f780c48fb7ff6ebaf 100644 (file)
--- a/Demo/WIN32-MSVC/WIN32.vcxproj
+++ b/Demo/WIN32-MSVC/WIN32.vcxproj
@@ -161,7 +161,7 @@
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="Board.h" />\r
+    <ClInclude Include="..\..\Source\portable\MSVC-MingW\portmacro.h" />\r
     <ClInclude Include="FreeRTOSConfig.h" />\r
     <ClInclude Include="..\..\Source\include\croutine.h" />\r
     <ClInclude Include="..\..\Source\include\FreeRTOS.h" />\r

diff --git a/Demo/WIN32-MSVC/WIN32.vcxproj.filters b/Demo/WIN32-MSVC/WIN32.vcxproj.filters
index 3d075c58a579a470e7b2c9e091f8d7ef1ce434d7..1a088b2ed9b760cbce20d626fad7bea0dde4c904 100644 (file)
--- a/Demo/WIN32-MSVC/WIN32.vcxproj.filters
+++ b/Demo/WIN32-MSVC/WIN32.vcxproj.filters
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <Filter Include="Header Files">\r
-      <UniqueIdentifier>{19ff1a34-36de-4c48-9d10-3fb1fa0d1fa4}</UniqueIdentifier>\r
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>\r
-    </Filter>\r
     <Filter Include="Resource Files">\r
       <UniqueIdentifier>{38712199-cebf-4124-bf15-398f7c3419ea}</UniqueIdentifier>\r
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>\r
@@ -32,6 +28,10 @@
     <Filter Include="Demo App Source\Common Demo Tasks\ModifiedForLowTickRate">\r
       <UniqueIdentifier>{143cf5a3-f134-4439-9f71-a201ae23b44b}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="Configuration Files">\r
+      <UniqueIdentifier>{19ff1a34-36de-4c48-9d10-3fb1fa0d1fa4}</UniqueIdentifier>\r
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="main.c">\r
@@ -81,11 +81,8 @@
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="Board.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="FreeRTOSConfig.h">\r
-      <Filter>Header Files</Filter>\r
+      <Filter>Configuration Files</Filter>\r
     </ClInclude>\r
     <ClInclude Include="..\..\Source\include\croutine.h">\r
       <Filter>FreeRTOS Source\Include</Filter>\r
@@ -111,5 +108,8 @@
     <ClInclude Include="..\..\Source\include\task.h">\r
       <Filter>FreeRTOS Source\Include</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\Source\portable\MSVC-MingW\portmacro.h">\r
+      <Filter>FreeRTOS Source\Include</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Demo/WIN32-MSVC/main.c b/Demo/WIN32-MSVC/main.c
index a14753696394d9e8b6e44c4c89c95e8b84db902c..e0c63e2749ace5735ec2bc0c1ab5242194989912 100644 (file)
--- a/Demo/WIN32-MSVC/main.c
+++ b/Demo/WIN32-MSVC/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