Demo project only:

Add the new IntSem test/demo code into the MSVC demo project.

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

diff --git a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
index ae567c19612539a9f4218f1e213b97a239a34b90..2f8243118658bc3dd9a9f0da5dddcfa8a7c324fb 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
@@ -83,7 +83,7 @@
 #define configUSE_TICK_HOOK                                            1\r
 #define configTICK_RATE_HZ                                             ( 1000 ) /* 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 short ) 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 configTOTAL_HEAP_SIZE                                  ( ( size_t ) ( 21 * 1024 ) )\r
+#define configTOTAL_HEAP_SIZE                                  ( ( size_t ) ( 22 * 1024 ) )\r
 #define configMAX_TASK_NAME_LEN                                        ( 12 )\r
 #define configUSE_TRACE_FACILITY                               1\r
 #define configUSE_16_BIT_TICKS                                 0\r

diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj
index 91df9d922f8e9009aac09bd98c5c9cfca83ceab8..5e65e3e175f365d9b101c7d77b74789bcaeede8b 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj
+++ b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj
@@ -143,6 +143,7 @@
     <ClCompile Include="..\Common\Minimal\flop.c" />\r
     <ClCompile Include="..\Common\Minimal\GenQTest.c" />\r
     <ClCompile Include="..\Common\Minimal\integer.c" />\r
+    <ClCompile Include="..\Common\Minimal\IntSemTest.c" />\r
     <ClCompile Include="..\Common\Minimal\PollQ.c" />\r
     <ClCompile Include="..\Common\Minimal\QPeek.c" />\r
     <ClCompile Include="..\Common\Minimal\QueueOverwrite.c" />\r

diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters
index 7d9549818e096f7bc64bd3762215ed1f2d8932dd..debd11c0193d004178c69e2c7cb3d6d4d4078b4d 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters
+++ b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters
@@ -136,6 +136,9 @@
     <ClCompile Include="..\..\Source\portable\MemMang\heap_5.c">\r
       <Filter>FreeRTOS Source\Source\Portable</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\Common\Minimal\IntSemTest.c">\r
+      <Filter>Demo App Source\Common Demo Tasks</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="FreeRTOSConfig.h">\r

diff --git a/FreeRTOS/Demo/WIN32-MSVC/main.c b/FreeRTOS/Demo/WIN32-MSVC/main.c
index 6b1b9554d681c9d821fe484fc456fceae6c744b2..064c913757f0bf60d1fec5443f075c438ccad3be 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/main.c
+++ b/FreeRTOS/Demo/WIN32-MSVC/main.c
@@ -112,7 +112,7 @@ that make up the total heap.  This is only done to provide an example of heap_5
 being used as this demo could easily create one large heap region instead of\r
 multiple smaller heap regions - in which case heap_4.c would be the more\r
 appropriate choice. */\r
-#define mainREGION_1_SIZE      2001\r
+#define mainREGION_1_SIZE      3001\r
 #define mainREGION_2_SIZE      18005\r
 #define mainREGION_3_SIZE      1007\r
 \r

diff --git a/FreeRTOS/Demo/WIN32-MSVC/main_full.c b/FreeRTOS/Demo/WIN32-MSVC/main_full.c
index 4a5cb5bc4979621184e86d8c1b04b1bd6b2a82bf..74fc3f29ed0e06ed5fd7e37788625679aa719fd9 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/main_full.c
+++ b/FreeRTOS/Demo/WIN32-MSVC/main_full.c
@@ -133,6 +133,7 @@
 #include "QueueSet.h"\r
 #include "QueueOverwrite.h"\r
 #include "EventGroupsDemo.h"\r
+#include "IntSemTest.h"\r
 \r
 /* Priorities at which the tasks are created. */\r
 #define mainCHECK_TASK_PRIORITY                        ( configMAX_PRIORITIES - 2 )\r
@@ -209,6 +210,7 @@ int main_full( void )
        vStartQueueOverwriteTask( mainQUEUE_OVERWRITE_PRIORITY );\r
        xTaskCreate( prvDemoQueueSpaceFunctions, "QSpace", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
        vStartEventGroupTasks();\r
+       vStartInterruptSemaphoreTasks();\r
 \r
        #if( configUSE_PREEMPTION != 0  )\r
        {\r
@@ -263,7 +265,11 @@ const TickType_t xCycleFrequency = 2500 / portTICK_PERIOD_MS;
                }\r
                #endif\r
 \r
-               if( xAreEventGroupTasksStillRunning() != pdTRUE )\r
+               if( xAreInterruptSemaphoreTasksStillRunning() != pdTRUE )\r
+               {\r
+                       pcStatusMessage = "Error: IntSem";\r
+               }\r
+               else if( xAreEventGroupTasksStillRunning() != pdTRUE )\r
                {\r
                        pcStatusMessage = "Error: EventGroup";\r
                }\r
@@ -403,7 +409,7 @@ void vFullDemoTickHookFunction( void )
        vPeriodicEventGroupsProcessing();\r
 \r
        /* Exercise giving mutexes from an interrupt. */\r
-       vMutexISRInteractionTest();\r
+       vInterruptSemaphorePeriodicTest();\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r