Add recursive mutexes to PC demo.

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

diff --git a/Demo/PC/FreeRTOSConfig.h b/Demo/PC/FreeRTOSConfig.h
index 894ca5e59c9a5be3eee8c1ef46402cd45bae9b53..4510590b37bd7371ce16c1dbdc903a8bfd97b7a1 100644 (file)
--- a/Demo/PC/FreeRTOSConfig.h
+++ b/Demo/PC/FreeRTOSConfig.h
@@ -64,6 +64,7 @@
 #define configUSE_MUTEXES                              1\r
 #define configUSE_COUNTING_SEMAPHORES  1\r
 #define configUSE_ALTERNATIVE_API              1\r
+#define configUSE_RECURSIVE_MUTEXES            1\r
 \r
 #define configMAX_PRIORITIES           ( ( unsigned portBASE_TYPE ) 10 )\r
 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )\r

diff --git a/Demo/PC/main.c b/Demo/PC/main.c
index 56095bc573c05cf6c001e39a887f51c0fb6de099..c0998dd0c8d43c817aef9b6f304dd54d7d0237c5 100644 (file)
--- a/Demo/PC/main.c
+++ b/Demo/PC/main.c
@@ -95,6 +95,7 @@
 #include "AltQTest.h"\r
 #include "AltPollQ.h"\r
 #include "AltBlckQ.h"\r
+#include "RecMutex.h"\r
 \r
 /* Priority definitions for the tasks in the demo application. */\r
 #define mainLED_TASK_PRIORITY          ( tskIDLE_PRIORITY + 1 )\r
@@ -163,6 +164,7 @@ portSHORT main( void )
        vCreateAltBlockTimeTasks();\r
        vStartAltBlockingQueueTasks( mainQUEUE_BLOCK_PRIORITY );        \r
        vStartAltPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
+       vStartRecursiveMutexTasks();\r
                \r
        /* Create the "Print" task as described at the top of the file. */\r
        xTaskCreate( vErrorChecks, "Print", mainPRINT_STACK_SIZE, NULL, mainPRINT_TASK_PRIORITY, NULL );\r
@@ -416,6 +418,12 @@ static portSHORT sErrorHasOccurred = pdFALSE;
                sErrorHasOccurred = pdTRUE;\r
        }\r
 \r
