len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 21:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Continue working on Zynq demo - tick interrupt now working but needs tidy up.

Browse source
This commit is contained in:
Richard Barry 2014-01-23 11:50:48 +00:00
parent 371f6f359a
commit 8cb6a4f032
2 changed files with 93 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/FreeRTOS_tick_config.c
View file

@ -67,6 +67,14 @@
#include "FreeRTOS.h"
#include "Task.h"
/* Xilinx includes. */
#include "xscutimer.h"
#include "xscugic.h"
#define XSCUTIMER_CLOCK_HZ XPAR_CPU_CORTEXA9_0_CPU_CLK_FREQ_HZ/2
static XScuTimer Timer; /* A9 timer counter */
/*
* The application must provide a function that configures a peripheral to
* create the FreeRTOS tick interrupt, then define configSETUP_TICK_INTERRUPT()
@ -75,6 +83,61 @@
*/
void vConfigureTickInterrupt( void )
{
static XScuGic InterruptController; /* Interrupt controller instance */
int Status;
extern void FreeRTOS_Tick_Handler( void );
XScuTimer_Config *ScuConfig;
XScuGic_Config *IntcConfig;
IntcConfig = XScuGic_LookupConfig(XPAR_SCUGIC_SINGLE_DEVICE_ID);
Status = XScuGic_CfgInitialize(&InterruptController, IntcConfig, IntcConfig->CpuBaseAddress );
configASSERT( Status == XST_SUCCESS );
/*
* Connect to the interrupt controller
*/
Status = XScuGic_Connect(&InterruptController, XPAR_SCUTIMER_INTR, (Xil_ExceptionHandler) FreeRTOS_Tick_Handler, (void *)&Timer);
configASSERT( Status == XST_SUCCESS );
/*
* Initialize the A9Timer driver.
*/
ScuConfig = XScuTimer_LookupConfig(XPAR_SCUTIMER_DEVICE_ID);
Status = XScuTimer_CfgInitialize(&Timer, ScuConfig, ScuConfig->BaseAddr);
configASSERT( Status == XST_SUCCESS );
/*
* Enable Auto reload mode.
*/
XScuTimer_EnableAutoReload(&Timer);
/*
* Load the timer counter register.
*/
XScuTimer_LoadTimer(&Timer, XSCUTIMER_CLOCK_HZ / configTICK_RATE_HZ);
/*
* Start the timer counter and then wait for it
* to timeout a number of times.
*/
XScuTimer_Start(&Timer);
/*
* Enable the interrupt for the Timer in the interrupt controller
*/
XScuGic_Enable(&InterruptController, XPAR_SCUTIMER_INTR);
/*
* Enable the timer interrupts for timer mode.
*/
XScuTimer_EnableInterrupt(&Timer);
/*
* Do NOT enable interrupts in the ARM processor here.
* This happens when the scheduler is started.
*/
}
/*-----------------------------------------------------------*/
@ -91,6 +154,33 @@ unsigned long ulGetRunTimeCounterValue( void )
void vInitialiseRunTimeStats( void )
{
}
/*-----------------------------------------------------------*/
extern XScuGic_Config XScuGic_ConfigTable[];
static const XScuGic_Config *CfgPtr = &XScuGic_ConfigTable[ XPAR_SCUGIC_SINGLE_DEVICE_ID ];
void vApplicationIRQHandler( uint32_t ulICCIAR )
{
uint32_t ulInterruptID;
XScuGic_VectorTableEntry *TablePtr;
//XScuGic_Config *CfgPtr;
//extern XScuGic_Config XScuGic_ConfigTable[];
// CfgPtr = &XScuGic_ConfigTable[ XPAR_SCUGIC_SINGLE_DEVICE_ID ];
/* Re-enable interrupts. */
__asm ( "cpsie i" );
/* The ID of the interrupt can be obtained by bitwise anding the ICCIAR value
with 0x3FF. */
ulInterruptID = ulICCIAR & 0x3FFUL;
configASSERT( ulInterruptID < XSCUGIC_MAX_NUM_INTR_INPUTS );
/* Call the function installed in the array of installed handler functions. */
TablePtr = &(CfgPtr->HandlerTable[ ulInterruptID ]);
TablePtr->Handler(TablePtr->CallBackRef);
// intc_func_table[ ulInterruptID ]( 0 );
}

22
FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/main.c
View file

@ -160,7 +160,7 @@ int main( void )
static void prvSetupHardware( void )
{
int Status;
static XScuGic InterruptController; /* Interrupt controller instance */
XScuGic InterruptController; /* Interrupt controller instance */
extern void FreeRTOS_IRQ_Handler( void );
extern void FreeRTOS_SWI_Handler( void );
@ -180,8 +180,8 @@ extern void FreeRTOS_SWI_Handler( void );
Status = XScuGic_CfgInitialize(&InterruptController, IntcConfig, IntcConfig->CpuBaseAddress );
configASSERT( Status == XST_SUCCESS );
Xil_ExceptionRegisterHandler( XIL_EXCEPTION_ID_IRQ_INT, (Xil_ExceptionHandler)FreeRTOS_IRQ_Handler, &InterruptController);
Xil_ExceptionRegisterHandler( XIL_EXCEPTION_ID_SWI_INT, (Xil_ExceptionHandler)FreeRTOS_SWI_Handler, &InterruptController);
// Xil_ExceptionRegisterHandler( XIL_EXCEPTION_ID_IRQ_INT, (Xil_ExceptionHandler)FreeRTOS_IRQ_Handler, &InterruptController);
// Xil_ExceptionRegisterHandler( XIL_EXCEPTION_ID_SWI_INT, (Xil_ExceptionHandler)FreeRTOS_SWI_Handler, &InterruptController);
// Xil_ExceptionEnableMask( XIL_EXCEPTION_ALL );
// Xil_ExceptionEnable();
@ -308,19 +308,3 @@ void vApplicationTickHook( void )
}
#endif
}
/*-----------------------------------------------------------*/
void vApplicationIRQHandler( uint32_t ulICCIAR )
{
uint32_t ulInterruptID;
/* Re-enable interrupts. */
__asm ( "cpsie i" );
/* The ID of the interrupt can be obtained by bitwise anding the ICCIAR value
with 0x3FF. */
ulInterruptID = ulICCIAR & 0x3FFUL;
/* Call the function installed in the array of installed handler functions. */
// intc_func_table[ ulInterruptID ]( 0 );
}