From: richardbarry Date: Sun, 16 Nov 2008 19:23:29 +0000 (+0000) Subject: Continue to develop demo. X-Git-Tag: V5.1.2~146 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f9caf38f851f08ff6ebdec0919376b13ec2645e4;p=freertos Continue to develop demo. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@550 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- 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 6c2bdb543..5c2349c6e 100644 Binary files a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/69/history.index and b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/69/history.index differ diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/f7/29/41/history.index b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/f7/29/41/history.index index 933661649..10b9ce3f6 100644 Binary files a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/f7/29/41/history.index and b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/f7/29/41/history.index differ 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 15869c59d..25c1abf63 100644 Binary files a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/history.index and b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.indexes/history.index differ 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 5823c7b78..93fefe24f 100644 Binary files a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.markers and b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/RTOSDemo/.markers differ 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 bd5ab1f3d..fb75059b9 100644 Binary files a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs index e8943e4e8..b301eb8b2 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs +++ b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.managedbuilder.core.prefs @@ -1,3 +1,3 @@ -#Sun Nov 16 16:51:02 GMT 2008 +#Sun Nov 16 19:17:14 GMT 2008 eclipse.preferences.version=1 -properties/RTOSDemo.null.38326818/0.1348192838=\#\r\n\#Sun Nov 16 16\:51\:02 GMT 2008\r\norg.eclipse.cdt.build.core.settings.holder.1053974197\=\\\#\\r\\n\\\#Sun Nov 16 16\\\:51\\\:02 GMT 2008\\r\\nrebuildState\\\=false\\r\\n\r\norg.eclipse.cdt.build.core.settings.holder.804763436\=\\\#\\r\\n\\\#Sun Nov 16 16\\\:51\\\:02 GMT 2008\\r\\nrebuildState\\\=false\\r\\n\r\norg.eclipse.cdt.build.core.settings.holder.libs.1997217404\=\\\#\\r\\n\\\#Sun Nov 16 16\\\:51\\\:02 GMT 2008\\r\\nrebuildState\\\=false\\r\\n\r\norg.eclipse.cdt.build.core.settings.holder.99587291\=\\\#\\r\\n\\\#Sun Nov 16 16\\\:51\\\:02 GMT 2008\\r\\nrebuildState\\\=false\\r\\n\r\norg.eclipse.cdt.build.core.prefbase.toolchain.1423010524\=\\\#\\r\\n\\\#Sun Nov 16 16\\\:51\\\:02 GMT 2008\\r\\nrebuildState\\\=false\\r\\n\r\n0.1348192838\=\\\#\\r\\n\\\#Sun Nov 16 16\\\:51\\\:02 GMT 2008\\r\\nrcState\\\=0\\r\\nrebuildState\\\=false\\r\\n\r\n +properties/RTOSDemo.null.38326818/0.1348192838=\#\r\n\#Sun Nov 16 19\:17\:14 GMT 2008\r\norg.eclipse.cdt.build.core.settings.holder.1053974197\=\\\#\\r\\n\\\#Sun Nov 16 19\\\:17\\\:14 GMT 2008\\r\\nrebuildState\\\=false\\r\\n\r\norg.eclipse.cdt.build.core.settings.holder.804763436\=\\\#\\r\\n\\\#Sun Nov 16 19\\\:17\\\:14 GMT 2008\\r\\nrebuildState\\\=false\\r\\n\r\norg.eclipse.cdt.build.core.settings.holder.libs.1997217404\=\\\#\\r\\n\\\#Sun Nov 16 19\\\:17\\\:14 GMT 2008\\r\\nrebuildState\\\=false\\r\\n\r\norg.eclipse.cdt.build.core.settings.holder.99587291\=\\\#\\r\\n\\\#Sun Nov 16 19\\\:17\\\:14 GMT 2008\\r\\nrebuildState\\\=false\\r\\n\r\norg.eclipse.cdt.build.core.prefbase.toolchain.1423010524\=\\\#\\r\\n\\\#Sun Nov 16 19\\\:17\\\:14 GMT 2008\\r\\nrebuildState\\\=false\\r\\n\r\n0.1348192838\=\\\#\\r\\n\\\#Sun Nov 16 19\\\:17\\\:14 GMT 2008\\r\\nrcState\\\=0\\r\\nrebuildState\\\=false\\r\\n\r\n diff --git a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/RTOSDemo.launch b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/RTOSDemo.launch index de18a664a..3381d666e 100644 --- a/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/RTOSDemo.launch +++ b/Demo/ColdFire_MCF52233_Eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/RTOSDemo.launch @@ -13,7 +13,7 @@ - + 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.