Changes required to build with the latest Xilinx tools.

pull/4/head
Richard Barry 17 years ago
parent bc7068a690
commit d1b9463e29

@ -1,260 +1,260 @@
/* /*
FreeRTOS.org V4.8.0 - Copyright (C) 2003-2008 Richard Barry. FreeRTOS.org V4.8.0 - Copyright (C) 2003-2008 Richard Barry.
This file is part of the FreeRTOS.org distribution. This file is part of the FreeRTOS.org distribution.
FreeRTOS.org is free software; you can redistribute it and/or modify FreeRTOS.org is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
FreeRTOS.org is distributed in the hope that it will be useful, FreeRTOS.org is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with FreeRTOS.org; if not, write to the Free Software along with FreeRTOS.org; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
A special exception to the GPL can be applied should you wish to distribute A special exception to the GPL can be applied should you wish to distribute
a combined work that includes FreeRTOS.org, without being obliged to provide a combined work that includes FreeRTOS.org, without being obliged to provide
the source code for any proprietary components. See the licensing section the source code for any proprietary components. See the licensing section
of http://www.FreeRTOS.org for full details of how and when the exception of http://www.FreeRTOS.org for full details of how and when the exception
can be applied. can be applied.
*************************************************************************** ***************************************************************************
*************************************************************************** ***************************************************************************
* * * *
* SAVE TIME AND MONEY! We can port FreeRTOS.org to your own hardware, * * SAVE TIME AND MONEY! We can port FreeRTOS.org to your own hardware, *
* and even write all or part of your application on your behalf. * * and even write all or part of your application on your behalf. *
* See http://www.OpenRTOS.com for details of the services we provide to * * See http://www.OpenRTOS.com for details of the services we provide to *
* expedite your project. * * expedite your project. *
* * * *
*************************************************************************** ***************************************************************************
*************************************************************************** ***************************************************************************
Please ensure to read the configuration and relevant port sections of the Please ensure to read the configuration and relevant port sections of the
online documentation. online documentation.
http://www.FreeRTOS.org - Documentation, latest information, license and http://www.FreeRTOS.org - Documentation, latest information, license and
contact details. contact details.
http://www.SafeRTOS.com - A version that is certified for use in safety http://www.SafeRTOS.com - A version that is certified for use in safety
critical systems. critical systems.
http://www.OpenRTOS.com - Commercial support, development, porting, http://www.OpenRTOS.com - Commercial support, development, porting,
licensing and training services. licensing and training services.
*/ */
/*----------------------------------------------------------- /*-----------------------------------------------------------
* Implementation of functions defined in portable.h for the PPC405 port. * Implementation of functions defined in portable.h for the PPC405 port.
*----------------------------------------------------------*/ *----------------------------------------------------------*/
/* Scheduler includes. */ /* Scheduler includes. */
#include "FreeRTOS.h" #include "FreeRTOS.h"
#include "task.h" #include "task.h"
/* Library includes. */ /* Library includes. */
#include "xtime_l.h" #include "xtime_l.h"
#include "xintc.h" #include "xintc.h"
#include "xintc_i.h" #include "xintc_i.h"
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Definitions to set the initial MSR of each task. */ /* Definitions to set the initial MSR of each task. */
#define portCRITICAL_INTERRUPT_ENABLE ( 1UL << 17UL ) #define portCRITICAL_INTERRUPT_ENABLE ( 1UL << 17UL )
#define portEXTERNAL_INTERRUPT_ENABLE ( 1UL << 15UL ) #define portEXTERNAL_INTERRUPT_ENABLE ( 1UL << 15UL )
#define portMACHINE_CHECK_ENABLE ( 1UL << 12UL ) #define portMACHINE_CHECK_ENABLE ( 1UL << 12UL )
#define portINITIAL_MSR ( portCRITICAL_INTERRUPT_ENABLE | portEXTERNAL_INTERRUPT_ENABLE | portMACHINE_CHECK_ENABLE ) #define portINITIAL_MSR ( portCRITICAL_INTERRUPT_ENABLE | portEXTERNAL_INTERRUPT_ENABLE | portMACHINE_CHECK_ENABLE )
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* /*
* Setup the system timer to generate the tick interrupt. * Setup the system timer to generate the tick interrupt.
*/ */
static void prvSetupTimerInterrupt( void ); static void prvSetupTimerInterrupt( void );
/* /*
* The handler for the tick interrupt - defined in portasm.s. * The handler for the tick interrupt - defined in portasm.s.
*/ */
extern void vPortTickISR( void ); extern void vPortTickISR( void );
/* /*
* The handler for the yield function - defined in portasm.s. * The handler for the yield function - defined in portasm.s.
*/ */
extern void vPortYield( void ); extern void vPortYield( void );
/* /*
* Function to start the scheduler running by starting the highest * Function to start the scheduler running by starting the highest
* priority task that has thus far been created. * priority task that has thus far been created.
*/ */
extern void vPortStartFirstTask( void ); extern void vPortStartFirstTask( void );
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Structure used to hold the state of the interrupt controller. */ /* Structure used to hold the state of the interrupt controller. */
static XIntc xInterruptController; static XIntc xInterruptController;
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* /*
* Initialise the stack of a task to look exactly as if the task had been * Initialise the stack of a task to look exactly as if the task had been
* interrupted. * interrupted.
* *
* See the header file portable.h. * See the header file portable.h.
*/ */
portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters ) portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters )
{ {
/* Place a known value at the bottom of the stack for debugging. */ /* Place a known value at the bottom of the stack for debugging. */
*pxTopOfStack = 0xDEADBEEF; *pxTopOfStack = 0xDEADBEEF;
*pxTopOfStack--; pxTopOfStack--;
/* EABI stack frame. */ /* EABI stack frame. */
pxTopOfStack -= 28; /* R31 to R4 inclusive. */ pxTopOfStack -= 28; /* R31 to R4 inclusive. */
/* Parameters in R3. */ /* Parameters in R3. */
*pxTopOfStack = ( portSTACK_TYPE ) pvParameters; *pxTopOfStack = ( portSTACK_TYPE ) pvParameters;
pxTopOfStack--; pxTopOfStack--;
*pxTopOfStack = 0x02020202UL; /* R2. */ *pxTopOfStack = 0x02020202UL; /* R2. */
pxTopOfStack--; pxTopOfStack--;
/* R1 is the stack pointer so is omitted. */ /* R1 is the stack pointer so is omitted. */
*pxTopOfStack = 0x10000001UL;; /* R0. */ *pxTopOfStack = 0x10000001UL;; /* R0. */
pxTopOfStack--; pxTopOfStack--;
*pxTopOfStack = 0x00000000UL; /* USPRG0. */ *pxTopOfStack = 0x00000000UL; /* USPRG0. */
pxTopOfStack--; pxTopOfStack--;
*pxTopOfStack = 0x00000000UL; /* CR. */ *pxTopOfStack = 0x00000000UL; /* CR. */
pxTopOfStack--; pxTopOfStack--;
*pxTopOfStack = 0x00000000UL; /* XER. */ *pxTopOfStack = 0x00000000UL; /* XER. */
pxTopOfStack--; pxTopOfStack--;
*pxTopOfStack = 0x00000000UL; /* CTR. */ *pxTopOfStack = 0x00000000UL; /* CTR. */
pxTopOfStack--; pxTopOfStack--;
*pxTopOfStack = ( portSTACK_TYPE ) vPortEndScheduler; /* LR. */ *pxTopOfStack = ( portSTACK_TYPE ) vPortEndScheduler; /* LR. */
pxTopOfStack--; pxTopOfStack--;
*pxTopOfStack = ( portSTACK_TYPE ) pxCode; /* SRR0. */ *pxTopOfStack = ( portSTACK_TYPE ) pxCode; /* SRR0. */
pxTopOfStack--; pxTopOfStack--;
*pxTopOfStack = portINITIAL_MSR;/* SRR1. */ *pxTopOfStack = portINITIAL_MSR;/* SRR1. */
pxTopOfStack--; pxTopOfStack--;
*pxTopOfStack = ( portSTACK_TYPE ) vPortEndScheduler;/* Next LR. */ *pxTopOfStack = ( portSTACK_TYPE ) vPortEndScheduler;/* Next LR. */
pxTopOfStack--; pxTopOfStack--;
*pxTopOfStack = 0x00000000UL;;/* Backchain. */ *pxTopOfStack = 0x00000000UL;/* Backchain. */
return pxTopOfStack; return pxTopOfStack;
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
portBASE_TYPE xPortStartScheduler( void ) portBASE_TYPE xPortStartScheduler( void )
{ {
prvSetupTimerInterrupt(); prvSetupTimerInterrupt();
XExc_RegisterHandler( XEXC_ID_SYSTEM_CALL, ( XExceptionHandler ) vPortYield, ( void * ) 0 ); XExc_RegisterHandler( XEXC_ID_SYSTEM_CALL, ( XExceptionHandler ) vPortYield, ( void * ) 0 );
vPortStartFirstTask(); vPortStartFirstTask();
/* Should not get here as the tasks are now running! */ /* Should not get here as the tasks are now running! */
return pdFALSE; return pdFALSE;
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
void vPortEndScheduler( void ) void vPortEndScheduler( void )
{ {
/* Not implemented. */ /* Not implemented. */
for( ;; ); for( ;; );
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* /*
* Hardware initialisation to generate the RTOS tick. * Hardware initialisation to generate the RTOS tick.
*/ */
static void prvSetupTimerInterrupt( void ) static void prvSetupTimerInterrupt( void )
{ {
const unsigned portLONG ulInterval = ( ( configCPU_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL ); const unsigned portLONG ulInterval = ( ( configCPU_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL );
XTime_PITClearInterrupt(); XTime_PITClearInterrupt();
XTime_FITClearInterrupt(); XTime_FITClearInterrupt();
XTime_WDTClearInterrupt(); XTime_WDTClearInterrupt();
XTime_WDTDisableInterrupt(); XTime_WDTDisableInterrupt();
XTime_FITDisableInterrupt(); XTime_FITDisableInterrupt();
XExc_RegisterHandler( XEXC_ID_PIT_INT, ( XExceptionHandler ) vPortTickISR, ( void * ) 0 ); XExc_RegisterHandler( XEXC_ID_PIT_INT, ( XExceptionHandler ) vPortTickISR, ( void * ) 0 );
XTime_PITEnableAutoReload(); XTime_PITEnableAutoReload();
XTime_PITSetInterval( ulInterval ); XTime_PITSetInterval( ulInterval );
XTime_PITEnableInterrupt(); XTime_PITEnableInterrupt();
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
void vPortISRHandler( void *vNullDoNotUse ) void vPortISRHandler( void *vNullDoNotUse )
{ {
unsigned portLONG ulInterruptStatus, ulInterruptMask = 1UL; unsigned portLONG ulInterruptStatus, ulInterruptMask = 1UL;
portBASE_TYPE xInterruptNumber; portBASE_TYPE xInterruptNumber;
XIntc_Config *pxInterruptController; XIntc_Config *pxInterruptController;
XIntc_VectorTableEntry *pxTable; XIntc_VectorTableEntry *pxTable;
/* Get the configuration by using the device ID - in this case it is /* Get the configuration by using the device ID - in this case it is
assumed that only one interrupt controller is being used. */ assumed that only one interrupt controller is being used. */
pxInterruptController = &XIntc_ConfigTable[ XPAR_OPB_INTC_0_DEVICE_ID ]; pxInterruptController = &XIntc_ConfigTable[ XPAR_XPS_INTC_0_DEVICE_ID ];
/* Which interrupts are pending? */ /* Which interrupts are pending? */
ulInterruptStatus = XIntc_mGetIntrStatus( pxInterruptController->BaseAddress ); ulInterruptStatus = XIntc_mGetIntrStatus( pxInterruptController->BaseAddress );
for( xInterruptNumber = 0; xInterruptNumber < XPAR_INTC_MAX_NUM_INTR_INPUTS; xInterruptNumber++ ) for( xInterruptNumber = 0; xInterruptNumber < XPAR_INTC_MAX_NUM_INTR_INPUTS; xInterruptNumber++ )
{ {
if( ulInterruptStatus & 0x01UL ) if( ulInterruptStatus & 0x01UL )
{ {
/* Clear the pending interrupt. */ /* Clear the pending interrupt. */
XIntc_mAckIntr( pxInterruptController->BaseAddress, ulInterruptMask ); XIntc_mAckIntr( pxInterruptController->BaseAddress, ulInterruptMask );
/* Call the registered handler. */ /* Call the registered handler. */
pxTable = &( pxInterruptController->HandlerTable[ xInterruptNumber ] ); pxTable = &( pxInterruptController->HandlerTable[ xInterruptNumber ] );
pxTable->Handler( pxTable->CallBackRef ); pxTable->Handler( pxTable->CallBackRef );
} }
/* Check the next interrupt. */ /* Check the next interrupt. */
ulInterruptMask <<= 0x01UL; ulInterruptMask <<= 0x01UL;
ulInterruptStatus >>= 0x01UL; ulInterruptStatus >>= 0x01UL;
/* Have we serviced all interrupts? */ /* Have we serviced all interrupts? */
if( ulInterruptStatus == 0UL ) if( ulInterruptStatus == 0UL )
{ {
break; break;
} }
} }
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
void vPortSetupInterruptController( void ) void vPortSetupInterruptController( void )
{ {
extern void vPortISRWrapper( void ); extern void vPortISRWrapper( void );
/* Perform all library calls necessary to initialise the exception table /* Perform all library calls necessary to initialise the exception table
and interrupt controller. This assumes only one interrupt controller is in and interrupt controller. This assumes only one interrupt controller is in
use. */ use. */
XExc_mDisableExceptions( XEXC_NON_CRITICAL ); XExc_mDisableExceptions( XEXC_NON_CRITICAL );
XExc_Init(); XExc_Init();
/* The library functions save the context - we then jump to a wrapper to /* The library functions save the context - we then jump to a wrapper to
save the stack into the TCB. The wrapper then calls the handler defined save the stack into the TCB. The wrapper then calls the handler defined
above. */ above. */
XExc_RegisterHandler( XEXC_ID_NON_CRITICAL_INT, ( XExceptionHandler ) vPortISRWrapper, NULL ); XExc_RegisterHandler( XEXC_ID_NON_CRITICAL_INT, ( XExceptionHandler ) vPortISRWrapper, NULL );
XIntc_Initialize( &xInterruptController, XPAR_OPB_INTC_0_DEVICE_ID ); XIntc_Initialize( &xInterruptController, XPAR_XPS_INTC_0_DEVICE_ID );
XIntc_Start( &xInterruptController, XIN_REAL_MODE ); XIntc_Start( &xInterruptController, XIN_REAL_MODE );
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
portBASE_TYPE xPortInstallInterruptHandler( unsigned portCHAR ucInterruptID, XInterruptHandler pxHandler, void *pvCallBackRef ) portBASE_TYPE xPortInstallInterruptHandler( unsigned portCHAR ucInterruptID, XInterruptHandler pxHandler, void *pvCallBackRef )
{ {
portBASE_TYPE xReturn = pdFAIL; portBASE_TYPE xReturn = pdFAIL;
/* This function is defined here so the scope of xInterruptController can /* This function is defined here so the scope of xInterruptController can
remain within this file. */ remain within this file. */
if( XST_SUCCESS == XIntc_Connect( &xInterruptController, ucInterruptID, pxHandler, pvCallBackRef ) ) if( XST_SUCCESS == XIntc_Connect( &xInterruptController, ucInterruptID, pxHandler, pvCallBackRef ) )
{ {
XIntc_Enable( &xInterruptController, ucInterruptID ); XIntc_Enable( &xInterruptController, ucInterruptID );
xReturn = pdPASS; xReturn = pdPASS;
} }
return xReturn; return xReturn;
} }

Loading…
Cancel
Save