Update version number to 9.0.0rc2.

[freertos] / FreeRTOS / Source / portable / GCC / ARM7_AT91FR40008 / port.c

diff --git a/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/port.c b/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/port.c
index ea2b7bfaefaf4cc08298bfa70e6f8d4e1734a394..7058b060d14e30114f2389c0a3852079a56dc9c2 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/port.c
+++ b/FreeRTOS/Source/portable/GCC/ARM7_AT91FR40008/port.c
@@ -1,75 +1,70 @@
 /*\r
 /*\r

-    FreeRTOS V7.4.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
-\r
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT\r
-    http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
-\r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    FreeRTOS tutorial books are available in pdf and paperback.        *\r
-     *    Complete, revised, and edited pdf reference manuals are also       *\r
-     *    available.                                                         *\r
-     *                                                                       *\r
-     *    Purchasing FreeRTOS documentation will not only help you, by       *\r
-     *    ensuring you get running as quickly as possible and with an        *\r
-     *    in-depth knowledge of how to use FreeRTOS, it will also help       *\r
-     *    the FreeRTOS project to continue with its mission of providing     *\r
-     *    professional grade, cross platform, de facto standard solutions    *\r
-     *    for microcontrollers - completely free of charge!                  *\r
-     *                                                                       *\r
-     *    >>> See http://www.FreeRTOS.org/Documentation for details. <<<     *\r
-     *                                                                       *\r
-     *    Thank you for using FreeRTOS, and thank you for your support!      *\r
-     *                                                                       *\r
-    ***************************************************************************\r
+    FreeRTOS V9.0.0rc2 - Copyright (C) 2016 Real Time Engineers Ltd.\r
+    All rights reserved\r

 \r
 \r

+    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\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
 \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
 \r

-    >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to\r
-    distribute a combined work that includes FreeRTOS without being obliged to\r
-    provide 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
 \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.  See the GNU General Public License for more\r
-    details. You should have received a copy of the GNU General Public License\r
-    and the FreeRTOS license exception along with FreeRTOS; if not itcan be\r
-    viewed here: http://www.freertos.org/a00114.html and also obtained by\r
-    writing to Real Time Engineers Ltd., contact details for whom are available\r
-    on the FreeRTOS WEB site.\r
-\r
-    1 tab == 4 spaces!\r
+    FOR A PARTICULAR PURPOSE.  Full license text is available on the following\r
+    link: http://www.freertos.org/a00114.html\r

 \r
     ***************************************************************************\r
      *                                                                       *\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
      *                                                                       *\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
      *                                                                       *\r
     ***************************************************************************\r
 \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
 \r

-    http://www.FreeRTOS.org - Documentation, books, training, latest versions, \r
-    license and Real Time Engineers Ltd. contact details.\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
 \r
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r

-    including FreeRTOS+Trace - an indispensable productivity tool, and our new\r
-    fully thread aware and reentrant UDP/IP stack.\r
-\r
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High \r
-    Integrity Systems, who sell the code with commercial support, \r
-    indemnification and middleware, under the OpenRTOS brand.\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
+    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.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

     mission critical applications that require provable dependability.\r
     mission critical applications that require provable dependability.\r

+\r
+    1 tab == 4 spaces!\r

 */\r
 \r
 \r
 */\r
 \r
 \r


@@ -96,10 +91,10 @@
 #include "tc.h"\r
 \r
 /* Constants required to setup the task context. */\r
 #include "tc.h"\r
 \r
 /* Constants required to setup the task context. */\r

-#define portINITIAL_SPSR                               ( ( portSTACK_TYPE ) 0x1f ) /* System mode, ARM mode, interrupts enabled. */\r
-#define portTHUMB_MODE_BIT                             ( ( portSTACK_TYPE ) 0x20 )\r
-#define portINSTRUCTION_SIZE                   ( ( portSTACK_TYPE ) 4 )\r
-#define portNO_CRITICAL_SECTION_NESTING        ( ( portSTACK_TYPE ) 0 )\r
+#define portINITIAL_SPSR                               ( ( StackType_t ) 0x1f ) /* System mode, ARM mode, interrupts enabled. */\r
+#define portTHUMB_MODE_BIT                             ( ( StackType_t ) 0x20 )\r
+#define portINSTRUCTION_SIZE                   ( ( StackType_t ) 4 )\r
+#define portNO_CRITICAL_SECTION_NESTING        ( ( StackType_t ) 0 )\r

 #define portTICK_PRIORITY_6                            ( 6 )\r
 /*-----------------------------------------------------------*/\r
 \r
 #define portTICK_PRIORITY_6                            ( 6 )\r
 /*-----------------------------------------------------------*/\r
 \r


@@ -120,9 +115,9 @@ extern void vPortISRStartFirstTask( void );
  *\r
  * See header file for description. \r
  */\r
  *\r
  * See header file for description. \r
  */\r

-portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters )\r
+StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t pxCode, void *pvParameters )\r

 {\r
 {\r

-portSTACK_TYPE *pxOriginalTOS;\r
+StackType_t *pxOriginalTOS;\r

 \r
        pxOriginalTOS = pxTopOfStack;\r
        \r
 \r
        pxOriginalTOS = pxTopOfStack;\r
        \r


@@ -136,46 +131,46 @@ portSTACK_TYPE *pxOriginalTOS;
        /* First on the stack is the return address - which in this case is the\r
        start of the task.  The offset is added to make the return address appear\r
        as it would within an IRQ ISR. */\r
        /* First on the stack is the return address - which in this case is the\r
        start of the task.  The offset is added to make the return address appear\r
        as it would within an IRQ ISR. */\r

-       *pxTopOfStack = ( portSTACK_TYPE ) pxCode + portINSTRUCTION_SIZE;               \r
+       *pxTopOfStack = ( StackType_t ) pxCode + portINSTRUCTION_SIZE;          \r

        pxTopOfStack--;\r
 \r
        pxTopOfStack--;\r
 \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0xaaaaaaaa;  /* R14 */\r
+       *pxTopOfStack = ( StackType_t ) 0xaaaaaaaa;     /* R14 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) pxOriginalTOS; /* Stack used when task starts goes in R13. */\r
+       *pxTopOfStack = ( StackType_t ) pxOriginalTOS; /* Stack used when task starts goes in R13. */\r

        pxTopOfStack--;\r
        pxTopOfStack--;\r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x12121212;  /* R12 */\r
+       *pxTopOfStack = ( StackType_t ) 0x12121212;     /* R12 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x11111111;  /* R11 */\r
+       *pxTopOfStack = ( StackType_t ) 0x11111111;     /* R11 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x10101010;  /* R10 */\r
+       *pxTopOfStack = ( StackType_t ) 0x10101010;     /* R10 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x09090909;  /* R9 */\r
+       *pxTopOfStack = ( StackType_t ) 0x09090909;     /* R9 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x08080808;  /* R8 */\r
+       *pxTopOfStack = ( StackType_t ) 0x08080808;     /* R8 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x07070707;  /* R7 */\r
+       *pxTopOfStack = ( StackType_t ) 0x07070707;     /* R7 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x06060606;  /* R6 */\r
+       *pxTopOfStack = ( StackType_t ) 0x06060606;     /* R6 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x05050505;  /* R5 */\r
+       *pxTopOfStack = ( StackType_t ) 0x05050505;     /* R5 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x04040404;  /* R4 */\r
+       *pxTopOfStack = ( StackType_t ) 0x04040404;     /* R4 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x03030303;  /* R3 */\r
+       *pxTopOfStack = ( StackType_t ) 0x03030303;     /* R3 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x02020202;  /* R2 */\r
+       *pxTopOfStack = ( StackType_t ) 0x02020202;     /* R2 */\r

        pxTopOfStack--; \r
        pxTopOfStack--; \r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x01010101;  /* R1 */\r
+       *pxTopOfStack = ( StackType_t ) 0x01010101;     /* R1 */\r

        pxTopOfStack--; \r
 \r
        /* When the task starts is will expect to find the function parameter in\r
        R0. */\r
        pxTopOfStack--; \r
 \r
        /* When the task starts is will expect to find the function parameter in\r
        R0. */\r

-       *pxTopOfStack = ( portSTACK_TYPE ) pvParameters; /* R0 */\r
+       *pxTopOfStack = ( StackType_t ) pvParameters; /* R0 */\r

        pxTopOfStack--;\r
 \r
        /* The last thing onto the stack is the status register, which is set for\r
        system mode, with interrupts enabled. */\r
        pxTopOfStack--;\r
 \r
        /* The last thing onto the stack is the status register, which is set for\r
        system mode, with interrupts enabled. */\r

-       *pxTopOfStack = ( portSTACK_TYPE ) portINITIAL_SPSR;\r
+       *pxTopOfStack = ( StackType_t ) portINITIAL_SPSR;\r

 \r
        #ifdef THUMB_INTERWORK\r
        {\r
 \r
        #ifdef THUMB_INTERWORK\r
        {\r


@@ -196,7 +191,7 @@ portSTACK_TYPE *pxOriginalTOS;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r

 {\r
        /* Start the timer that generates the tick ISR.  Interrupts are disabled\r
        here already. */\r
 {\r
        /* Start the timer that generates the tick ISR.  Interrupts are disabled\r
        here already. */\r


@@ -222,7 +217,7 @@ void vPortEndScheduler( void )
  */\r
 static void prvSetupTimerInterrupt( void )\r
 {\r
  */\r
 static void prvSetupTimerInterrupt( void )\r
 {\r

-volatile unsigned long ulDummy;\r
+volatile uint32_t ulDummy;\r

 \r
        /* Enable clock to the tick timer... */\r
        AT91C_BASE_PS->PS_PCER = portTIMER_CLK_ENABLE_BIT;\r
 \r
        /* Enable clock to the tick timer... */\r
        AT91C_BASE_PS->PS_PCER = portTIMER_CLK_ENABLE_BIT;\r


@@ -242,12 +237,12 @@ volatile unsigned long ulDummy;
        #if configUSE_PREEMPTION == 1\r
        {\r
                extern void ( vPreemptiveTick )( void );\r
        #if configUSE_PREEMPTION == 1\r
        {\r
                extern void ( vPreemptiveTick )( void );\r

-               AT91C_BASE_AIC->AIC_SVR[portTIMER_AIC_CHANNEL] = ( unsigned long ) vPreemptiveTick;\r
+               AT91C_BASE_AIC->AIC_SVR[portTIMER_AIC_CHANNEL] = ( uint32_t ) vPreemptiveTick;\r

        }\r
        #else  // else use cooperative scheduler\r
        {\r
                extern void ( vNonPreemptiveTick )( void );\r
        }\r
        #else  // else use cooperative scheduler\r
        {\r
                extern void ( vNonPreemptiveTick )( void );\r

-               AT91C_BASE_AIC->AIC_SVR[portTIMER_AIC_CHANNEL] = ( unsigned long ) vNonPreemptiveTick;\r
+               AT91C_BASE_AIC->AIC_SVR[portTIMER_AIC_CHANNEL] = ( uint32_t ) vNonPreemptiveTick;\r

        }\r
        #endif\r
 \r
        }\r
        #endif\r
 \r