Minor changes only.

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

diff --git a/Source/portable/GCC/ColdFire_V2/portasm.S b/Source/portable/GCC/ColdFire_V2/portasm.S
index 7229c52cb91e7e79ddf6c9e6bf05f0b8e57587ec..b19ab8b85f85cf96abaff1a2d5f6a931ecb57684 100644 (file)
--- a/Source/portable/GCC/ColdFire_V2/portasm.S
+++ b/Source/portable/GCC/ColdFire_V2/portasm.S
@@ -1,11 +1,59 @@
+/*\r
+       FreeRTOS.org V5.0.3 - Copyright (C) 2003-2008 Richard Barry.\r
+\r
+       This file is part of the FreeRTOS.org distribution.\r
+\r
+       FreeRTOS.org is free software; you can redistribute it and/or modify\r
+       it under the terms of the GNU General Public License as published by\r
+       the Free Software Foundation; either version 2 of the License, or\r
+       (at your option) any later version.\r
+\r
+       FreeRTOS.org is distributed in the hope that it will be useful,\r
+       but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+       GNU General Public License for more details.\r
+\r
+       You should have received a copy of the GNU General Public License\r
+       along with FreeRTOS.org; if not, write to the Free Software\r
+       Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+\r
+       A special exception to the GPL can be applied should you wish to distribute\r
+       a combined work that includes FreeRTOS.org, without being obliged to provide\r
+       the source code for any proprietary components.  See the licensing section\r
+       of http://www.FreeRTOS.org for full details of how and when the exception\r
+       can be applied.\r
+\r
+    ***************************************************************************\r
+    ***************************************************************************\r
+    *                                                                         *\r
+    * SAVE TIME AND MONEY!  We can port FreeRTOS.org to your own hardware,    *\r
+    * and even write all or part of your application on your behalf.          *\r
+    * See http://www.OpenRTOS.com for details of the services we provide to   *\r
+    * expedite your project.                                                  *\r
+    *                                                                         *\r
+    ***************************************************************************\r
+    ***************************************************************************\r
+\r
+       Please ensure to read the configuration and relevant port sections of the\r
+       online documentation.\r
+\r
+       http://www.FreeRTOS.org - Documentation, latest information, license and\r
+       contact details.\r
+\r
+       http://www.SafeRTOS.com - A version that is certified for use in safety\r
+       critical systems.\r
+\r
+       http://www.OpenRTOS.com - Commercial support, development, porting,\r
+       licensing and training services.\r
+*/\r
 \r
 /*\r
- * File:    mcf5xxx.s\r
  * Purpose: Lowest level routines for all ColdFire processors.\r
  *\r
  * Notes:\r
- *\r
- * Function copied from mcf5xxx.S provided by FreeScale.\r
+ * \r
+ * ulPortSetIPL() and mcf5xxx_wr_cacr() copied with permission from FreeScale\r
+ * supplied source files.\r
  */\r
 \r
     .global ulPortSetIPL\r
@@ -25,6 +73,7 @@
        .endm\r
 \r
 .macro portRESTORE_CONTEXT\r
+\r
        move.l          pxCurrentTCB, %a0\r
        move.l          (%a0), %sp\r
        movem.l         (%sp), %d0-%fp\r
@@ -55,7 +104,7 @@ ulPortSetIPL:
     lsr.l   #8,D0       /* IPL   */\r
 \r
     move.l  8(A6),D6    /* get argument  */\r
-    andi.l  #0x07,D6        /* least significant three bits  */\r
+    andi.l  #0x07,D6    /* least significant three bits  */\r
     lsl.l   #8,D6       /* move over to make mask    */\r
 \r
     andi.l  #0x0000F8FF,D7  /* zero out current IPL  */\r
@@ -70,7 +119,7 @@ ulPortSetIPL:
 \r
 mcf5xxx_wr_cacr:\r
     move.l  4(sp),d0\r
-    .long   0x4e7b0002      /* movec d0,cacr   */\r
+    .long   0x4e7b0002  /* movec d0,cacr   */\r
     nop\r
     rts\r
 \r

diff --git a/Source/portable/GCC/ColdFire_V2/portmacro.h b/Source/portable/GCC/ColdFire_V2/portmacro.h
index 3b0024239ebd871a976394cc98151b9f6256247d..73445ae452b39963af727b05c3497b06977fd82c 100644 (file)
--- a/Source/portable/GCC/ColdFire_V2/portmacro.h
+++ b/Source/portable/GCC/ColdFire_V2/portmacro.h
@@ -106,12 +106,11 @@ extern void vPortClearInterruptMaskFromISR( unsigned portBASE_TYPE );
 \r
 /* Task utilities. */\r
 \r
-#define portYIELD()                    MCF_INTC0_INTFRCH |= ( 1UL << ( configYIELD_INTERRUPT_VECTOR - 32UL ) ); portNOP(); portNOP(); portNOP() /* -32 as we are using the high word of the 64bit mask. */\r
-\r
-\r
-\r
 #define portNOP()      asm volatile (  "nop" )\r
 \r
+/* Note this will overwrite all other bits in the force register, it is done this way for speed. */\r
+#define portYIELD()                    MCF_INTC0_INTFRCH = ( 1UL << ( configYIELD_INTERRUPT_VECTOR - 32UL ) ); portNOP(); portNOP() /* -32 as we are using the high word of the 64bit mask. */\r
+\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Task function macros as described on the FreeRTOS.org WEB site. */\r