Update version number in preparation for official V8.2.0 release.

[freertos] / FreeRTOS / Source / portable / Paradigm / Tern_EE / large_untested / port.c

diff --git a/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/port.c b/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/port.c
index caf5ab44ea2c51c60b0459ddb90fde1429ed0958..f6a7e5de3c52dfa59bd55b9b90ea986b166dfa94 100644 (file)
--- a/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/port.c
+++ b/FreeRTOS/Source/portable/Paradigm/Tern_EE/large_untested/port.c
@@ -1,75 +1,70 @@
 /*\r
 /*\r

-    FreeRTOS V7.4.2 - 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 V8.2.0 - 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
+    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 it can 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
+       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
 \r

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


@@ -88,10 +83,10 @@
 #include "portasm.h"\r
 \r
 /* The timer increments every four clocks, hence the divide by 4. */\r
 #include "portasm.h"\r
 \r
 /* The timer increments every four clocks, hence the divide by 4. */\r

-#define portTIMER_COMPARE ( unsigned short ) ( ( configCPU_CLOCK_HZ / configTICK_RATE_HZ ) / ( unsigned long ) 4 )\r
+#define portTIMER_COMPARE ( uint16_t ) ( ( configCPU_CLOCK_HZ / configTICK_RATE_HZ ) / ( uint32_t ) 4 )\r

 \r
 /* From the RDC data sheet. */\r
 \r
 /* From the RDC data sheet. */\r

-#define portENABLE_TIMER_AND_INTERRUPT ( unsigned short ) 0xe001\r
+#define portENABLE_TIMER_AND_INTERRUPT ( uint16_t ) 0xe001\r

 \r
 /* Interrupt control. */\r
 #define portEIO_REGISTER 0xff22\r
 \r
 /* Interrupt control. */\r
 #define portEIO_REGISTER 0xff22\r


@@ -122,9 +117,9 @@ static void __interrupt __far prvDummyISR( void );
 \r
 /*-----------------------------------------------------------*/\r
 /* See header file for description. */\r
 \r
 /*-----------------------------------------------------------*/\r
 /* See header file for description. */\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 DS_Reg = 0;\r
+StackType_t DS_Reg = 0;\r

 \r
        /* Place a few bytes of known values on the bottom of the stack.\r
        This is just useful for debugging. */\r
 \r
        /* Place a few bytes of known values on the bottom of the stack.\r
        This is just useful for debugging. */\r


@@ -160,15 +155,15 @@ portSTACK_TYPE DS_Reg = 0;
        /* The remaining registers would be pushed on the stack by our context\r
        switch function.  These are loaded with values simply to make debugging\r
        easier. */\r
        /* The remaining registers would be pushed on the stack by our context\r
        switch function.  These are loaded with values simply to make debugging\r
        easier. */\r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0xAAAA;      /* AX */\r
+       *pxTopOfStack = ( StackType_t ) 0xAAAA; /* AX */\r

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

-       *pxTopOfStack = ( portSTACK_TYPE ) 0xBBBB;      /* BX */\r
+       *pxTopOfStack = ( StackType_t ) 0xBBBB; /* BX */\r

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

-       *pxTopOfStack = ( portSTACK_TYPE ) 0xCCCC;      /* CX */\r
+       *pxTopOfStack = ( StackType_t ) 0xCCCC; /* CX */\r

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

-       *pxTopOfStack = ( portSTACK_TYPE ) 0xDDDD;      /* DX */\r
+       *pxTopOfStack = ( StackType_t ) 0xDDDD; /* DX */\r

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

-       *pxTopOfStack = ( portSTACK_TYPE ) 0xEEEE;      /* ES */\r
+       *pxTopOfStack = ( StackType_t ) 0xEEEE; /* ES */\r

        pxTopOfStack--;\r
 \r
        /* We need the true data segment. */\r
        pxTopOfStack--;\r
 \r
        /* We need the true data segment. */\r


@@ -176,17 +171,17 @@ portSTACK_TYPE DS_Reg = 0;
 \r
        *pxTopOfStack = DS_Reg;                                         /* DS */\r
        pxTopOfStack--;\r
 \r
        *pxTopOfStack = DS_Reg;                                         /* DS */\r
        pxTopOfStack--;\r

-       *pxTopOfStack = ( portSTACK_TYPE ) 0x0123;      /* SI */\r
+       *pxTopOfStack = ( StackType_t ) 0x0123; /* SI */\r

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

-       *pxTopOfStack = ( portSTACK_TYPE ) 0xDDDD;      /* DI */\r
+       *pxTopOfStack = ( StackType_t ) 0xDDDD; /* DI */\r

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

-       *pxTopOfStack = ( portSTACK_TYPE ) 0xBBBB;      /* BP */\r
+       *pxTopOfStack = ( StackType_t ) 0xBBBB; /* BP */\r

 \r
        return pxTopOfStack;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
 \r
        return pxTopOfStack;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

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

 {\r
        /* This is called with interrupts already disabled. */\r
 \r
 {\r
        /* This is called with interrupts already disabled. */\r
 \r


@@ -220,10 +215,11 @@ is being used. */
        static void __interrupt __far prvPreemptiveTick( void )\r
        {\r
                /* Get the scheduler to update the task states following the tick. */\r
        static void __interrupt __far prvPreemptiveTick( void )\r
        {\r
                /* Get the scheduler to update the task states following the tick. */\r

-               vTaskIncrementTick();\r
-\r
-               /* Switch in the context of the next task to be run. */\r
-               portSWITCH_CONTEXT();\r
+               if( xTaskIncrementTick() != pdFALSE )\r
+               {\r
+                       /* Switch in the context of the next task to be run. */\r
+                       portSWITCH_CONTEXT();\r
+               }\r

 \r
                /* Reset interrupt. */\r
                outport( portEIO_REGISTER, portCLEAR_INTERRUPT );\r
 \r
                /* Reset interrupt. */\r
                outport( portEIO_REGISTER, portCLEAR_INTERRUPT );\r


@@ -233,7 +229,8 @@ is being used. */
        {\r
                /* Same as preemptive tick, but the cooperative scheduler is being used\r
                so we don't have to switch in the context of the next task. */\r
        {\r
                /* Same as preemptive tick, but the cooperative scheduler is being used\r
                so we don't have to switch in the context of the next task. */\r

-               vTaskIncrementTick();\r
+               xTaskIncrementTick();\r
+               \r

                /* Reset interrupt. */\r
                outport( portEIO_REGISTER, portCLEAR_INTERRUPT );\r
        }\r
                /* Reset interrupt. */\r
                outport( portEIO_REGISTER, portCLEAR_INTERRUPT );\r
        }\r


@@ -255,8 +252,8 @@ void vPortEndScheduler( void )
 \r
 static void prvSetupTimerInterrupt( void )\r
 {\r
 \r
 static void prvSetupTimerInterrupt( void )\r
 {\r

-const unsigned short usTimerACompare = portTIMER_COMPARE, usTimerAMode = portENABLE_TIMER_AND_INTERRUPT;\r
-const unsigned short usT2_IRQ = 0x13;\r
+const uint16_t usTimerACompare = portTIMER_COMPARE, usTimerAMode = portENABLE_TIMER_AND_INTERRUPT;\r
+const uint16_t usT2_IRQ = 0x13;\r

 \r
        /* Configure the timer, the dummy handler is used here as the init\r
        function leaves interrupts enabled. */\r
 \r
        /* Configure the timer, the dummy handler is used here as the init\r
        function leaves interrupts enabled. */\r