Continue ColdeFire/CodeWarrior development.

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

diff --git a/Demo/ColdFire_MCF52221_CodeWarrior/RTOSDemo_Data/CWSettingsWindows.stg b/Demo/ColdFire_MCF52221_CodeWarrior/RTOSDemo_Data/CWSettingsWindows.stg
index 9cfc047a1266ccb509b920c02d9efdb95f681988..9c3ff743ce64f10c477ac5089554181983116de4 100644 (file)
Binary files a/Demo/ColdFire_MCF52221_CodeWarrior/RTOSDemo_Data/CWSettingsWindows.stg and b/Demo/ColdFire_MCF52221_CodeWarrior/RTOSDemo_Data/CWSettingsWindows.stg differ

diff --git a/Demo/ColdFire_MCF52221_CodeWarrior/RTOSDemo_Data/INTERNAL_FLASH/TargetDataWindows.tdt b/Demo/ColdFire_MCF52221_CodeWarrior/RTOSDemo_Data/INTERNAL_FLASH/TargetDataWindows.tdt
index 8789996f977c8406bfb6968ab2751bed629f0fe1..608dcf48a8c69ef7e533086ae23267477dd11262 100644 (file)
Binary files a/Demo/ColdFire_MCF52221_CodeWarrior/RTOSDemo_Data/INTERNAL_FLASH/TargetDataWindows.tdt and b/Demo/ColdFire_MCF52221_CodeWarrior/RTOSDemo_Data/INTERNAL_FLASH/TargetDataWindows.tdt differ

