Update version number ready for V8.2.1 release.

[freertos] / FreeRTOS / Source / portable / Renesas / RX600 / port.c

diff --git a/FreeRTOS/Source/portable/Renesas/RX600/port.c b/FreeRTOS/Source/portable/Renesas/RX600/port.c
index 4c9e14ecfd96f383ac84b493a69f7bfa3f1c217d..8e5625067b34f25587c5317362d828fe430f19a5 100644 (file)
--- a/FreeRTOS/Source/portable/Renesas/RX600/port.c
+++ b/FreeRTOS/Source/portable/Renesas/RX600/port.c
@@ -1,71 +1,74 @@
 /*\r
 /*\r

-    FreeRTOS V7.1.1 - Copyright (C) 2012 Real Time Engineers Ltd.\r
-       \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 V8.2.1 - Copyright (C) 2015 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
-    >>>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.  FreeRTOS is distributed in the hope that it will be useful, but\r
-    WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
-    or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for\r
-    more details. You should have received a copy of the GNU General Public\r
-    License and the FreeRTOS license exception along with FreeRTOS; if not it\r
-    can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
-    by writing to Richard Barry, contact details for whom are available on the\r
-    FreeRTOS WEB site.\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   !<<\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 on the following\r
+    link: http://www.freertos.org/a00114.html\r

 \r
 \r

-    1 tab == 4 spaces!\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

-    \r
-    http://www.FreeRTOS.org - Documentation, training, latest information, \r
-    license and contact details.\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
+    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
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r

-    including FreeRTOS+Trace - an indispensable productivity tool.\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

 \r
 \r

-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell \r
-    the code with commercial support, indemnification, and middleware, under \r
-    the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also\r
-    provide a safety engineered and independently SIL3 certified version under \r
-    the SafeRTOS brand: http://www.SafeRTOS.com.\r
+    1 tab == 4 spaces!\r

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

- * Implementation of functions defined in portable.h for the SH2A port.\r
+ * Implementation of functions defined in portable.h for the RX600 port.\r

  *----------------------------------------------------------*/\r
 \r
 /* Scheduler includes. */\r
  *----------------------------------------------------------*/\r
 \r
 /* Scheduler includes. */\r


@@ -80,24 +83,24 @@
 \r
 /*-----------------------------------------------------------*/\r
 \r
 \r
 /*-----------------------------------------------------------*/\r
 \r

-/* Tasks should start with interrupts enabled and in Supervisor mode, therefore \r
+/* Tasks should start with interrupts enabled and in Supervisor mode, therefore\r

 PSW is set with U and I set, and PM and IPL clear. */\r
 PSW is set with U and I set, and PM and IPL clear. */\r

-#define portINITIAL_PSW     ( ( portSTACK_TYPE ) 0x00030000 )\r
-#define portINITIAL_FPSW    ( ( portSTACK_TYPE ) 0x00000100 )\r
+#define portINITIAL_PSW     ( ( StackType_t ) 0x00030000 )\r
+#define portINITIAL_FPSW    ( ( StackType_t ) 0x00000100 )\r

 \r
 /*-----------------------------------------------------------*/\r
 \r
 /* The following lines are to ensure vSoftwareInterruptEntry can be referenced,\r
  and therefore installed in the vector table, when the FreeRTOS code is built\r
 as a library. */\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /* The following lines are to ensure vSoftwareInterruptEntry can be referenced,\r
  and therefore installed in the vector table, when the FreeRTOS code is built\r
 as a library. */\r

-extern portBASE_TYPE vSoftwareInterruptEntry;\r
-const portBASE_TYPE * p_vSoftwareInterruptEntry = &vSoftwareInterruptEntry;\r
+extern BaseType_t vSoftwareInterruptEntry;\r
+const BaseType_t * p_vSoftwareInterruptEntry = &vSoftwareInterruptEntry;\r

 \r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
  * Function to start the first task executing - written in asm code as direct\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
  * Function to start the first task executing - written in asm code as direct\r

- * access to registers is required. \r
+ * access to registers is required.\r

  */\r
 static void prvStartFirstTask( void );\r
 \r
  */\r
 static void prvStartFirstTask( void );\r
 \r


@@ -110,7 +113,7 @@ static void prvYieldHandler( void );
 \r
 /*\r
  * The entry point for the software interrupt handler.  This is the function\r
 \r
 /*\r
  * The entry point for the software interrupt handler.  This is the function\r

- * that calls the inline asm function prvYieldHandler().  It is installed in \r
+ * that calls the inline asm function prvYieldHandler().  It is installed in\r

  * the vector table, but the code that installs it is in prvYieldHandler rather\r
  * than using a #pragma.\r
  */\r
  * the vector table, but the code that installs it is in prvYieldHandler rather\r
  * than using a #pragma.\r
  */\r


