Update version number to 8.1.1 for patch release that re-enables mutexes to be given...

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

diff --git a/FreeRTOS/Source/portable/GCC/CORTUS_APS3/port.c b/FreeRTOS/Source/portable/GCC/CORTUS_APS3/port.c
index 7132a75da6c978cdfa5e8262c52d97931bb016b8..6ca88f2e45d76a37e2ec8f156faa780d886c85e4 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/CORTUS_APS3/port.c
+++ b/FreeRTOS/Source/portable/GCC/CORTUS_APS3/port.c
@@ -1,5 +1,6 @@
 /*\r
-    FreeRTOS V7.5.1 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.1.1 - Copyright (C) 2014 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
@@ -23,10 +24,10 @@
     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
 \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
+    >>!   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
     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
@@ -85,16 +86,16 @@
 static void prvSetupTimerInterrupt( void );\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
        /* Make space on the stack for the context - this leaves a couple of spaces\r
        empty.  */\r
        pxTopOfStack -= 20;\r
 \r
        /* Fill the registers with known values to assist debugging. */\r
-       pxTopOfStack[ 16 ] = portKERNEL_INTERRUPT_PRIORITY_LEVEL;\r
+       pxTopOfStack[ 16 ] = 0;\r
        pxTopOfStack[ 15 ] = portINITIAL_PSR;\r
-       pxTopOfStack[ 14 ] = ( unsigned long ) pxCode;\r
+       pxTopOfStack[ 14 ] = ( uint32_t ) pxCode;\r
        pxTopOfStack[ 13 ] = 0x00000000UL; /* R15. */\r
        pxTopOfStack[ 12 ] = 0x00000000UL; /* R14. */\r
        pxTopOfStack[ 11 ] = 0x0d0d0d0dUL;\r
@@ -108,21 +109,17 @@ portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE * pxTopOfStack, pdTASK_COD
        pxTopOfStack[ 3 ] = 0x05050505UL;\r
        pxTopOfStack[ 2 ] = 0x04040404UL;\r
        pxTopOfStack[ 1 ] = 0x03030303UL;\r
-       pxTopOfStack[ 0 ] = ( unsigned long ) pvParameters;\r
+       pxTopOfStack[ 0 ] = ( uint32_t ) pvParameters;\r
 \r
        return pxTopOfStack;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
 {\r
        /* Set-up the timer interrupt. */\r
        prvSetupTimerInterrupt();\r
 \r
-       /* Enable the TRAP yield. */\r
-       irq[ portIRQ_TRAP_YIELD ].ien = 1;\r
-       irq[ portIRQ_TRAP_YIELD ].ipl = portKERNEL_INTERRUPT_PRIORITY_LEVEL;\r
-\r
        /* Integrated Interrupt Controller: Enable all interrupts. */\r
        ic->ien = 1;\r
 \r
@@ -143,7 +140,6 @@ static void prvSetupTimerInterrupt( void )
 \r
        /* Set the IRQ Handler priority and enable it. */\r
        irq[ IRQ_COUNTER1 ].ien = 1;\r
-       irq[ IRQ_COUNTER1 ].ipl = portKERNEL_INTERRUPT_PRIORITY_LEVEL;\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r