Revert a couple of changes in Win32 demo that should not have been checked in.

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

diff --git a/FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo b/FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo
deleted file mode 100644 (file)
index 3249728..0000000
Binary files a/FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo and /dev/null differ

diff --git a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
index 6b98922ee5d2e5b6fa92915cac0de94a6da764eb..cc08b5f3f59a7681c618cb7f0b4958f312917ce1 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h
@@ -62,8 +62,7 @@
 #define configUSE_ALTERNATIVE_API                              0\r
 #define configUSE_QUEUE_SETS                                   1\r
 #define configUSE_TASK_NOTIFICATIONS                   1\r
-#define configSUPPORT_STATIC_ALLOCATION                        0\r
-#define configSUPPORT_DYNAMIC_ALLOCATION               1\r
+#define configSUPPORT_STATIC_ALLOCATION                        1\r
 \r
 /* Software timer related configuration options. */\r
 #define configUSE_TIMERS                                               1\r

diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj
index d3531b4667b6e82be12290faf72d41707ed2657a..87c034b6e40733bfbfd5e00f41fd9ffacc941dc3 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj
+++ b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj
@@ -81,7 +81,6 @@
     <ClCompile Include="..\..\Source\event_groups.c" />\r
     <ClCompile Include="..\..\Source\portable\MemMang\heap_5.c" />\r
     <ClCompile Include="..\..\Source\stream_buffer.c" />\r
-    <ClCompile Include="..\..\Source\task_pool.c" />\r
     <ClCompile Include="..\..\Source\timers.c" />\r
     <ClCompile Include="..\Common\Minimal\AbortDelay.c" />\r
     <ClCompile Include="..\Common\Minimal\BlockQ.c" />\r

diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters
index 0fcb7b74043716f83c2c9d69cd6ac48ba99ba6ff..ae43ea75080ad22eb06a73ec5ae32bc7c9f6080f 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters
+++ b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters
@@ -160,9 +160,6 @@
     <ClCompile Include="..\Common\Minimal\MessageBufferAMP.c">\r
       <Filter>Demo App Source\Full_Demo\Common Demo Tasks</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\Source\task_pool.c">\r
-      <Filter>FreeRTOS Source\Source</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 bccd97b9b33139c35d3e0397dddab5629d7eb6b1..ee8219744999c866d763cad852b4b2da58a90fb4 100644 (file)
--- a/FreeRTOS/Demo/WIN32-MSVC/main.c
+++ b/FreeRTOS/Demo/WIN32-MSVC/main.c
@@ -54,6 +54,10 @@
 #include <stdlib.h>\r
 #include <conio.h>\r
 \r
+/* Visual studio intrinsics used so the __debugbreak() function is available\r
+should an assert get hit. */\r
+#include <intrin.h>\r
+\r
 /* FreeRTOS kernel includes. */\r
 #include "FreeRTOS.h"\r
 #include "task.h"\r
@@ -288,6 +292,9 @@ volatile uint32_t ulSetToNonZeroInDebuggerToContinue = 0;
                        }\r
                }\r
 \r
+               /* Cause debugger break point if being debugged. */\r
+               __debugbreak();\r
+\r
                /* You can step out of this function to debug the assertion by using\r
                the debugger to set ulSetToNonZeroInDebuggerToContinue to a non-zero\r
                value. */\r