@@ -125,19 +128,19 @@ extern void vTaskSwitchContext( void );
 \r
 /*-----------------------------------------------------------*/\r
 \r
 \r
 /*-----------------------------------------------------------*/\r
 \r

-/* \r
- * See header file for description. \r
+/*\r
+ * See header file for description.\r

  */\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
        /* R0 is not included as it is the stack pointer. */\r
 {\r
        /* R0 is not included as it is the stack pointer. */\r

-       \r
+\r

        *pxTopOfStack = 0x00;\r
        pxTopOfStack--;\r
        *pxTopOfStack = portINITIAL_PSW;\r
        pxTopOfStack--;\r
        *pxTopOfStack = 0x00;\r
        pxTopOfStack--;\r
        *pxTopOfStack = portINITIAL_PSW;\r
        pxTopOfStack--;\r

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

        /* When debugging it can be useful if every register is set to a known\r
        value.  Otherwise code space can be saved by just setting the registers\r
        that need to be set. */\r
        /* When debugging it can be useful if every register is set to a known\r
        value.  Otherwise code space can be saved by just setting the registers\r
        that need to be set. */\r


@@ -178,9 +181,9 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
                pxTopOfStack -= 15;\r
        }\r
        #endif\r
                pxTopOfStack -= 15;\r
        }\r
        #endif\r

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

        *pxTopOfStack = portINITIAL_FPSW;\r
        pxTopOfStack--;\r
        *pxTopOfStack = 0x12345678; /* Accumulator. */\r
        *pxTopOfStack = portINITIAL_FPSW;\r
        pxTopOfStack--;\r
        *pxTopOfStack = 0x12345678; /* Accumulator. */\r


@@ -191,7 +194,7 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

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

 {\r
 extern void vApplicationSetupTimerInterrupt( void );\r
 \r
 {\r
 extern void vApplicationSetupTimerInterrupt( void );\r
 \r


@@ -199,19 +202,19 @@ extern void vApplicationSetupTimerInterrupt( void );
        if( pxCurrentTCB != NULL )\r
        {\r
                /* Call an application function to set up the timer that will generate the\r
        if( pxCurrentTCB != NULL )\r
        {\r
                /* Call an application function to set up the timer that will generate the\r

-               tick interrupt.  This way the application can decide which peripheral to \r
+               tick interrupt.  This way the application can decide which peripheral to\r

                use.  A demo application is provided to show a suitable example. */\r
                vApplicationSetupTimerInterrupt();\r
 \r
                use.  A demo application is provided to show a suitable example. */\r
                vApplicationSetupTimerInterrupt();\r
 \r

-               /* Enable the software interrupt. */            \r
+               /* Enable the software interrupt. */\r

                _IEN( _ICU_SWINT ) = 1;\r
                _IEN( _ICU_SWINT ) = 1;\r

-               \r
+\r

                /* Ensure the software interrupt is clear. */\r
                _IR( _ICU_SWINT ) = 0;\r
                /* Ensure the software interrupt is clear. */\r
                _IR( _ICU_SWINT ) = 0;\r

-               \r
+\r

                /* Ensure the software interrupt is set to the kernel priority. */\r
                _IPR( _ICU_SWINT ) = configKERNEL_INTERRUPT_PRIORITY;\r
                /* Ensure the software interrupt is set to the kernel priority. */\r
                _IPR( _ICU_SWINT ) = configKERNEL_INTERRUPT_PRIORITY;\r

-       \r
+\r

                /* Start the first task. */\r
                prvStartFirstTask();\r
        }\r
                /* Start the first task. */\r
                prvStartFirstTask();\r
        }\r


@@ -232,13 +235,13 @@ static void prvStartFirstTask( void )
        Just ensure the current stack is the user stack. */\r
        SETPSW  U\r
 \r
        Just ensure the current stack is the user stack. */\r
        SETPSW  U\r
 \r

-       /* Obtain the location of the stack associated with which ever task \r
+       /* Obtain the location of the stack associated with which ever task\r

        pxCurrentTCB is currently pointing to. */\r
        MOV.L   #_pxCurrentTCB, R15\r
        MOV.L   [R15], R15\r
        MOV.L   [R15], R0\r
 \r
        pxCurrentTCB is currently pointing to. */\r
        MOV.L   #_pxCurrentTCB, R15\r
        MOV.L   [R15], R15\r
        MOV.L   [R15], R0\r
 \r

-       /* Restore the registers from the stack of the task pointed to by \r
+       /* Restore the registers from the stack of the task pointed to by\r

        pxCurrentTCB. */\r
     POP                R15\r
     MVTACLO    R15             /* Accumulator low 32 bits. */\r
        pxCurrentTCB. */\r
     POP                R15\r
     MVTACLO    R15             /* Accumulator low 32 bits. */\r


@@ -260,14 +263,12 @@ void vTickISR( void )
        necessitates. */\r
        set_ipl( configMAX_SYSCALL_INTERRUPT_PRIORITY );\r
        {\r
        necessitates. */\r
        set_ipl( configMAX_SYSCALL_INTERRUPT_PRIORITY );\r
        {\r

-               vTaskIncrementTick();\r
+               if( xTaskIncrementTick() != pdFALSE )\r
+               {\r
+                       taskYIELD();\r
+               }\r

        }\r
        set_ipl( configKERNEL_INTERRUPT_PRIORITY );\r
        }\r
        set_ipl( configKERNEL_INTERRUPT_PRIORITY );\r

-       \r
-       /* Only select a new task if the preemptive scheduler is being used. */\r
-       #if( configUSE_PREEMPTION == 1 )\r
-               taskYIELD();\r
-       #endif\r

 }\r
 /*-----------------------------------------------------------*/\r
 \r
 }\r
 /*-----------------------------------------------------------*/\r
 \r


