Tidy up.

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

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
index a65da0f172b1b40f80dcd6e6847b111fea9acb5d..0881fdc5217abe922afb2b32f8b3ff8e33042653 100644 (file)
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -66,7 +66,7 @@
 #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 ) 1000 )\r
+#define configTICK_RATE_HZ                             ( ( portTickType ) 200 )\r
 #define configMINIMAL_STACK_SIZE               ( ( unsigned portSHORT ) 160 )\r
 #define configTOTAL_HEAP_SIZE                  ( ( size_t ) ( 40000 ) )\r
 #define configMAX_TASK_NAME_LEN                        ( 12 )\r
@@ -78,6 +78,7 @@
 #define configCHECK_FOR_STACK_OVERFLOW 2\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_CO_ROUTINE_PRIORITIES ( 2 )\r

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c
index c45d2855c75635c0c48e93c0d6c99a40cb76ee85..d53ae91ce81389e6536cc9f45c3402d19c9e7c33 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      ( 2000UL )\r
-#define timerINTERRUPT2_FREQUENCY      ( 2001UL )\r
+#define timerINTERRUPT1_FREQUENCY      ( 1000UL )\r
+#define timerINTERRUPT2_FREQUENCY      ( 1001UL )\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 f28efe17c2e6d33a76fe30a3c0f48e92c3e994ed..5eeb7475922570e26b3bb4c898e9fdcabe85ef03 100644 (file)
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/Makefile
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/Makefile
@@ -1,49 +1,85 @@
 RM := rm -rf\r
 \r
+###############################################################################\r
+# List the directories that contain files to be built.\r
+###############################################################################\r
+\r
+# These two directories contain the FreeRTOS.org kernel source files.\r
 FREERTOS_SOURCE_DIR=./../../../Source\r
 PORT_SOURCE_DIR=./../../../Source/portable/GCC/ColdFire_V2\r
+\r
+# This directory contains the standard demo files that get included in every\r
+# FreeRTOS.org demo.  They define tasks that demonstrate the API usage and \r
+# test the FreeRTOS.org port.\r
 COMMON_DEMO_SOURCE_DIR=./../../Common/Minimal\r
+\r
+# The lwIP stack source files.\r
+LWIP_ROOT_DIR=./../../Common/ethernet/lwIP_130\r
+\r
+VPATH=         $(FREERTOS_SOURCE_DIR) : \\r
+                       $(PORT_SOURCE_DIR) : \\r
+                       $(COMMON_DEMO_SOURCE_DIR) : \\r
+                       $(FREERTOS_SOURCE_DIR)/portable/MemMang : \\r
+                       . : \\r
+                       ./ParTest : \\r
+                       ./serial\r
+\r
+\r
+###############################################################################\r
+# Define a few constants to be used during the build.\r
+###############################################################################\r
+\r
 OUTPUT_DIR=./bin\r
 CPU=528x\r
-LINKER_SCRIPT=m5282evb-ram-hosted.ld\r
+LINKER_SCRIPT=m5282evb-dram_code-rambar_data-hosted.ld\r
 OUTPUT_FILENAME=RTOSDemo.elf\r
 CC=m68k-elf-gcc\r
 AS=m68K-elf-as\r
