From f9caf38f851f08ff6ebdec0919376b13ec2645e4 Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sun, 16 Nov 2008 19:23:29 +0000 Subject: [PATCH] Continue to develop demo. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@550 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../org.eclipse.cdt.make.core/RTOSDemo.sc | 2 + .../RTOSDemo/.indexes/69/history.index | Bin 2652 -> 2676 bytes .../RTOSDemo/.indexes/f7/29/41/history.index | Bin 409 -> 433 bytes .../.projects/RTOSDemo/.indexes/history.index | Bin 1010 -> 1942 bytes .../.projects/RTOSDemo/.markers | Bin 28362 -> 26605 bytes .../.safetable/org.eclipse.core.resources | Bin 1038 -> 1041 bytes .../org.eclipse.cdt.managedbuilder.core.prefs | 4 +- .../.launches/RTOSDemo.launch | 2 +- .../org.eclipse.ui.ide/dialog_settings.xml | 20 +- .../dialog_settings.xml | 20 +- .../dialog_settings.xml | 2 +- .../org.eclipse.ui.workbench/workbench.xml | 285 +++++++++--------- .../org.eclipse.ui.workbench/workingsets.xml | 100 +++--- .../RTOSDemo/FreeRTOSConfig.h | 7 +- .../RTOSDemo/Makefile | 6 +- .../RTOSDemo/m52233-rom.ld | 33 +- .../ColdFire_MCF52233_Eclipse/RTOSDemo/main.c | 15 +- .../RTOSDemo/webserver/uip-conf.h | 4 +- 18 files changed, 264 insertions(+), 236 deletions(-) diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.cdt.make.core/RTOSDemo.sc b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.cdt.make.core/RTOSDemo.sc index 89fbf619d..01b254406 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.cdt.make.core/RTOSDemo.sc +++ b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.cdt.make.core/RTOSDemo.sc @@ -113,6 +113,8 @@ + + diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/69/history.index b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/69/history.index index 6c2bdb5433c75fef06bd1380ef0f241600cbf259..5c2349c6ebe2db1c8dcd5f11355dc04c8df3c347 100644 GIT binary patch delta 95 zcmV-l0HFWe6!a7Y0ssI23z1G*ksCy@)U*VVlQEOM1um0_1vRtl1#tqijR>RxlTQd2 zEdt=JhqVv1038{>q%Qw004m6X1r{(038>pz{d`7` delta 56 zcmV-80LTCI6xjiNFlMMUlTiUC94=!33c$p_rvkJ99T~r*G$I&=vJ?H=r5ynP H0Figtf1ePu delta 17 ZcmdnUJd=5X&%|k3jGPm1-k9j^1pqs72Jip? diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/history.index b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/history.index index 15869c59d963ef48de45d6f9bc02a0427f2dba9d..25c1abf635911c30510159f2b131282034d70a6e 100644 GIT binary patch literal 1942 zcmYk-e^Aq990%|RmJyV5D-7@iR(S^kZNn8FU7kabLw>}{ZJvbJmJHaj;oK0i&Rk?D z;jv{yqbnQ*B8TM;yYvn(XQp1aw2hzxy$bmuP-cU9lE-Di=dru@zps1W=h^r3yq{Y* zW9(rTAv5cZ)za-u=qb!dd;BXFA9t?fxu;_rdQS*?j>U&D<`4BXiNJ65caw`uS^j}j zEPnaRSzq*gZtip1pTO$ zJKJiS>xVfv#cl12=j!I-HWVy)Ot<&4&@!PtbLvxaXJ(%Qy>aRj?pwwf}N@%4q}3cTH=1506vC!cJkB?d?L z{fPd@`Xl6?M|=093-vB?CX|_nt#`4sf8E7jz*R;#hPLR!hfoXz*G_@gH}_*xf2Mfxg3xzS`` zu_HCN8?o5e4)9{T4~g7ZY{fV2bb`Fj_0%%>vLD=Ta<4AxE*@6l;BKkah0w1w@Xh&a zEmgR=SoI;AV_#i+`7xOPZVUf1Wwzs00r==tB0U6&Z!QZT)D~~uXN!fmEYI6*fJS`pk(3uIbM~k1ph{y0Ih! zeQXJL<+M5#y>Bo;^F3Xu$(!NaJF0eaWz@76AK=7c{=iidgBJbj2mHZ~6uljRe((6l zG{;#qc{U&BZ<^V_-DWLW2fkOvo&9|MMf6C)I?6M#EZ1r1hI9<6m z;R(2`#FEo=xxv*Z%~&?Azl&UV`-~9FR=S(J-(d?wSFhl%stCiWX+|NqxG_f|eR^Re^Sz~6~UA{V{3zhn?RkaMA9vHX%1 zvcyYpiL*5`bXk(7viU9Gg*oHo-ma9tv4nqS-yruV->OG{bC#FWeXuzV%USu}LCV|z qX?5knd{Y5;?>%o5`oFC@%Cr0PBUzA78cHI!1SZ#Jg8%*@_x}K>zr`c~ delta 48 zcmbQn|A}3IiGhKEnSotDH!(9$FPVX7qk}Rdmv3TrYFcJaDucl0mCREZ8F@CBu_-VD E023<<$^ZZW diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.markers b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.markers index 5823c7b78d0039bab613abb8a739219c3860f672..93fefe24f1a9d5d3d1a931d2de0d8d86b6742f7b 100644 GIT binary patch delta 1311 zcmYL}ZETZO6vz93KDusW>q?is)pm0*i`&}bV3xqzZ3WwP-MVfojJB*RTbZQ=4JNo@ zqQpRA7%Kb)G=ylGyd*A_Im{ABSb-3NMrVv4l%c6FAH>CIG=xNB@SNv1`sJ7ZJ?GqW z&vWiQ&nMqXzs^e!sZ^?^GvCXjlB7b%qqij0%<{ZKUg%?19P*Z6MExqQ?y9d5r}7^# z3yu=)g=ZD^pm|w;PJQ>EI#6_yY}Lj85Dgj-XEfJ|drPK?Chb+?qIQ-T?-|4r9cM83 zyKzo;gp{q6{4;--=5rybDlIC?&XKb8Ct)sso0P_(#X|Y(q#6U8akZk4)a}4lJXgty ztU)bKZMH&PbwqwiqAygzQ`d!iE7|F(nRqD2uYzF!r+Fq)p(5ULHj;A-!1W<2kVO^UyU0J|Nx>d`J}YaDbGU8yj|S z;d@L~jbM0ybA|LV7`L(#uiuXaWn~TWv?UC!$Pcl1DD+V-rl7`;u`t`_!+g@dZE51F z!3kn8(hWJnwFDzPY!4z|5wp<@-imq@#Vt#3=buS>nA^n_Mn^uD%S2Db)xJZH={7Ic zCixgv-zdtw>tvzw;#I~X5wDLOq=>}&IF{|;*!m4G;A=&3;=C3Mo*!kqcwAhr&%P6X YKFcXehr>3qy*O!m^T;IbvtWr>?hCL!uFvzWN335gjb{%e$-b8nG$CS*1==`X+UobP=vX=f|PHn98#wsF;kcruh8A?=n&M*8?-~` ze6gieXQ~X~9lBNzI!blLMN8Y5ITKys6J2h<+b60qA8qKykUZQjHIo+V3(u3u4)X=V zi*SqGeuu}y`FcdZN-ldU$1#v!^qSnqnS)K+OT3Y%;u zNf4;RwkDs{=@vUUU)PpG^mu&%8|U-5Om0cATR2m3VPR2`y;5ngZR|~KFW$tayh%oA z2_dBmqQmJCTrA7X3*8ak0E4?j#Psr#hwy^B3rr}y z;H$<^9hIU>sbUh<$1teBNYs~6-X~8dqwl596U#&@nm|OVnLN=1B2vxdi6$`qxq1cF zOrB^05qz^E{bc1F0cPd+CyPG6c38ybTwayOvMLzNN`m*;epc02qMAmA?IsT1SMNkt zkevjXQC}k)h#Dn~?nS&5QxAQbbwSn=qp%CX^~Kmvkr}5vL#&tzh<{A|8Sz-$WkhrQ zPlyTAt{@($vBTU1ir$)VAJH})eSH}-;wXun#P4zOC^4EAk7u4nthYA7!=y%J&#Wx~ zuTkVMuZ8PxE`+?~!x}G*gbL24U?glz{Q)seOZ<-Z6GSoXW5nq6ZxHWhnjvZy9WdCI z1P66X;k>+hI*a!A&;A9m-kJo_O&r|LpnWHsnqg-qvAda+j1qSMnPo!>H0Wz!hF+uD zrlhc=xejK&PMeAK%Pc^8aU=R9DsDu7Eulx5YF(!s-#3^QL!QC5 zT9`9;zotVuwIJIIf6b#)3$m}o%MrSE#nnIe3mD3-*6_;m=z=prze_O;&2NR?`4l=d z|2&lC)M}iH#3%;4sgDXGKjgE3*<3TYL>&H)Pzmg!-Rbauo4;3FTOBZ-(1TDR{(gfz8XtSXwEu zuF~Ud3Fz5ec(5WJ+djHNP0dxWdY~~Xr$hPgXmG3^YbvLhFU2GSTfPTUE1JB$XZ#Tl-&`pRcDo4|u)K;SKV0<~Q5mHcsH&#Gfv9#+*HGAj z8meGxf)x(elIK{Q4LCC~bG!$lEi`aBiS6**Lc)KP=!I)_bZNcybHry>8ct;h0>~cE zG(&IwN65~m2(Wi8owG5u9k>Q!X<7lE%j}MpgCmV(6Vq0MVI8sP^fvfgW>04caC|-4 zlo_DuIob3TqGiK=#2w96SkO%Q>}WoV7@x8l_!b)V5&c!@Z#64yI$s`?b*9qLLE9*L z2HQSEls5jVnXZ`cIrgC8RM|Ul(@B>qdZ4xp^K^A=aVI=+k>>`oK7rW2C1zOHPAs>? q2qQAPUSfxH9o2BMJw}tN99?dwtVir;WUPbxZ&B7=rE6iYqxxU_9^{b# diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index bd5ab1f3db46fe4f9381653684004ce0f1759ca0..fb75059b9c373fa053f8cca0be32a9e2dd0a89b1 100644 GIT binary patch delta 143 zcmeCJ)C{2FC)C<>(#UK{|V4EoX delta 146 zcmbQp(Z?}Chuz%Dz{1Mde6l5z?!*KWM&pSGB`2 - + diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml index d523e86a7..90b759b02 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml +++ b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml @@ -11,23 +11,23 @@
- +
-
- - - - - - - -
+
+ + + + + + + +
diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml index 601621360..23cdb2789 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml +++ b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml @@ -3,26 +3,26 @@
- +
- + - + + + + + + + + - - - - - - - diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml index 84cbbbf3c..ba5f22d96 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml +++ b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -15,8 +15,8 @@ - + diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml index 92e6494c9..68d199b3c 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml +++ b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml @@ -34,18 +34,13 @@ - - - - - - - - + + + @@ -56,10 +51,9 @@ - - + @@ -86,7 +80,7 @@ - + @@ -216,7 +210,7 @@ - + @@ -379,165 +373,165 @@ - - - - - - + + + + + + + - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -556,6 +550,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -565,9 +586,6 @@ - - - @@ -577,26 +595,5 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml index f27053177..f1c49cd01 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -1,69 +1,69 @@ - - - - - - + + + - - - - - - + - - - - - - - + + + + + + + + + + + + + + - - + + + + + + + + - - - + + + + + - - + + + - - - + + + + + + + - - - - + + - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h index 407d93951..a3e04a9f2 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h +++ b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h @@ -68,9 +68,9 @@ #define configUSE_IDLE_HOOK 0 #define configUSE_TICK_HOOK 0 #define configCPU_CLOCK_HZ ( ( unsigned portLONG ) 60000000 ) -#define configTICK_RATE_HZ ( ( portTickType ) 100 ) +#define configTICK_RATE_HZ ( ( portTickType ) 1000 ) #define configMINIMAL_STACK_SIZE ( ( unsigned portSHORT ) 100 ) -#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 15000 ) ) +#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 19000 ) ) #define configMAX_TASK_NAME_LEN ( 12 ) #define configUSE_TRACE_FACILITY 1 #define configUSE_16_BIT_TICKS 0 @@ -103,7 +103,6 @@ to exclude the API function. */ void vApplicationSetupInterrupts( void ); - /* Ethernet configuration. */ #define configMAC_0 0x00 #define configMAC_1 0x04 @@ -129,7 +128,7 @@ void vApplicationSetupInterrupts( void ); #define configNUM_FEC_RX_BUFFERS 3 #define configFEC_BUFFER_SIZE 1520 -#define configUSE_PROMISCUOUS_MODE 0 +#define configUSE_PROMISCUOUS_MODE 1 #define configETHERNET_INPUT_TASK_STACK_SIZE ( 320 ) #define configFEC_INTERRUPT_PRIORITY configMAX_SYSCALL_INTERRUPT_PRIORITY diff --git a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/Makefile b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/Makefile index cb9f45579..4a71b30fe 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/Makefile +++ b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/Makefile @@ -68,6 +68,8 @@ Demo_OBJS= $(OUTPUT_DIR)/main.o \ $(OUTPUT_DIR)/GenQTest.o \ $(OUTPUT_DIR)/QPeek.o \ $(OUTPUT_DIR)/FEC.o \ + $(OUTPUT_DIR)/blocktim.o \ + $(OUTPUT_DIR)/recmutex.o \ $(OUTPUT_DIR)/printf-stdarg.o HTTP_OBJS= $(OUTPUT_DIR)/uIP_Task.o \ @@ -84,7 +86,7 @@ uIP_OBJS= $(OUTPUT_DIR)/timer.o \ $(OUTPUT_DIR)/uip-split.o \ $(OUTPUT_DIR)/psock.o -OBJS = $(FreeRTOS_OBJS) $(Demo_OBJS) $(uIP_OBJS) $(HTTP_OBJS) +OBJS = $(Demo_OBJS) $(FreeRTOS_OBJS) $(uIP_OBJS) $(HTTP_OBJS) C_DEPS = $(OBJS:.o=.d) @@ -102,6 +104,8 @@ CFLAGS= $(INCLUDE_PATHS) \ -D PACK_STRUCT_END=__attribute\(\(packed\)\) \ -D ALIGN_STRUCT_END=__attribute\(\(aligned\(4\)\)\) \ -O$(OPTIM) \ + -D bktPRIMARY_PRIORITY=4 \ + -D bktSECONDARY_PRIORITY=3 \ -fno-strict-aliasing \ -g3 \ -gdwarf-2 \ diff --git a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/m52233-rom.ld b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/m52233-rom.ld index 8042aea20..8ee2a2e59 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/m52233-rom.ld +++ b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/m52233-rom.ld @@ -22,8 +22,10 @@ GROUP(-lgcc -lc -lcs3 -lcs3unhosted -lcs3coldfire) MEMORY { - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 32K - rom (rx) : ORIGIN = 0x00000000, LENGTH = 256K + ram (rw) : ORIGIN = 0x20000000, LENGTH = 32K + vectorrom (RX) : ORIGIN = 0x00000000, LENGTH = 0x00000400 + cfmprotrom (RX) : ORIGIN = 0x00000400, LENGTH = 0x00000020 + rom (rx) : ORIGIN = 0x00000420, LENGTH = 256K - 0x400 - 0x20 ipsbar (rw) : ORIGIN = 0x40000000, LENGTH = 2M } @@ -45,16 +47,27 @@ PROVIDE(__cs3_stack = __cs3_region_start_ram + __cs3_region_size_ram); SECTIONS { + .vectors_table : + { + CREATE_OBJECT_SYMBOLS + __cs3_region_start_rom = .; + *(.cs3.region-head.rom) + ASSERT (. == __cs3_region_start_rom, ".cs3.region-head.rom not permitted"); + __cs3_interrupt_vector = __cs3_interrupt_vector_coldfire; + *(.cs3.interrupt_vector) + /* Make sure we pulled in an interrupt vector. */ + ASSERT (. != __cs3_interrupt_vector_coldfire, "No interrupt vector"); + } > vectorrom + + .cfmprotect : + { + *(.cfmconfig) + . = ALIGN (0x4); + } > cfmprotrom + + .text : { - CREATE_OBJECT_SYMBOLS - __cs3_region_start_rom = .; - *(.cs3.region-head.rom) - ASSERT (. == __cs3_region_start_rom, ".cs3.region-head.rom not permitted"); - __cs3_interrupt_vector = __cs3_interrupt_vector_coldfire; - *(.cs3.interrupt_vector) - /* Make sure we pulled in an interrupt vector. */ - ASSERT (. != __cs3_interrupt_vector_coldfire, "No interrupt vector"); PROVIDE(__cs3_reset_m52235evb = _start); __cs3_reset = __cs3_reset_m52235evb; diff --git a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c index a5915d5ff..e3db78268 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c +++ b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c @@ -81,12 +81,14 @@ /* Demo app includes. */ #include "BlockQ.h" #include "death.h" +#include "blocktim.h" #include "flash.h" #include "partest.h" #include "semtest.h" #include "PollQ.h" #include "GenQTest.h" #include "QPeek.h" +#include "recmutex.h" #include "IntQueue.h" #include "comtest2.h" @@ -113,7 +115,6 @@ error have been detected. */ #define mainCHECK_TASK_PRIORITY ( tskIDLE_PRIORITY + 3 ) #define mainSEM_TEST_PRIORITY ( tskIDLE_PRIORITY + 1 ) #define mainBLOCK_Q_PRIORITY ( tskIDLE_PRIORITY + 2 ) -#define mainCREATOR_TASK_PRIORITY ( tskIDLE_PRIORITY + 2 ) #define mainGEN_QUEUE_TASK_PRIORITY ( tskIDLE_PRIORITY ) /* The WEB server task uses more stack than most other tasks because of its @@ -151,10 +152,12 @@ int main( void ) /* Start the standard demo tasks. */ vStartLEDFlashTasks( tskIDLE_PRIORITY ); vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY ); + vCreateBlockTimeTasks(); vStartSemaphoreTasks( mainSEM_TEST_PRIORITY ); vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY ); vStartGenericQueueTasks( mainGEN_QUEUE_TASK_PRIORITY ); vStartQueuePeekTasks(); + vStartRecursiveMutexTasks(); /* Create the check task. */ xTaskCreate( prvCheckTask, ( signed portCHAR * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL ); @@ -208,6 +211,16 @@ portTickType xLastExecutionTime; { ulErrorCode |= 0x40UL; } + + if( xAreBlockTimeTestTasksStillRunning() != pdTRUE ) + { + ulErrorCode |= 0x80UL; + } + + if( xAreRecursiveMutexTasksStillRunning() != pdTRUE ) + { + ulErrorCode |= 0x100UL; + } } } /*-----------------------------------------------------------*/ diff --git a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/uip-conf.h b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/uip-conf.h index f77061562..2a93ff326 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/uip-conf.h +++ b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/uip-conf.h @@ -90,14 +90,14 @@ typedef unsigned short uip_stats_t; * * \hideinitializer */ -#define UIP_CONF_MAX_CONNECTIONS 40 +#define UIP_CONF_MAX_CONNECTIONS 30 /** * Maximum number of listening TCP ports. * * \hideinitializer */ -#define UIP_CONF_MAX_LISTENPORTS 40 +#define UIP_CONF_MAX_LISTENPORTS 5 /** * uIP buffer size. -- 2.39.2