@@ -284,18 +285,18 @@ static void prvYieldHandler( void )
        SETPSW  I\r
 \r
        /* Move the data that was automatically pushed onto the interrupt stack when\r
        SETPSW  I\r
 \r
        /* Move the data that was automatically pushed onto the interrupt stack when\r

-       the interrupt occurred from the interrupt stack to the user stack.  \r
-       \r
+       the interrupt occurred from the interrupt stack to the user stack.\r
+\r

        R15 is saved before it is clobbered. */\r
        PUSH.L  R15\r
        R15 is saved before it is clobbered. */\r
        PUSH.L  R15\r

-       \r
+\r

        /* Read the user stack pointer. */\r
        MVFC    USP, R15\r
        /* Read the user stack pointer. */\r
        MVFC    USP, R15\r

-       \r
+\r

        /* Move the address down to the data being moved. */\r
        SUB             #12, R15\r
        MVTC    R15, USP\r
        /* Move the address down to the data being moved. */\r
        SUB             #12, R15\r
        MVTC    R15, USP\r

-       \r
+\r

        /* Copy the data across. */\r
        MOV.L   [ R0 ], [ R15 ] ; R15\r
        MOV.L   4[ R0 ], 4[ R15 ]  ; PC\r
        /* Copy the data across. */\r
        MOV.L   [ R0 ], [ R15 ] ; R15\r
        MOV.L   4[ R0 ], 4[ R15 ]  ; PC\r


@@ -303,13 +304,13 @@ static void prvYieldHandler( void )
 \r
        /* Move the interrupt stack pointer to its new correct position. */\r
        ADD     #12, R0\r
 \r
        /* Move the interrupt stack pointer to its new correct position. */\r
        ADD     #12, R0\r

-       \r
+\r

        /* All the rest of the registers are saved directly to the user stack. */\r
        SETPSW  U\r
 \r
        /* Save the rest of the general registers (R15 has been saved already). */\r
        PUSHM   R1-R14\r
        /* All the rest of the registers are saved directly to the user stack. */\r
        SETPSW  U\r
 \r
        /* Save the rest of the general registers (R15 has been saved already). */\r
        PUSHM   R1-R14\r

-       \r
+\r

        /* Save the FPSW and accumulator. */\r
        MVFC    FPSW, R15\r
        PUSH.L  R15\r
        /* Save the FPSW and accumulator. */\r
        MVFC    FPSW, R15\r
        PUSH.L  R15\r


@@ -323,7 +324,7 @@ static void prvYieldHandler( void )
        MOV.L   #_pxCurrentTCB, R15\r
        MOV.L   [ R15 ], R15\r
        MOV.L   R0, [ R15 ]\r
        MOV.L   #_pxCurrentTCB, R15\r
        MOV.L   [ R15 ], R15\r
        MOV.L   R0, [ R15 ]\r

-                       \r
+\r

        /* Ensure the interrupt mask is set to the syscall priority while the kernel\r
        structures are being accessed. */\r
        MVTIPL  #configMAX_SYSCALL_INTERRUPT_PRIORITY\r
        /* Ensure the interrupt mask is set to the syscall priority while the kernel\r
        structures are being accessed. */\r
        MVTIPL  #configMAX_SYSCALL_INTERRUPT_PRIORITY\r


@@ -357,8 +358,10 @@ static void prvYieldHandler( void )
 \r
 void vPortEndScheduler( void )\r
 {\r
 \r
 void vPortEndScheduler( void )\r
 {\r

-       /* Not implemented as there is nothing to return to. */\r
-       \r
+       /* Not implemented in ports where there is nothing to return to.\r
+       Artificially force an assert. */\r
+       configASSERT( pxCurrentTCB == NULL );\r
+\r

        /* The following line is just to prevent the symbol getting optimised away. */\r
        ( void ) vTaskSwitchContext();\r
 }\r
        /* The following line is just to prevent the symbol getting optimised away. */\r
        ( void ) vTaskSwitchContext();\r
 }\r