]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Source/portable/GCC/ARM7_AT91SAM7S/portmacro.h
Update version number to 9.0.0rc2.
[freertos] / FreeRTOS / Source / portable / GCC / ARM7_AT91SAM7S / portmacro.h
index b93c1c1039ef79804b1bebacc36ebf87b0596e34..f063dd534c6844b337f147da8e56cc2212ffb58d 100644 (file)
@@ -1,60 +1,64 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
 \r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    FreeRTOS provides completely free yet professionally developed,    *\r
-     *    robust, strictly quality controlled, supported, and cross          *\r
-     *    platform software that has become a de facto standard.             *\r
-     *                                                                       *\r
-     *    Help yourself get started quickly and support the FreeRTOS         *\r
-     *    project by purchasing a FreeRTOS tutorial book, reference          *\r
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *\r
-     *                                                                       *\r
-     *    Thank you!                                                         *\r
-     *                                                                       *\r
-    ***************************************************************************\r
-\r
     This file is part of the FreeRTOS distribution.\r
 \r
     FreeRTOS is free software; you can redistribute it and/or modify it under\r
     the terms of the GNU General Public License (version 2) as published by the\r
-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
+    Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r
 \r
-    >>! NOTE: The modification to the GPL is included to allow you to distribute\r
-    >>! a combined work that includes FreeRTOS without being obliged to provide\r
-    >>! the source code for proprietary components outside of the FreeRTOS\r
-    >>! kernel.\r
+    ***************************************************************************\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
+    ***************************************************************************\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following\r
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following\r
     link: http://www.freertos.org/a00114.html\r
 \r
-    1 tab == 4 spaces!\r
-\r
     ***************************************************************************\r
      *                                                                       *\r
-     *    Having a problem?  Start by reading the FAQ "My application does   *\r
-     *    not run, what could be wrong?"                                     *\r
+     *    FreeRTOS provides completely free yet professionally developed,    *\r
+     *    robust, strictly quality controlled, supported, and cross          *\r
+     *    platform software that is more than just the market leader, it     *\r
+     *    is the industry's de facto standard.                               *\r
      *                                                                       *\r
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *\r
+     *    Help yourself get started quickly while simultaneously helping     *\r
+     *    to support the FreeRTOS project by purchasing a FreeRTOS           *\r
+     *    tutorial book, reference manual, or both:                          *\r
+     *    http://www.FreeRTOS.org/Documentation                              *\r
      *                                                                       *\r
     ***************************************************************************\r
 \r
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,\r
-    license and Real Time Engineers Ltd. contact details.\r
+    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading\r
+    the FAQ page "My application does not run, what could be wrong?".  Have you\r
+    defined configASSERT()?\r
+\r
+    http://www.FreeRTOS.org/support - In return for receiving this top quality\r
+    embedded software for free we request you assist our global community by\r
+    participating in the support forum.\r
+\r
+    http://www.FreeRTOS.org/training - Investing in training allows your team to\r
+    be as productive as possible as early as possible.  Now you can receive\r
+    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
+    Ltd, and the world's leading authority on the world's leading RTOS.\r
 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
     including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
     compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
 \r
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High\r
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
-    licenses offer ticketed support, indemnification and middleware.\r
+    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.\r
+    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.\r
+\r
+    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High\r
+    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
+    licenses offer ticketed support, indemnification and commercial middleware.\r
 \r
     http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
     engineered and independently SIL3 certified version for use in safety and\r
@@ -127,9 +131,9 @@ typedef unsigned long UBaseType_t;
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                       ( -1 )\r
-#define portTICK_RATE_MS                       ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                     8\r
-#define portNOP()                                      asm volatile ( "NOP" );\r
+#define portNOP()                                      __asm volatile ( "NOP" );\r
 /*-----------------------------------------------------------*/\r
 \r
 \r
@@ -148,7 +152,7 @@ extern volatile void * volatile pxCurrentTCB;                                                       \
 extern volatile uint32_t ulCriticalNesting;                                    \\r
                                                                                                                                                \\r
        /* Set the LR to the task stack. */                                                                     \\r
-       asm volatile (                                                                                                          \\r
+       __asm volatile (                                                                                                        \\r
        "LDR            R0, =pxCurrentTCB                                                               \n\t"   \\r
        "LDR            R0, [R0]                                                                                \n\t"   \\r
        "LDR            LR, [R0]                                                                                \n\t"   \\r
@@ -185,7 +189,7 @@ extern volatile void * volatile pxCurrentTCB;                                                       \
 extern volatile uint32_t ulCriticalNesting;                                    \\r
                                                                                                                                                \\r
        /* Push R0 as we are going to use the register. */                                      \\r
-       asm volatile (                                                                                                          \\r
+       __asm volatile (                                                                                                        \\r
        "STMDB  SP!, {R0}                                                                                       \n\t"   \\r
                                                                                                                                                \\r
        /* Set R0 to point to the task stack pointer. */                                        \\r
@@ -227,7 +231,7 @@ extern volatile uint32_t ulCriticalNesting;                                 \
 \r
 \r
 #define portYIELD_FROM_ISR()           vTaskSwitchContext()\r
-#define portYIELD()                                    asm volatile ( "SWI 0" )\r
+#define portYIELD()                                    __asm volatile ( "SWI 0" )\r
 /*-----------------------------------------------------------*/\r
 \r
 \r
@@ -251,7 +255,7 @@ extern volatile uint32_t ulCriticalNesting;                                 \
 #else\r
 \r
        #define portDISABLE_INTERRUPTS()                                                                                        \\r
-               asm volatile (                                                                                                                  \\r
+               __asm volatile (                                                                                                                \\r
                        "STMDB  SP!, {R0}               \n\t"   /* Push R0.                                             */      \\r
                        "MRS    R0, CPSR                \n\t"   /* Get CPSR.                                    */      \\r
                        "ORR    R0, R0, #0xC0   \n\t"   /* Disable IRQ, FIQ.                    */      \\r
@@ -259,7 +263,7 @@ extern volatile uint32_t ulCriticalNesting;                                 \
                        "LDMIA  SP!, {R0}                       " )     /* Pop R0.                                              */\r
 \r
        #define portENABLE_INTERRUPTS()                                                                                         \\r
-               asm volatile (                                                                                                                  \\r
+               __asm volatile (                                                                                                                \\r
                        "STMDB  SP!, {R0}               \n\t"   /* Push R0.                                             */      \\r
                        "MRS    R0, CPSR                \n\t"   /* Get CPSR.                                    */      \\r
                        "BIC    R0, R0, #0xC0   \n\t"   /* Enable IRQ, FIQ.                             */      \\r