X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=FreeRTOS%2FSource%2Fportable%2FGCC%2FNiosII%2Fport.c;h=9212d2209d6984d0bad888da8f04876de6a264d5;hb=3d511cabadf346c67f0f56e15e999c02ca0393ed;hp=eb6b22bac3d7dc89dbf954e65b56e9a162893fbe;hpb=69644b6878075d157a1dcface6a6136d1fce91c2;p=freertos diff --git a/FreeRTOS/Source/portable/GCC/NiosII/port.c b/FreeRTOS/Source/portable/GCC/NiosII/port.c index eb6b22bac..9212d2209 100644 --- a/FreeRTOS/Source/portable/GCC/NiosII/port.c +++ b/FreeRTOS/Source/portable/GCC/NiosII/port.c @@ -1,48 +1,38 @@ /* - FreeRTOS V7.4.0 - Copyright (C) 2013 Real Time Engineers Ltd. + FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd. + All rights reserved - FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME. PLEASE VISIT - http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. + VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION. *************************************************************************** * * - * FreeRTOS tutorial books are available in pdf and paperback. * - * Complete, revised, and edited pdf reference manuals are also * - * available. * + * FreeRTOS provides completely free yet professionally developed, * + * robust, strictly quality controlled, supported, and cross * + * platform software that has become a de facto standard. * * * - * Purchasing FreeRTOS documentation will not only help you, by * - * ensuring you get running as quickly as possible and with an * - * in-depth knowledge of how to use FreeRTOS, it will also help * - * the FreeRTOS project to continue with its mission of providing * - * professional grade, cross platform, de facto standard solutions * - * for microcontrollers - completely free of charge! * + * Help yourself get started quickly and support the FreeRTOS * + * project by purchasing a FreeRTOS tutorial book, reference * + * manual, or both from: http://www.FreeRTOS.org/Documentation * * * - * >>> See http://www.FreeRTOS.org/Documentation for details. <<< * - * * - * Thank you for using FreeRTOS, and thank you for your support! * + * Thank you! * * * *************************************************************************** - This file is part of the FreeRTOS distribution. FreeRTOS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License (version 2) as published by the - Free Software Foundation AND MODIFIED BY the FreeRTOS exception. + Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception. - >>>>>>NOTE<<<<<< The modification to the GPL is included to allow you to - distribute a combined work that includes FreeRTOS without being obliged to - provide the source code for proprietary components outside of the FreeRTOS - kernel. + >>! NOTE: The modification to the GPL is included to allow you to !<< + >>! distribute a combined work that includes FreeRTOS without being !<< + >>! obliged to provide the source code for proprietary components !<< + >>! outside of the FreeRTOS kernel. !<< FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - details. You should have received a copy of the GNU General Public License - and the FreeRTOS license exception along with FreeRTOS; if not itcan be - viewed here: http://www.freertos.org/a00114.html and also obtained by - writing to Real Time Engineers Ltd., contact details for whom are available - on the FreeRTOS WEB site. + FOR A PARTICULAR PURPOSE. Full license text is available from the following + link: http://www.freertos.org/a00114.html 1 tab == 4 spaces! @@ -55,21 +45,22 @@ * * *************************************************************************** - - http://www.FreeRTOS.org - Documentation, books, training, latest versions, + http://www.FreeRTOS.org - Documentation, books, training, latest versions, license and Real Time Engineers Ltd. contact details. http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products, - including FreeRTOS+Trace - an indispensable productivity tool, and our new - fully thread aware and reentrant UDP/IP stack. + including FreeRTOS+Trace - an indispensable productivity tool, a DOS + compatible FAT file system, and our tiny thread aware UDP/IP stack. - http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High - Integrity Systems, who sell the code with commercial support, - indemnification and middleware, under the OpenRTOS brand. - - http://www.SafeRTOS.com - High Integrity Systems also provide a safety - engineered and independently SIL3 certified version for use in safety and + http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High + Integrity Systems to sell under the OpenRTOS brand. Low cost OpenRTOS + licenses offer ticketed support, indemnification and middleware. + + http://www.SafeRTOS.com - High Integrity Systems also provide a safety + engineered and independently SIL3 certified version for use in safety and mission critical applications that require provable dependability. + + 1 tab == 4 spaces! */ /*----------------------------------------------------------- @@ -90,7 +81,7 @@ #include "task.h" /* Interrupts are enabled. */ -#define portINITIAL_ESTATUS ( portSTACK_TYPE ) 0x01 +#define portINITIAL_ESTATUS ( StackType_t ) 0x01 /*-----------------------------------------------------------*/ @@ -106,7 +97,7 @@ void vPortSysTickHandler( void * context, alt_u32 id ); /*-----------------------------------------------------------*/ -static void prvReadGp( unsigned long *ulValue ) +static void prvReadGp( uint32_t *ulValue ) { asm( "stw gp, (%0)" :: "r"(ulValue) ); } @@ -115,10 +106,10 @@ static void prvReadGp( unsigned long *ulValue ) /* * See header file for description. */ -portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters ) +StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t pxCode, void *pvParameters ) { -portSTACK_TYPE *pxFramePointer = pxTopOfStack - 1; -portSTACK_TYPE xGlobalPointer; +StackType_t *pxFramePointer = pxTopOfStack - 1; +StackType_t xGlobalPointer; prvReadGp( &xGlobalPointer ); @@ -126,7 +117,7 @@ portSTACK_TYPE xGlobalPointer; *pxTopOfStack = 0xdeadbeef; pxTopOfStack--; - *pxTopOfStack = ( portSTACK_TYPE ) pxFramePointer; + *pxTopOfStack = ( StackType_t ) pxFramePointer; pxTopOfStack--; *pxTopOfStack = xGlobalPointer; @@ -134,7 +125,7 @@ portSTACK_TYPE xGlobalPointer; /* Space for R23 to R16. */ pxTopOfStack -= 9; - *pxTopOfStack = ( portSTACK_TYPE ) pxCode; + *pxTopOfStack = ( StackType_t ) pxCode; pxTopOfStack--; *pxTopOfStack = portINITIAL_ESTATUS; @@ -142,7 +133,7 @@ portSTACK_TYPE xGlobalPointer; /* Space for R15 to R5. */ pxTopOfStack -= 12; - *pxTopOfStack = ( portSTACK_TYPE ) pvParameters; + *pxTopOfStack = ( StackType_t ) pvParameters; /* Space for R3 to R1, muldiv and RA. */ pxTopOfStack -= 5; @@ -154,7 +145,7 @@ portSTACK_TYPE xGlobalPointer; /* * See header file for description. */ -portBASE_TYPE xPortStartScheduler( void ) +BaseType_t xPortStartScheduler( void ) { /* Start the timer that generates the tick ISR. Interrupts are disabled here already. */ @@ -204,14 +195,12 @@ void prvSetupTimerInterrupt( void ) void vPortSysTickHandler( void * context, alt_u32 id ) { - /* Increment the Kernel Tick. */ - vTaskIncrementTick(); - - /* If using preemption, also force a context switch. */ - #if configUSE_PREEMPTION == 1 + /* Increment the kernel tick. */ + if( xTaskIncrementTick() != pdFALSE ) + { vTaskSwitchContext(); - #endif - + } + /* Clear the interrupt. */ IOWR_ALTERA_AVALON_TIMER_STATUS( SYS_CLK_BASE, ~ALTERA_AVALON_TIMER_STATUS_TO_MSK ); }