From 1574410c77515e75239f0c1471f0e5ba4cc1a241 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sun, 21 Nov 2010 20:55:04 +0000 Subject: [PATCH] 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 --- Demo/WIN32-MSVC/FreeRTOSConfig.h | 43 ------------------------------- Demo/WIN32-MSVC/WIN32.suo | Bin 54784 -> 54784 bytes Demo/WIN32-MSVC/main.c | 2 -- 3 files changed, 45 deletions(-) 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 fc93ff8c2fbeb26c31bfa1371050b2bf265ec05a..322426a288ba7b4a226a80697e0f31beeb520beb 100644 GIT binary patch delta 1641 zcmbtUZ%k8H6u654l z#OUacI0vyxC1x>5uy@&F%rY=0vTRw{;KSwz7fhCDvJczBK4?^SE)=$J``}G}Ip>|< zx#ygB&$(A0RP{l1cuX;_WsJE9<@ix4k0~OpN|@BQc}#KE8;`#hhYjEG#m{DDW+Yx9 zb`ilsNFuDl>#-LdlBu9CDcvMb5kiD&0t|8a21$t0xOE1_%Fv$Bp16XTMuJ@6#!{3f zj>8$!P~5K>eQY0VU_SOP&i?SCC^02*Esy++($~E@R|L%Cs%EAyQ`CY$(zqr|vn?2s zx8qq!zL-v~QMnUqY#CT-8zXH+Y6hOzmJ2=gDYq=%`ndOg-L%uu+4p(rlkb`pOu4Nh zY+uhU?RjbCO|^fO4=rn{>biTb-y$iP9VPI18_`jjr21JKDmQwuC~X*}sUCh5qxMSS zNq@-sqgiLSvjcpf(h@&li~Z`Au2O(DEz*7lvN#r+lFEh zcu7}zsrWlT%V;* ze+Y*3Y*?<9i?23ys&I9;;-1&acVhH%HQdc+?n1%A-O#s=puRH)!)J0(TxCFRp!o90 zHU<7yJmDQ0BE7A~0!pE?wQQw0_SSKZ+`1gaMe}sXsWMiGU+aFu=DHqndv8T7I@~Gn zHKfDgNQCFT5k%VFgugQ${=9sQSNZ>2oPUUF@ixDT@BtsylQi4So~HcBryeDE=oTh- zEsv4&`3?>ru*rgBvjirdLREr0$hUQpCwRzmS(?f1dhZ9K^;{Q^v~S?pkW4{7It|yEZ1`%e zV)^+o9zLps2en}1%QT4I<~`VBmxtiM%(Z4T>`o$m37zUhq)S)fxu!?H7*J7Pk%He> zzeZdfu3uRScjzZm5ueK_r304!JVe5c+$=^f)N<4MC@E#y0+};MZinoZiGG+rCC!)l}JR$CNyA+J~7sDUa z=-K!~i$#|bp>K+C*|{mv&@BSi-wc(dBQEB!~Jl+jRtBXgMO>PB< z)gj*Ez|qDOG!0qjFK(8d{qLQ{)KEs)&(Sdy5}_0IG2t&2cq`KpI(|xI4?4IQxpBg- b(StOznR3ZFMqqM_Cg1$ps6k9mCh~s(*wpvM delta 2258 zcmZ`)TTGNk6rR~#1PZJyAb09=DHlZrL=0YV6%gen0=-!j5SLq55Lh-8EBsJet5Rq= zV(PU5Myw@@Osn6csp1FMI%$zeb=O{y3 zWk@@GSL2$<7z+b7(|yfqr&P372oG&BcN*S#BKDA|)7{_!$rzoQo}OL^=?NGBFW@+B zUGP=#TC~;y$AA>zBp})HBb{@s?h_1%MCUY}<}XgoZq4rBVW1k2A92@2N^~C!a78B? zXk-?a$IPsT?O|2;ub}RGi$sEl7k7~sC5=+nM+>WdOzYx@o`++EtX^Z3wm*)n-i12- zEN#*|TTA7Bwy z5rFh26*E;BuVQ7a6#ZQA8q_|#1IHI=f|i_rAM9FaNjr?i0?}wSVEmaC^Iox}QB`PS z+u55eU4`6Y6U%`~E0%4-yh-IeXOtF(T%pda1Q|?xCbn6+L(`Ww3e)Rzw`)L2Cv)eF;r*SIzdZ$pyk52c{uYg25w6b5J=jY%+vLTG7AHS6b5g#KpfRO|B9tM@ zZTprw+E0ly!@HeE4lCLoMa~uVbp3*dI}@BRS{(E`f*peWSR7+|a(hDte1#b8e#j}m zca8Y%beN{!sv+Z$P1u?ab79|W;$%8t7q=*yi|D?e7trow&4w%vJNTqr1(`(Kk4I4) zRr4iubKn5|(d$VQU;EJTXoum5gDYj~Q?BJ+ChvHG`?rHD<%(HuvMg3MREJt5CoA4t zlbTnb&#%$U2v#lT_MjC59o-A|BWGR@o0aOmd(QjN*g(zfrg5RJjONH&k4(~r_{dL6 z9i*zz`X5>{+cx4gNo1%Az^o?xG87s!?w%PNk%>WWYd&`i&Q}&W`4Ww48JV*a`-}@q z&?|#OHEL3kTpJ2ZBP(xZmc5OIWj&g&wTW#+ zMNDVKV7!Y6r>lCISVZPAS&z+lOlm#GjEw14fNl@ioFLgk8t?UfdeDB3;LggI1=n>4 z)Kb|RRwSldxywk`IW3*LRz#Yvv}f+OuwU;8bjbuc7npfL5As~H(b?u05R(tw`Tt7N Bb`<~s 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" -- 2.39.5