From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Thu, 14 Aug 2008 11:13:34 +0000 (+0000)
Subject: Minor mods only.
X-Git-Tag: V5.1.2~239
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b20c15f37dd9727592db1e3b75a8f479e4e9bf06;p=freertos

Minor mods only.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@457 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
index 0881fdc52..c9c29aefe 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -66,8 +66,8 @@
 #define configUSE_IDLE_HOOK				0
 #define configUSE_TICK_HOOK				0
 #define configCPU_CLOCK_HZ				( ( unsigned portLONG ) 64000000 )
-#define configTICK_RATE_HZ				( ( portTickType ) 200 )
-#define configMINIMAL_STACK_SIZE		( ( unsigned portSHORT ) 160 )
+#define configTICK_RATE_HZ				( ( portTickType ) 100 )
+#define configMINIMAL_STACK_SIZE		( ( unsigned portSHORT ) 190 )
 #define configTOTAL_HEAP_SIZE			( ( size_t ) ( 40000 ) )
 #define configMAX_TASK_NAME_LEN			( 12 )
 #define configUSE_TRACE_FACILITY		1
@@ -75,12 +75,12 @@
 #define configIDLE_SHOULD_YIELD			0
 #define configUSE_CO_ROUTINES 			0
 #define configUSE_MUTEXES				1
-#define configCHECK_FOR_STACK_OVERFLOW	2
+#define configCHECK_FOR_STACK_OVERFLOW	1
 #define configUSE_RECURSIVE_MUTEXES		1
 #define configQUEUE_REGISTRY_SIZE		10
 #define configUSE_COUNTING_SEMAPHORES	0
 
-#define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 5 )
+#define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 6 )
 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
 
 /* Set the following definitions to 1 to include the API function, or zero
diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
index f9ba06803..a314857c7 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
@@ -60,10 +60,10 @@ void vApplicationSetupInterrupts( void )
 const unsigned portSHORT usCompareMatchValue = ( ( configCPU_CLOCK_HZ / portPRESCALE_VALUE ) / configTICK_RATE_HZ );
 
     /* Configure interrupt priority and level and unmask interrupt. */
-    MCF_INTC0_ICR55 = ( 2 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) );
+    MCF_INTC0_ICR55 = ( 1 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) );
     MCF_INTC0_IMRH &= ~( MCF_INTC_IMRH_INT_MASK55 );
 
-    MCF_INTC0_ICR63 = ( 1 | configKERNEL_INTERRUPT_PRIORITY << 3 );
+    MCF_INTC0_ICR63 = ( 0 | configKERNEL_INTERRUPT_PRIORITY << 3 );
     MCF_INTC0_IMRH &= ~( MCF_INTC_IMRH_INT_MASK63 );
 
     MCF_PIT0_PCSR |= MCF_PIT_PCSR_PIF;
diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c
index d53ae91ce..c45d2855c 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c
@@ -51,8 +51,8 @@
 #include "IntQueueTimer.h"
 #include "IntQueue.h"
 
-#define timerINTERRUPT1_FREQUENCY	( 1000UL )
-#define timerINTERRUPT2_FREQUENCY	( 1001UL )
+#define timerINTERRUPT1_FREQUENCY	( 2000UL )
+#define timerINTERRUPT2_FREQUENCY	( 2001UL )
 #define timerPRESCALE_VALUE			( 2 )
 
 void vInitialiseTimerForIntQueueTest( void )
diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/Makefile b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/Makefile
index 5eeb74759..3ce41d52d 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/Makefile
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/Makefile
@@ -81,9 +81,9 @@ INCLUDE_PATHS=	-I"$(FREERTOS_SOURCE_DIR)/include" \
 
 CFLAGS=		$(INCLUDE_PATHS) \
 			-D COLDFIRE_V2_GCC \
-			-O0 \
+			-Os \
 			-fno-strict-aliasing \
-			-g3 \
+			-g1 \
 			-Wall \
 			-Wextra \
 			-c \
diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
index 266280645..2dbf3560b 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
@@ -94,7 +94,7 @@ tick hook. */
 
 /* The rate at which the LED controlled by the 'check' task will flash when an
 error has been detected. */
-#define mainERROR_PERIOD 					( 500 )
+#define mainERROR_PERIOD 					( ( portTickType ) 500 / portTICK_RATE_MS )
 
 /* The LED controlled by the 'check' task. */
 #define mainCHECK_LED						( 3 )
@@ -109,7 +109,7 @@ error has 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 + 3 )
+#define mainCREATOR_TASK_PRIORITY           ( tskIDLE_PRIORITY + 2 )
 #define mainINTEGER_TASK_PRIORITY           ( tskIDLE_PRIORITY )
 #define mainGEN_QUEUE_TASK_PRIORITY			( tskIDLE_PRIORITY )
 
@@ -261,6 +261,7 @@ extern void mcf5xxx_wr_cacr( unsigned portLONG );
 
 	/* Enable the cache. */
 	mcf5xxx_wr_cacr( MCF5XXX_CACR_CENB | MCF5XXX_CACR_CINV | MCF5XXX_CACR_DISD | MCF5XXX_CACR_CEIB | MCF5XXX_CACR_CLNF_00 );
+	asm volatile( "NOP" ); /* As per errata. */
 
 	/* Multiply 8Mhz reference crystal by 8 to achieve system clock of 64Mhz. */
 	MCF_CLOCK_SYNCR = MCF_CLOCK_SYNCR_MFD( 2 );