Continue to develop demo.

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
 

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 \

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;

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;
+	    }
 	}
 }
 /*-----------------------------------------------------------*/

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.