diff --git a/Demo/ColdFire_MCF52221_CodeWarrior/lcf/MCF52221_INTERNAL_FLASH.lcf b/Demo/ColdFire_MCF52221_CodeWarrior/lcf/MCF52221_INTERNAL_FLASH.lcf
index a7cacb026f99255dd7a0ea5229d9a6cb3445f6a9..6cf788e782367fa781f00d6128e074c41c10b176 100644 (file)
--- a/Demo/ColdFire_MCF52221_CodeWarrior/lcf/MCF52221_INTERNAL_FLASH.lcf
+++ b/Demo/ColdFire_MCF52221_CodeWarrior/lcf/MCF52221_INTERNAL_FLASH.lcf
@@ -8,15 +8,15 @@ MEMORY {
    vectorrom   (RX)  : ORIGIN = 0x00000000, LENGTH = 0x00000400\r
    cfmprotrom  (RX)  : ORIGIN = 0x00000400, LENGTH = 0x00000020   \r
    code        (RX)  : ORIGIN = 0x00000500, LENGTH = 0x0001FB00\r
-   vectorram   (RWX) : ORIGIN = 0x20000000, LENGTH = 0x00000400\r
    userram     (RWX) : ORIGIN = 0x20000400, LENGTH = 0x00003C00\r
 }\r
 \r
 SECTIONS {\r
 \r
 # Heap and Stack sizes definition\r
-       ___heap_size      = 0x1000;\r
-       ___stack_size     = 0x1000;\r
+       ___heap_size      = 0x4;\r
+       ___stack_size     = 0x200;\r
+       \r
 \r
 \r
 \r
@@ -39,7 +39,6 @@ SECTIONS {
    \r
   .userram       : {} > userram                \r
   .code            : {} > code         \r
-  .vectorram   : {} > vectorram                        \r
        \r
        .vectors :\r
        {\r
@@ -121,7 +120,7 @@ SECTIONS {
                . = ALIGN (0x4);\r
        } >> userram\r
        \r
-       ___VECTOR_RAM           = ADDR(.vectorram);\r
+#      ___VECTOR_RAM           = ADDR(.vectorram);\r
        \r
        __SP_INIT               = ___SP_INIT;\r
 \r

diff --git a/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOSConfig.h b/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOSConfig.h
index 876be9ae5f78104a7e1387db43fe6b10429b0d72..2cca51ac50049166b7a959e3c942990042b470c5 100644 (file)
--- a/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOSConfig.h
+++ b/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOSConfig.h
@@ -70,7 +70,7 @@
 #define configCPU_CLOCK_HZ                             ( ( unsigned portLONG ) 80000000 )\r
 #define configTICK_RATE_HZ                             ( ( portTickType ) 100 )\r
 #define configMINIMAL_STACK_SIZE               ( ( unsigned portSHORT ) 160 )\r
-#define configTOTAL_HEAP_SIZE                  ( ( size_t ) ( 0 ) ) /* The heap size is worked out from the linker script, so this constant is not used. */\r
+#define configTOTAL_HEAP_SIZE                  ( ( size_t ) ( 10 * 1024 ) ) /* The heap size is worked out from the linker script, so this constant is not used. */\r
 #define configMAX_TASK_NAME_LEN                        ( 12 )\r
 #define configUSE_TRACE_FACILITY               1\r
 #define configUSE_16_BIT_TICKS                 0\r

diff --git a/Demo/ColdFire_MCF52221_CodeWarrior/sources/exceptions.c b/Demo/ColdFire_MCF52221_CodeWarrior/sources/exceptions.c
index a6a41edf2ac4431010d2688d055a4739bb2beee9..93cedda051191db68d42bb7fa29f79ced986f42f 100644 (file)
--- a/Demo/ColdFire_MCF52221_CodeWarrior/sources/exceptions.c
+++ b/Demo/ColdFire_MCF52221_CodeWarrior/sources/exceptions.c
@@ -10,8 +10,10 @@
 \r
 #define REGISTER_ABI __REGABI__\r
 \r
-extern __declspec(system) unsigned long __VECTOR_RAM[];\r
-#define VECTOR_RAM_ADDRESS    (uint32)__VECTOR_RAM\r
+\r
+extern void vPIT0InterruptHandler( void );\r
+extern void vPortYieldISR( void );\r
+extern void vFECISRHandler( void );\r
 \r
 /***********************************************************************/\r
 /*\r
@@ -402,7 +404,7 @@ __declspec(vectortable) vectorTableEntryType _vect[256] = {   /* Interrupt vecto
    asm_exception_handler,           /*  77 (0x134) Device-specific interrupts */\r
    asm_exception_handler,           /*  78 (0x138) Device-specific interrupts */\r
    asm_exception_handler,           /*  79 (0x13C) Device-specific interrupts */\r
-   asm_exception_handler,           /*  80 (0x140) Device-specific interrupts */\r
+   vPortYieldISR,                      /*  80 (0x140) Device-specific interrupts */\r
    asm_exception_handler,           /*  81 (0x144) Device-specific interrupts */\r
    asm_exception_handler,           /*  82 (0x148) Device-specific interrupts */\r
    asm_exception_handler,           /*  83 (0x14C) Device-specific interrupts */\r
@@ -441,7 +443,7 @@ __declspec(vectortable) vectorTableEntryType _vect[256] = {   /* Interrupt vecto
    asm_exception_handler,           /* 116 (0x___) Reserved                   */\r
    asm_exception_handler,           /* 117 (0x___) Reserved                   */\r
    asm_exception_handler,           /* 118 (0x___) Reserved                   */\r
-   asm_exception_handler,           /* 119 (0x___) Reserved                   */\r
+   vPIT0InterruptHandler,           /* 119 (0x___) Reserved                   */\r
    asm_exception_handler,           /* 120 (0x___) Reserved                   */\r
    asm_exception_handler,           /* 121 (0x___) Reserved                   */\r
    asm_exception_handler,           /* 122 (0x___) Reserved                   */\r
@@ -604,6 +606,7 @@ asm void mcf5xxx_wr_vbr(unsigned long) { /* Set VBR */
  */ \r
 void initialize_exceptions(void)\r
 {\r
+#if 0\r
        /*\r
         * Memory map definitions from linker command files used by mcf5xxx_startup\r
         */\r
@@ -619,6 +622,9 @@ void initialize_exceptions(void)
                        __VECTOR_RAM[n] = (unsigned long)_vect[n];\r
        }\r
        mcf5xxx_wr_vbr((unsigned long)__VECTOR_RAM);\r
+#endif\r
+\r
+       mcf5xxx_wr_vbr((unsigned long)_vect);\r
 }\r
 \r
 #ifdef __cplusplus\r