From 09dc8c9066a33c1867e6e9a6da493ba33436e056 Mon Sep 17 00:00:00 2001 From: rtel Date: Tue, 23 Jul 2019 17:02:59 +0000 Subject: [PATCH] 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 --- FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo | Bin 77312 -> 0 bytes FreeRTOS/Demo/WIN32-MSVC/FreeRTOSConfig.h | 3 +-- FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj | 1 - FreeRTOS/Demo/WIN32-MSVC/WIN32.vcxproj.filters | 3 --- FreeRTOS/Demo/WIN32-MSVC/main.c | 7 +++++++ 5 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo diff --git a/FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo b/FreeRTOS/Demo/WIN32-MSVC/.vs/WIN32/v14/.suo deleted file mode 100644 index 324972876a6280982943ae5aea8be03b1acfcf91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77312 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 - 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 @@ Demo App Source\Full_Demo\Common Demo Tasks - - FreeRTOS Source\Source - 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 #include +/* Visual studio intrinsics used so the __debugbreak() function is available +should an assert get hit. */ +#include + /* 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. */ -- 2.39.5