stv0g/embeddedsw
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tmrctr: Added a default stub for callbacks.

Browse source 
To prevent unexpected behavior resulting from jumping to a NULL
address.

Previously, if the user didn't define a callback before the
occurence of an interrupt, the driver's interrupt handler would have
invoked a function pointer to NULL.

Signed-off-by: Andrei-Liviu Simion <andrei.simion@xilinx.com>
Acked-by: Shadul Shaikh <shaduls@xilinx.com>
This commit is contained in:
Andrei-Liviu Simion 2015-10-09 03:51:36 -07:00 • committed by Nava kishore Manne
parent 573bc5b06b
commit ce787a5831
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
XilinxProcessorIPLib/drivers/tmrctr/src/xtmrctr.c
View file

@ -83,6 +83,7 @@
/************************** Function Prototypes ******************************/ /************************** Function Prototypes ******************************/
static void XTmrCtr_StubCallback(void *CallBackRef, u8 TmrCtrNumber);
/************************** Variable Definitions *****************************/ /************************** Variable Definitions *****************************/
@ -118,8 +119,8 @@ void XTmrCtr_CfgInitialize(XTmrCtr *InstancePtr, XTmrCtr_Config *ConfigPtr,
InstancePtr->Config.BaseAddress = EffectiveAddr; InstancePtr->Config.BaseAddress = EffectiveAddr;
InstancePtr->BaseAddress = EffectiveAddr; InstancePtr->BaseAddress = EffectiveAddr;
InstancePtr->Handler = NULL; InstancePtr->Handler = XTmrCtr_StubCallback;
InstancePtr->CallBackRef = NULL; InstancePtr->CallBackRef = InstancePtr;
InstancePtr->Stats.Interrupts = 0; InstancePtr->Stats.Interrupts = 0;
InstancePtr->IsReady = XIL_COMPONENT_IS_READY; InstancePtr->IsReady = XIL_COMPONENT_IS_READY;
@ -541,4 +542,25 @@ XTmrCtr_Config *XTmrCtr_LookupConfig(u16 DeviceId)
return CfgPtr; return CfgPtr;
} }
/*****************************************************************************/
/**
* Default callback for the driver does nothing. It matches the signature of the
* XTmrCtr_Handler type.
*
* @param CallBackRef is a pointer to the callback's data.
* @param TmrCtrNumber is the ID of the timer counter which a user-defined
* callback would normally operate on.
*
* @return None.
*
* @note None.
*
******************************************************************************/
static void XTmrCtr_StubCallback(void *CallBackRef, u8 TmrCtrNumber)
{
Xil_AssertVoid(CallBackRef != NULL);
Xil_AssertVoid(TmrCtrNumber < XTC_DEVICE_TIMER_COUNT);
}
/** @} */ /** @} */