diff options
| author | rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2> | 2019-07-23 17:02:59 +0000 |
|---|---|---|
| committer | rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2> | 2019-07-23 17:02:59 +0000 |
| commit | cda199c01fe422d12a7b37c33f27a418de4668ce (patch) | |
| tree | defeebd6f1f64447e46b855deb4e730948ae4d15 | |
| parent | ec44bf0df449abff279a17212e9b8e59090dca07 (diff) | |
| download | freertos-cda199c01fe422d12a7b37c33f27a418de4668ce.tar.gz | |
Revert a couple of changes in Win32 demo that should not have been checked in.
git-svn-id: http://svn.code.sf.net/p/freertos/code/trunk@2700 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
| -rw-r--r-- | FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo | bin | 77312 -> 0 bytes | |||
| -rw-r--r-- | FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h | 3 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj | 1 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters | 3 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WIN32-MSVC/main.c | 7 |
5 files changed, 8 insertions, 6 deletions
diff --git a/FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo b/FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo Binary files differdeleted file mode 100644 index 324972876..000000000 --- a/FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo +++ /dev/null diff --git a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h index 6b98922ee..cc08b5f3f 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h @@ -62,8 +62,7 @@ #define configUSE_ALTERNATIVE_API 0
#define configUSE_QUEUE_SETS 1
#define configUSE_TASK_NOTIFICATIONS 1
-#define configSUPPORT_STATIC_ALLOCATION 0
-#define configSUPPORT_DYNAMIC_ALLOCATION 1
+#define configSUPPORT_STATIC_ALLOCATION 1
/* Software timer related configuration options. */
#define configUSE_TIMERS 1
diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj index d3531b466..87c034b6e 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj +++ b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj @@ -81,7 +81,6 @@ <ClCompile Include="..\..\Source\event_groups.c" />
<ClCompile Include="..\..\Source\portable\MemMang\heap_5.c" />
<ClCompile Include="..\..\Source\stream_buffer.c" />
- <ClCompile Include="..\..\Source\task_pool.c" />
<ClCompile Include="..\..\Source\timers.c" />
<ClCompile Include="..\Common\Minimal\AbortDelay.c" />
<ClCompile Include="..\Common\Minimal\BlockQ.c" />
diff --git a/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters b/FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters index 0fcb7b740..ae43ea750 100644 --- 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">
<Filter>Demo App Source\Full_Demo\Common Demo Tasks</Filter>
</ClCompile>
- <ClCompile Include="..\..\Source\task_pool.c">
- <Filter>FreeRTOS Source\Source</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="FreeRTOSConfig.h">
diff --git a/FreeRTOS/Demo/WIN32-MSVC/main.c b/FreeRTOS/Demo/WIN32-MSVC/main.c index bccd97b9b..ee8219744 100644 --- a/FreeRTOS/Demo/WIN32-MSVC/main.c +++ b/FreeRTOS/Demo/WIN32-MSVC/main.c @@ -54,6 +54,10 @@ #include <stdlib.h>
#include <conio.h>
+/* Visual studio intrinsics used so the __debugbreak() function is available
+should an assert get hit. */
+#include <intrin.h>
+
/* FreeRTOS kernel includes. */
#include "FreeRTOS.h"
#include "task.h"
@@ -288,6 +292,9 @@ volatile uint32_t ulSetToNonZeroInDebuggerToContinue = 0; }
}
+ /* Cause debugger break point if being debugged. */
+ __debugbreak();
+
/* You can step out of this function to debug the assertion by using
the debugger to set ulSetToNonZeroInDebuggerToContinue to a non-zero
value. */
|