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 0881fdc5217abe922afb2b32f8b3ff8e33042653..c9c29aefe08d4931451712e7907ca4ef6bb7d5e1 100644 (file)
--- 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\r
 #define configUSE_TICK_HOOK                            0\r
 #define configCPU_CLOCK_HZ                             ( ( unsigned portLONG ) 64000000 )\r
-#define configTICK_RATE_HZ                             ( ( portTickType ) 200 )\r
-#define configMINIMAL_STACK_SIZE               ( ( unsigned portSHORT ) 160 )\r
+#define configTICK_RATE_HZ                             ( ( portTickType ) 100 )\r
+#define configMINIMAL_STACK_SIZE               ( ( unsigned portSHORT ) 190 )\r
 #define configTOTAL_HEAP_SIZE                  ( ( size_t ) ( 40000 ) )\r
 #define configMAX_TASK_NAME_LEN                        ( 12 )\r
 #define configUSE_TRACE_FACILITY               1\r
@@ -75,12 +75,12 @@
 #define configIDLE_SHOULD_YIELD                        0\r
 #define configUSE_CO_ROUTINES                  0\r
 #define configUSE_MUTEXES                              1\r
-#define configCHECK_FOR_STACK_OVERFLOW 2\r
+#define configCHECK_FOR_STACK_OVERFLOW 1\r
 #define configUSE_RECURSIVE_MUTEXES            1\r
 #define configQUEUE_REGISTRY_SIZE              10\r
 #define configUSE_COUNTING_SEMAPHORES  0\r
 \r
-#define configMAX_PRIORITIES           ( ( unsigned portBASE_TYPE ) 5 )\r
+#define configMAX_PRIORITIES           ( ( unsigned portBASE_TYPE ) 6 )\r
 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )\r
 \r
 /* Set the following definitions to 1 to include the API function, or zero\r

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
index f9ba06803286ef48e4065642dfd97853480225bb..a314857c753c625041a04f6ebd7f25a567f66de0 100644 (file)
--- 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 );\r
 \r
     /* Configure interrupt priority and level and unmask interrupt. */\r
-    MCF_INTC0_ICR55 = ( 2 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) );\r
+    MCF_INTC0_ICR55 = ( 1 | ( configKERNEL_INTERRUPT_PRIORITY << 3 ) );\r
     MCF_INTC0_IMRH &= ~( MCF_INTC_IMRH_INT_MASK55 );\r
 \r
-    MCF_INTC0_ICR63 = ( 1 | configKERNEL_INTERRUPT_PRIORITY << 3 );\r
+    MCF_INTC0_ICR63 = ( 0 | configKERNEL_INTERRUPT_PRIORITY << 3 );\r
     MCF_INTC0_IMRH &= ~( MCF_INTC_IMRH_INT_MASK63 );\r
 \r
     MCF_PIT0_PCSR |= MCF_PIT_PCSR_PIF;\r

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c
index d53ae91ce81389e6536cc9f45c3402d19c9e7c33..c45d2855c75635c0c48e93c0d6c99a40cb76ee85 100644 (file)
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c
@@ -51,8 +51,8 @@
 #include "IntQueueTimer.h"\r
 #include "IntQueue.h"\r
 \r
-#define timerINTERRUPT1_FREQUENCY      ( 1000UL )\r
-#define timerINTERRUPT2_FREQUENCY      ( 1001UL )\r
+#define timerINTERRUPT1_FREQUENCY      ( 2000UL )\r
+#define timerINTERRUPT2_FREQUENCY      ( 2001UL )\r
 #define timerPRESCALE_VALUE                    ( 2 )\r
 \r
 void vInitialiseTimerForIntQueueTest( void )\r

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/Makefile b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/Makefile
index 5eeb7475922570e26b3bb4c898e9fdcabe85ef03..3ce41d52d555fe0144e8ee3b7af30de3b0fc3862 100644 (file)
--- 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" \
 \r
 CFLAGS=                $(INCLUDE_PATHS) \\r
                        -D COLDFIRE_V2_GCC \\r
-                       -O0 \\r
+                       -Os \\r
                        -fno-strict-aliasing \\r
-                       -g3 \\r
+                       -g1 \\r
                        -Wall \\r
                        -Wextra \\r
                        -c \\r

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
index 2662806453f7cdc8e2872eb65b2d61c6c1e602ac..2dbf3560bca2f8c558badb4827dcd965cbd3d1c0 100644 (file)
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
@@ -94,7 +94,7 @@ tick hook. */
 \r
 /* The rate at which the LED controlled by the 'check' task will flash when an\r
 error has been detected. */\r
-#define mainERROR_PERIOD                                       ( 500 )\r
+#define mainERROR_PERIOD                                       ( ( portTickType ) 500 / portTICK_RATE_MS )\r
 \r
 /* The LED controlled by the 'check' task. */\r
 #define mainCHECK_LED                                          ( 3 )\r
@@ -109,7 +109,7 @@ error has been detected. */
 #define mainCHECK_TASK_PRIORITY                                ( tskIDLE_PRIORITY + 3 )\r
 #define mainSEM_TEST_PRIORITY                          ( tskIDLE_PRIORITY + 1 )\r
 #define mainBLOCK_Q_PRIORITY                           ( tskIDLE_PRIORITY + 2 )\r
-#define mainCREATOR_TASK_PRIORITY           ( tskIDLE_PRIORITY + 3 )\r
+#define mainCREATOR_TASK_PRIORITY           ( tskIDLE_PRIORITY + 2 )\r
 #define mainINTEGER_TASK_PRIORITY           ( tskIDLE_PRIORITY )\r
 #define mainGEN_QUEUE_TASK_PRIORITY                    ( tskIDLE_PRIORITY )\r
 \r
@@ -261,6 +261,7 @@ extern void mcf5xxx_wr_cacr( unsigned portLONG );
 \r
        /* Enable the cache. */\r
        mcf5xxx_wr_cacr( MCF5XXX_CACR_CENB | MCF5XXX_CACR_CINV | MCF5XXX_CACR_DISD | MCF5XXX_CACR_CEIB | MCF5XXX_CACR_CLNF_00 );\r
+       asm volatile( "NOP" ); /* As per errata. */\r
 \r
        /* Multiply 8Mhz reference crystal by 8 to achieve system clock of 64Mhz. */\r
        MCF_CLOCK_SYNCR = MCF_CLOCK_SYNCR_MFD( 2 );\r