From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Sun, 21 Nov 2010 20:55:04 +0000 (+0000)
Subject: Greatly simplified the Win32 port by only allowing threads to run on a single CPU... 
X-Git-Tag: V6.1.1~101
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1574410c77515e75239f0c1471f0e5ba4cc1a241;p=freertos

Greatly simplified the Win32 port by only allowing threads to run on a single CPU core.

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

diff --git a/Demo/WIN32-MSVC/FreeRTOSConfig.h b/Demo/WIN32-MSVC/FreeRTOSConfig.h
index a83b8abff..9ca238bba 100644
--- a/Demo/WIN32-MSVC/FreeRTOSConfig.h
+++ b/Demo/WIN32-MSVC/FreeRTOSConfig.h
@@ -106,47 +106,4 @@ to exclude the API function. */
 #define INCLUDE_xTaskGetSchedulerState		1
 
 
-/* When switching threads, Windows does not always seem to run the selected
-thread immediately.  This function can be called to check if the thread
-that is currently running is the thread that is responsible for executing
-the task selected by the real time scheduler.  If not then a yield is performed
-which will try and force the running thread to block on a semaphore, and hence
-allow the thread that should be running to take over.  The trace macros are a
-convenient way of lacing the code with these checking calls. */
-void vPortCheckCorrectThreadIsRunning( void );
-
-#define	traceBLOCKING_ON_QUEUE_RECEIVE(pxQueue)			vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceBLOCKING_ON_QUEUE_SEND(pxQueue)			vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceGIVE_MUTEX_RECURSIVE(pxMutex)				vPortCheckCorrectThreadIsRunning();(void)pxMutex
-#define	traceQUEUE_CREATE(pxNewQueue)					vPortCheckCorrectThreadIsRunning();(void)pxNewQueue
-#define	traceQUEUE_CREATE_FAILED()						vPortCheckCorrectThreadIsRunning()
-#define	traceCREATE_MUTEX(pxNewMutex)					vPortCheckCorrectThreadIsRunning();(void)pxNewMutex
-#define	traceCREATE_MUTEX_FAILED()						vPortCheckCorrectThreadIsRunning()
-#define	traceGIVE_MUTEX_RECURSIVE(pxMutex)				vPortCheckCorrectThreadIsRunning();(void)pxMutex
-#define	traceGIVE_MUTEX_RECURSIVE_FAILED(pxMutex)		vPortCheckCorrectThreadIsRunning();(void)pxMutex
-#define	traceTAKE_MUTEX_RECURSIVE(pxMutex)				vPortCheckCorrectThreadIsRunning();(void)pxMutex
-#define traceTAKE_MUTEX_RECURSIVE_FAILED(pxMutex)		vPortCheckCorrectThreadIsRunning();(void)pxMutex
-#define	traceCREATE_COUNTING_SEMAPHORE()				vPortCheckCorrectThreadIsRunning()
-#define	traceCREATE_COUNTING_SEMAPHORE_FAILED()			vPortCheckCorrectThreadIsRunning()
-#define	traceQUEUE_SEND(pxQueue)						vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceQUEUE_SEND_FAILED(pxQueue)					vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceQUEUE_RECEIVE(pxQueue)						vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceQUEUE_RECEIVE_FAILED(pxQueue)				vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceQUEUE_PEEK(pxQueue)						vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceQUEUE_SEND_FROM_ISR(pxQueue)				vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceQUEUE_SEND_FROM_ISR_FAILED(pxQueue)		vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceQUEUE_RECEIVE_FROM_ISR(pxQueue)			vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceQUEUE_RECEIVE_FROM_ISR_FAILED(pxQueue)		vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceQUEUE_DELETE(pxQueue)						vPortCheckCorrectThreadIsRunning();(void)pxQueue
-#define	traceTASK_CREATE(pxTask)						vPortCheckCorrectThreadIsRunning();(void)pxTask
-#define	traceTASK_CREATE_FAILED(pxNewTCB)				vPortCheckCorrectThreadIsRunning();(void)pxNewTCB
-#define	traceTASK_DELETE(pxTask)						vPortCheckCorrectThreadIsRunning();(void)pxTask
-#define	traceTASK_DELAY_UNTIL()							vPortCheckCorrectThreadIsRunning()
-#define	traceTASK_DELAY()								vPortCheckCorrectThreadIsRunning()
-#define	traceTASK_PRIORITY_SET(pxTask,uxNewPriority)	vPortCheckCorrectThreadIsRunning();(void)pxTask;(void)uxNewPriority
-#define	traceTASK_SUSPEND(pxTask)						vPortCheckCorrectThreadIsRunning();(void)pxTask
-#define	traceTASK_RESUME(pxTask)						vPortCheckCorrectThreadIsRunning();(void)pxTask
-#define	traceTASK_RESUME_FROM_ISR(pxTask)				vPortCheckCorrectThreadIsRunning();(void)pxTask
-
-
 #endif /* FREERTOS_CONFIG_H */
diff --git a/Demo/WIN32-MSVC/WIN32.suo b/Demo/WIN32-MSVC/WIN32.suo
index fc93ff8c2..322426a28 100644
Binary files a/Demo/WIN32-MSVC/WIN32.suo and b/Demo/WIN32-MSVC/WIN32.suo differ
diff --git a/Demo/WIN32-MSVC/main.c b/Demo/WIN32-MSVC/main.c
index 70c51bb87..44706775c 100644
--- a/Demo/WIN32-MSVC/main.c
+++ b/Demo/WIN32-MSVC/main.c
@@ -93,9 +93,7 @@
 #include "queue.h"
 
 /* Standard demo includes. */
-#include "partest.h"
 #include "BlockQ.h"
-#include "death.h"
 #include "integer.h"
 #include "semtest.h"
 #include "PollQ.h"