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

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 a83b8abfff67e1dd11899bd5eb26a928fa768861..9ca238bba354ef84ec2ca9a8e1206bc06ced84ab 100644 (file)
--- 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\r
 \r
 \r
-/* When switching threads, Windows does not always seem to run the selected\r
-thread immediately.  This function can be called to check if the thread\r
-that is currently running is the thread that is responsible for executing\r
-the task selected by the real time scheduler.  If not then a yield is performed\r
-which will try and force the running thread to block on a semaphore, and hence\r
-allow the thread that should be running to take over.  The trace macros are a\r
-convenient way of lacing the code with these checking calls. */\r
-void vPortCheckCorrectThreadIsRunning( void );\r
-\r
-#define        traceBLOCKING_ON_QUEUE_RECEIVE(pxQueue)                 vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceBLOCKING_ON_QUEUE_SEND(pxQueue)                    vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceGIVE_MUTEX_RECURSIVE(pxMutex)                              vPortCheckCorrectThreadIsRunning();(void)pxMutex\r
-#define        traceQUEUE_CREATE(pxNewQueue)                                   vPortCheckCorrectThreadIsRunning();(void)pxNewQueue\r
-#define        traceQUEUE_CREATE_FAILED()                                              vPortCheckCorrectThreadIsRunning()\r
-#define        traceCREATE_MUTEX(pxNewMutex)                                   vPortCheckCorrectThreadIsRunning();(void)pxNewMutex\r
-#define        traceCREATE_MUTEX_FAILED()                                              vPortCheckCorrectThreadIsRunning()\r
-#define        traceGIVE_MUTEX_RECURSIVE(pxMutex)                              vPortCheckCorrectThreadIsRunning();(void)pxMutex\r
-#define        traceGIVE_MUTEX_RECURSIVE_FAILED(pxMutex)               vPortCheckCorrectThreadIsRunning();(void)pxMutex\r
-#define        traceTAKE_MUTEX_RECURSIVE(pxMutex)                              vPortCheckCorrectThreadIsRunning();(void)pxMutex\r
-#define traceTAKE_MUTEX_RECURSIVE_FAILED(pxMutex)              vPortCheckCorrectThreadIsRunning();(void)pxMutex\r
-#define        traceCREATE_COUNTING_SEMAPHORE()                                vPortCheckCorrectThreadIsRunning()\r
-#define        traceCREATE_COUNTING_SEMAPHORE_FAILED()                 vPortCheckCorrectThreadIsRunning()\r
-#define        traceQUEUE_SEND(pxQueue)                                                vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceQUEUE_SEND_FAILED(pxQueue)                                 vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceQUEUE_RECEIVE(pxQueue)                                             vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceQUEUE_RECEIVE_FAILED(pxQueue)                              vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceQUEUE_PEEK(pxQueue)                                                vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceQUEUE_SEND_FROM_ISR(pxQueue)                               vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceQUEUE_SEND_FROM_ISR_FAILED(pxQueue)                vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceQUEUE_RECEIVE_FROM_ISR(pxQueue)                    vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceQUEUE_RECEIVE_FROM_ISR_FAILED(pxQueue)             vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceQUEUE_DELETE(pxQueue)                                              vPortCheckCorrectThreadIsRunning();(void)pxQueue\r
-#define        traceTASK_CREATE(pxTask)                                                vPortCheckCorrectThreadIsRunning();(void)pxTask\r
-#define        traceTASK_CREATE_FAILED(pxNewTCB)                               vPortCheckCorrectThreadIsRunning();(void)pxNewTCB\r
-#define        traceTASK_DELETE(pxTask)                                                vPortCheckCorrectThreadIsRunning();(void)pxTask\r
-#define        traceTASK_DELAY_UNTIL()                                                 vPortCheckCorrectThreadIsRunning()\r
-#define        traceTASK_DELAY()                                                               vPortCheckCorrectThreadIsRunning()\r
-#define        traceTASK_PRIORITY_SET(pxTask,uxNewPriority)    vPortCheckCorrectThreadIsRunning();(void)pxTask;(void)uxNewPriority\r
-#define        traceTASK_SUSPEND(pxTask)                                               vPortCheckCorrectThreadIsRunning();(void)pxTask\r
-#define        traceTASK_RESUME(pxTask)                                                vPortCheckCorrectThreadIsRunning();(void)pxTask\r
-#define        traceTASK_RESUME_FROM_ISR(pxTask)                               vPortCheckCorrectThreadIsRunning();(void)pxTask\r
-\r
-\r
 #endif /* FREERTOS_CONFIG_H */\r

diff --git a/Demo/WIN32-MSVC/WIN32.suo b/Demo/WIN32-MSVC/WIN32.suo
index fc93ff8c2fbeb26c31bfa1371050b2bf265ec05a..322426a288ba7b4a226a80697e0f31beeb520beb 100644 (file)
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 70c51bb874c6433ffe2557f289155dfc46a6b56f..44706775c4a4aeed1a70e6e25d329447eca1d5ac 100644 (file)
--- a/Demo/WIN32-MSVC/main.c
+++ b/Demo/WIN32-MSVC/main.c
@@ -93,9 +93,7 @@
 #include "queue.h"\r
 \r
 /* Standard demo includes. */\r
-#include "partest.h"\r
 #include "BlockQ.h"\r
-#include "death.h"\r
 #include "integer.h"\r
 #include "semtest.h"\r
 #include "PollQ.h"\r