+       if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )\r
+       {\r
+               vDisplayMessage( "Error in recursive mutex tasks!\r\n" );\r
+               sErrorHasOccurred = pdTRUE;\r
+       }\r
+\r
        if( sErrorHasOccurred == pdFALSE )\r
        {\r
                vDisplayMessage( "OK " );\r

diff --git a/Demo/PC/rtosdemo.tgt b/Demo/PC/rtosdemo.tgt
index 90a5900ac8955588476ccb899ce937bd5ed31367..e6a005d9382524ff10fa6ae1065ef4ec948e9d37 100644 (file)
--- a/Demo/PC/rtosdemo.tgt
+++ b/Demo/PC/rtosdemo.tgt
@@ -75,7 +75,7 @@ WVList
 0\r
 19\r
 WPickList\r
-63\r
+64\r
 20\r
 MItem\r
 3\r
@@ -886,8 +886,8 @@ WVList
 0\r
 208\r
 MItem\r
-15\r
-fileio\fileio.c\r
+28\r
+..\COMMON\MINIMAL\recmutex.c\r
 209\r
 WString\r
 4\r
@@ -904,8 +904,8 @@ WVList
 0\r
 212\r
 MItem\r
-6\r
-main.c\r
+15\r
+fileio\fileio.c\r
 213\r
 WString\r
 4\r
@@ -922,8 +922,8 @@ WVList
 0\r
 216\r
 MItem\r
-17\r
-partest\partest.c\r
+6\r
+main.c\r
 217\r
 WString\r
 4\r
@@ -940,8 +940,8 @@ WVList
 0\r
 220\r
 MItem\r
-15\r
-serial\serial.c\r
+17\r
+partest\partest.c\r
 221\r
 WString\r
 4\r
@@ -958,26 +958,26 @@ WVList
 0\r
 224\r
 MItem\r
-3\r
-*.h\r
+15\r
+serial\serial.c\r
 225\r
 WString\r
-3\r
-NIL\r
+4\r
+COBJ\r
 226\r
 WVList\r
 0\r
 227\r
 WVList\r
 0\r
--1\r
+20\r
+1\r
 1\r
-0\r
 0\r
 228\r
 MItem\r
-31\r
-..\..\SOURCE\INCLUDE\croutine.h\r
+3\r
+*.h\r
 229\r
 WString\r
 3\r
@@ -988,14 +988,14 @@ WVList
 231\r
 WVList\r
 0\r
-224\r
+-1\r
 1\r
 1\r
 0\r
 232\r
 MItem\r
-27\r
-..\..\source\include\list.h\r
+31\r
+..\..\SOURCE\INCLUDE\croutine.h\r
 233\r
 WString\r
 3\r
@@ -1006,14 +1006,14 @@ WVList
 235\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 236\r
 MItem\r
-31\r
-..\..\source\include\portable.h\r
+27\r
+..\..\source\include\list.h\r
 237\r
 WString\r
 3\r
@@ -1024,14 +1024,14 @@ WVList
 239\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 240\r
 MItem\r
 31\r
-..\..\source\include\projdefs.h\r
+..\..\source\include\portable.h\r
 241\r
 WString\r
 3\r
@@ -1042,14 +1042,14 @@ WVList
 243\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 244\r
 MItem\r
-28\r
-..\..\source\include\queue.h\r
+31\r
+..\..\source\include\projdefs.h\r
 245\r
 WString\r
 3\r
@@ -1060,14 +1060,14 @@ WVList
 247\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 248\r
 MItem\r
-29\r
-..\..\source\include\semphr.h\r
+28\r
+..\..\source\include\queue.h\r
 249\r
 WString\r
 3\r
@@ -1078,14 +1078,14 @@ WVList
 251\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 252\r
 MItem\r
-27\r
-..\..\source\include\task.h\r
+29\r
+..\..\source\include\semphr.h\r
 253\r
 WString\r
 3\r
@@ -1096,14 +1096,14 @@ WVList
 255\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 256\r
 MItem\r
-55\r
-..\..\source\portable\owatcom\16bitdos\common\portasm.h\r
+27\r
+..\..\source\include\task.h\r
 257\r
 WString\r
 3\r
@@ -1114,14 +1114,14 @@ WVList
 259\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 260\r
 MItem\r
-53\r
-..\..\source\portable\owatcom\16bitdos\pc\portmacro.h\r
+55\r
+..\..\source\portable\owatcom\16bitdos\common\portasm.h\r
 261\r
 WString\r
 3\r
@@ -1132,14 +1132,14 @@ WVList
 263\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 264\r
 MItem\r
-28\r
-..\COMMON\INCLUDE\AltBlckQ.h\r
+53\r
+..\..\source\portable\owatcom\16bitdos\pc\portmacro.h\r
 265\r
 WString\r
 3\r
@@ -1150,14 +1150,14 @@ WVList
 267\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 268\r
 MItem\r
 28\r
-..\COMMON\INCLUDE\AltBlock.h\r
+..\COMMON\INCLUDE\AltBlckQ.h\r
 269\r
 WString\r
 3\r
@@ -1168,14 +1168,14 @@ WVList
 271\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 272\r
 MItem\r
 28\r
-..\COMMON\INCLUDE\AltPollQ.h\r
+..\COMMON\INCLUDE\AltBlock.h\r
 273\r
 WString\r
 3\r
@@ -1186,14 +1186,14 @@ WVList
 275\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 276\r
 MItem\r
 28\r
-..\COMMON\INCLUDE\AltQTest.h\r
+..\COMMON\INCLUDE\AltPollQ.h\r
 277\r
 WString\r
 3\r
@@ -1204,14 +1204,14 @@ WVList
 279\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 280\r
 MItem\r
-26\r
-..\common\include\blockq.h\r
+28\r
+..\COMMON\INCLUDE\AltQTest.h\r
 281\r
 WString\r
 3\r
@@ -1222,14 +1222,14 @@ WVList
 283\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 284\r
 MItem\r
-28\r
-..\COMMON\INCLUDE\blocktim.h\r
+26\r
+..\common\include\blockq.h\r
 285\r
 WString\r
 3\r
@@ -1240,14 +1240,14 @@ WVList
 287\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 288\r
 MItem\r
-27\r
-..\common\include\comtest.h\r
+28\r
+..\COMMON\INCLUDE\blocktim.h\r
 289\r
 WString\r
 3\r
@@ -1258,14 +1258,14 @@ WVList
 291\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 292\r
 MItem\r
-28\r
-..\COMMON\INCLUDE\countsem.h\r
+27\r
+..\common\include\comtest.h\r
 293\r
 WString\r
 3\r
@@ -1276,14 +1276,14 @@ WVList
 295\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 296\r
 MItem\r
-26\r
-..\COMMON\INCLUDE\crhook.h\r
+28\r
+..\COMMON\INCLUDE\countsem.h\r
 297\r
 WString\r
 3\r
@@ -1294,14 +1294,14 @@ WVList
 299\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 300\r
 MItem\r
-25\r
-..\common\include\death.h\r
+26\r
+..\COMMON\INCLUDE\crhook.h\r
 301\r
 WString\r
 3\r
@@ -1312,14 +1312,14 @@ WVList
 303\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 304\r
 MItem\r
-27\r
-..\COMMON\INCLUDE\dynamic.h\r
+25\r
+..\common\include\death.h\r
 305\r
 WString\r
 3\r
@@ -1330,14 +1330,14 @@ WVList
 307\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 308\r
 MItem\r
-26\r
-..\common\include\fileio.h\r
+27\r
+..\COMMON\INCLUDE\dynamic.h\r
 309\r
 WString\r
 3\r
@@ -1348,14 +1348,14 @@ WVList
 311\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 312\r
 MItem\r
-25\r
-..\common\include\flash.h\r
+26\r
+..\common\include\fileio.h\r
 313\r
 WString\r
 3\r
@@ -1366,14 +1366,14 @@ WVList
 315\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 316\r
 MItem\r
-24\r
-..\common\include\flop.h\r
+25\r
+..\common\include\flash.h\r
 317\r
 WString\r
 3\r
@@ -1384,14 +1384,14 @@ WVList
 319\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 320\r
 MItem\r
-28\r
-..\COMMON\INCLUDE\GenQTest.h\r
+24\r
+..\common\include\flop.h\r
 321\r
 WString\r
 3\r
@@ -1402,14 +1402,14 @@ WVList
 323\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 324\r
 MItem\r
-27\r
-..\common\include\partest.h\r
+28\r
+..\COMMON\INCLUDE\GenQTest.h\r
 325\r
 WString\r
 3\r
@@ -1420,14 +1420,14 @@ WVList
 327\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 328\r
 MItem\r
-25\r
-..\common\include\pollq.h\r
+27\r
+..\common\include\partest.h\r
 329\r
 WString\r
 3\r
@@ -1438,14 +1438,14 @@ WVList
 331\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 332\r
 MItem\r
 25\r
-..\common\include\print.h\r
+..\common\include\pollq.h\r
 333\r
 WString\r
 3\r
@@ -1456,14 +1456,14 @@ WVList
 335\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 336\r
 MItem\r
-27\r
-..\common\include\semtest.h\r
+25\r
+..\common\include\print.h\r
 337\r
 WString\r
 3\r
@@ -1474,14 +1474,14 @@ WVList
 339\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 340\r
 MItem\r
-26\r
-..\common\include\serial.h\r
+27\r
+..\common\include\semtest.h\r
 341\r
 WString\r
 3\r
@@ -1492,14 +1492,14 @@ WVList
 343\r
 WVList\r
 0\r
-224\r
+228\r
 1\r
 1\r
 0\r
 344\r
 MItem\r
-16\r
-FreeRTOSConfig.h\r
+26\r
+..\common\include\serial.h\r
 345\r
 WString\r
 3\r
@@ -1510,7 +1510,25 @@ WVList
 347\r
 WVList\r
 0\r
-224\r
+228\r
+1\r
+1\r
+0\r
+348\r
+MItem\r
+16\r
+FreeRTOSConfig.h\r
+349\r
+WString\r
+3\r
+NIL\r
+350\r
+WVList\r
+0\r
+351\r
+WVList\r
+0\r
+228\r
 1\r
 1\r
 0\r

diff --git a/Demo/PC/rtosdemo.wpj b/Demo/PC/rtosdemo.wpj
index f02b7811a189f900e4c0e20dc3515a83c455e2a2..34b752148993f2aede0b2797a786e05c2c0209dd 100644 (file)
--- a/Demo/PC/rtosdemo.wpj
+++ b/Demo/PC/rtosdemo.wpj
@@ -6,7 +6,7 @@ VpeMain
 WRect\r
 0\r
 0\r
-6209\r
+6202\r
 7168\r
 2\r
 MProject\r
@@ -38,6 +38,6 @@ WRect
 WFileName\r
 12\r
 rtosdemo.tgt\r
-0\r
-0\r
+6\r
+63\r
 7\r