-VPATH=$(FREERTOS_SOURCE_DIR) : $(PORT_SOURCE_DIR) : $(COMMON_DEMO_SOURCE_DIR) : $(FREERTOS_SOURCE_DIR)/portable/MemMang : . : ./ParTest : ./serial\r
-\r
-OBJS =         $(OUTPUT_DIR)/portasm.o \\r
-                       $(OUTPUT_DIR)/main.o \\r
-                       $(OUTPUT_DIR)/serial.o \\r
-                       $(OUTPUT_DIR)/comtest.o \\r
-                       $(OUTPUT_DIR)/flash.o \\r
-                       $(OUTPUT_DIR)/ParTest.o \\r
-                       $(OUTPUT_DIR)/BlockQ.o \\r
-                       $(OUTPUT_DIR)/blocktim.o \\r
-                       $(OUTPUT_DIR)/death.o \\r
-                       $(OUTPUT_DIR)/integer.o \\r
-                       $(OUTPUT_DIR)/PollQ.o \\r
-                       $(OUTPUT_DIR)/semtest.o \\r
-                       $(OUTPUT_DIR)/GenQTest.o \\r
-                       $(OUTPUT_DIR)/QPeek.o \\r
-                       $(OUTPUT_DIR)/recmutex.o \\r
-                       $(OUTPUT_DIR)/port.o \\r
-                       $(OUTPUT_DIR)/list.o \\r
-                       $(OUTPUT_DIR)/tasks.o \\r
-                       $(OUTPUT_DIR)/queue.o \\r
-                       $(OUTPUT_DIR)/heap_2.o \\r
-                       $(OUTPUT_DIR)/IntQueueTimer.o \\r
-                       $(OUTPUT_DIR)/IntQueue.o \\r
-                       $(OUTPUT_DIR)/FreeRTOS_Tick_Setup.o\r
+\r
+\r
+###############################################################################\r
+# List the files to include in the build.  These files will be located from the\r
+# VPATH defined above.\r
+###############################################################################\r
+\r
+# The FreeRTOS.org source files.\r
+FreeRTOS_OBJS=                 $(OUTPUT_DIR)/portasm.o \\r
+                                               $(OUTPUT_DIR)/port.o \\r
+                                               $(OUTPUT_DIR)/list.o \\r
+                                               $(OUTPUT_DIR)/tasks.o \\r
+                                               $(OUTPUT_DIR)/queue.o \\r
+                                               $(OUTPUT_DIR)/heap_2.o\r
+\r
+# The demo app source files.\r
+Demo_OBJS=                             $(OUTPUT_DIR)/main.o \\r
+                                               $(OUTPUT_DIR)/serial.o \\r
+                                               $(OUTPUT_DIR)/comtest.o \\r
+                                               $(OUTPUT_DIR)/flash.o \\r
+                                               $(OUTPUT_DIR)/ParTest.o \\r
+                                               $(OUTPUT_DIR)/BlockQ.o \\r
+                                               $(OUTPUT_DIR)/death.o \\r
+                                               $(OUTPUT_DIR)/integer.o \\r
+                                               $(OUTPUT_DIR)/PollQ.o \\r
+                                               $(OUTPUT_DIR)/semtest.o \\r
+                                               $(OUTPUT_DIR)/GenQTest.o \\r
+                                               $(OUTPUT_DIR)/QPeek.o \\r
+                                               $(OUTPUT_DIR)/recmutex.o \\r
+                                               $(OUTPUT_DIR)/IntQueueTimer.o \\r
+                                               $(OUTPUT_DIR)/IntQueue.o \\r
+                                               $(OUTPUT_DIR)/FreeRTOS_Tick_Setup.o\r
+\r
+OBJS = $(FreeRTOS_OBJS) $(Demo_OBJS)\r
                        \r
 C_DEPS = $(OBJS:.o=.d)\r
 \r
+INCLUDE_PATHS= -I"$(FREERTOS_SOURCE_DIR)/include" \\r
+                               -I"include" \\r
+                               -I"$(COMMON_DEMO_SOURCE_DIR)/../include" \\r
+                               -I"$(PORT_SOURCE_DIR)" \\r
+                               -I./MCF5282 \\r
+                               -I.\r
 \r
-CFLAGS=                -I"$(FREERTOS_SOURCE_DIR)/include" \\r
-                       -I"include" \\r
-                       -I"$(COMMON_DEMO_SOURCE_DIR)/../include" \\r
-                       -I"$(PORT_SOURCE_DIR)" \\r
-                       -I./MCF5282 \\r
-                       -I. \\r
+CFLAGS=                $(INCLUDE_PATHS) \\r
                        -D COLDFIRE_V2_GCC \\r
                        -O0 \\r
                        -fno-strict-aliasing \\r
@@ -63,6 +99,7 @@ CFLAGS=               -I"$(FREERTOS_SOURCE_DIR)/include" \
                        -MT"$(@:%.o=%.d)"\r
 \r
 ASFLAGS=       -m528x \\r
+                       -g3 \\r
                        --register-prefix-optional \\r
             --bitwise-or\r
 \r

diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
index eb3f368abc50a659598e9a8a6766f9b8e33499eb..2662806453f7cdc8e2872eb65b2d61c6c1e602ac 100644 (file)
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
@@ -76,7 +76,6 @@
 #include "BlockQ.h"\r
 #include "death.h"\r
 #include "integer.h"\r
-#include "blocktim.h"\r
 #include "flash.h"\r
 #include "partest.h"\r
 #include "semtest.h"\r
@@ -101,8 +100,8 @@ error has been detected. */
 #define mainCHECK_LED                                          ( 3 )\r
 \r
 /* Contest constants - there is no free LED for the comtest. */\r
-#define mainCOM_TEST_BAUD_RATE ( ( unsigned portLONG ) 115200 )\r
-#define mainCOM_TEST_LED               ( 5 )\r
+#define mainCOM_TEST_BAUD_RATE                         ( ( unsigned portLONG ) 19200 )\r
+#define mainCOM_TEST_LED                                       ( 5 )\r
 \r
 /* Task priorities. */\r
 #define mainCOM_TEST_PRIORITY                          ( tskIDLE_PRIORITY + 2 )\r
@@ -137,7 +136,6 @@ int main( void )
        /* Start the standard demo tasks. */\r
        vStartLEDFlashTasks( tskIDLE_PRIORITY );\r
        vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );\r
-       vCreateBlockTimeTasks();\r
        vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );\r
        vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
        vStartIntegerMathTasks( mainINTEGER_TASK_PRIORITY );\r
@@ -199,11 +197,6 @@ portTickType xLastExecutionTime;
                        ulError |= 0x04UL;\r
                }\r
 \r
-               if( xAreBlockTimeTestTasksStillRunning() != pdTRUE )\r
-               {\r
-                       ulError |= 0x10UL;\r
-               }\r
-\r
                if( xAreSemaphoreTasksStillRunning() != pdTRUE )\r
            {\r
                ulError |= 0x20UL;\r