From e21adc57a5213d9dd2a90db0a379a84b9a5b97c2 Mon Sep 17 00:00:00 2001 From: naga sureshkumar relli Date: Tue, 21 Apr 2015 17:34:54 +0530 Subject: [PATCH] canfd_v1_0: Fix for compilation errors in canfd driver This patch fixes the compilation errors in canfd driver. Signed-off-by: naga sureshkumar relli --- .../drivers/canfd/examples/xcanfd_intr_example.c | 8 ++++---- .../drivers/canfd/examples/xcanfd_polled_example.c | 8 ++++---- XilinxProcessorIPLib/drivers/canfd/src/xcanfd.c | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/canfd/examples/xcanfd_intr_example.c b/XilinxProcessorIPLib/drivers/canfd/examples/xcanfd_intr_example.c index 573da7d2..8c1584a9 100644 --- a/XilinxProcessorIPLib/drivers/canfd/examples/xcanfd_intr_example.c +++ b/XilinxProcessorIPLib/drivers/canfd/examples/xcanfd_intr_example.c @@ -82,7 +82,7 @@ * xparameters.h file. They are defined here such that a user can easily * change all the needed parameters in one place. */ -#define CAN_DEVICE_ID XPAR_CAN_0_DEVICE_ID +#define CANFD_DEVICE_ID XPAR_CANFD_0_DEVICE_ID #define CAN_INTR_VEC_ID XPAR_INTC_0_CANFD_0_VEC_ID #ifdef XPAR_INTC_0_DEVICE_ID @@ -142,7 +142,7 @@ /************************** Function Prototypes ******************************/ -static int XCanIntrExample(u16 DeviceId); +static int XCanFdIntrExample(u16 DeviceId); static void Config(XCanFd *InstancePtr); void Create_CanFD_Frame(); static int SendFrame(XCanFd *InstancePtr); @@ -189,7 +189,7 @@ volatile static int SendDone; int main() { /* Run the Can interrupt example */ - if (XCanIntrExample(CAN_DEVICE_ID)) { + if (XCanFdIntrExample(CANFD_DEVICE_ID)) { xil_printf("XCanFd Interrupt Mode example Failed\n\r"); return XST_FAILURE; } @@ -212,7 +212,7 @@ int main() * an infinite loop and will never return to the caller. * ******************************************************************************/ -static int XCanIntrExample(u16 DeviceId) +static int XCanFdIntrExample(u16 DeviceId) { int Status; XCanFd *CanFdInstPtr = &CanFd; diff --git a/XilinxProcessorIPLib/drivers/canfd/examples/xcanfd_polled_example.c b/XilinxProcessorIPLib/drivers/canfd/examples/xcanfd_polled_example.c index 3f8e5112..b667f95e 100644 --- a/XilinxProcessorIPLib/drivers/canfd/examples/xcanfd_polled_example.c +++ b/XilinxProcessorIPLib/drivers/canfd/examples/xcanfd_polled_example.c @@ -68,7 +68,7 @@ * xparameters.h file. They are defined here such that a user can easily * change all the needed parameters in one place. */ -#define CAN_DEVICE_ID XPAR_CAN_0_DEVICE_ID +#define CANFD_DEVICE_ID XPAR_CANFD_0_DEVICE_ID /* Maximum CAN frame length in Bytes */ #define XCANFD_MAX_FRAME_SIZE_IN_BYTES 72 @@ -112,7 +112,7 @@ /************************** Function Prototypes ******************************/ -int XCanPolledExample(u16 DeviceId); +int XCanFdPolledExample(u16 DeviceId); static int SendFrame(XCanFd *InstancePtr); static int RecvFrame(XCanFd *InstancePtr); @@ -152,7 +152,7 @@ int main(void) * in xparameters.h . */ - if (XCanPolledExample(CAN_DEVICE_ID)) { + if (XCanFdPolledExample(CANFD_DEVICE_ID)) { xil_printf("XCanFd Polled Mode example Failed\n\r"); return XST_FAILURE; } @@ -182,7 +182,7 @@ int main(void) * loop and will never return to the caller. * ******************************************************************************/ -int XCanPolledExample(u16 DeviceId) +int XCanFdPolledExample(u16 DeviceId) { int Status; XCanFd *CanFdInstPtr = &CanFd; diff --git a/XilinxProcessorIPLib/drivers/canfd/src/xcanfd.c b/XilinxProcessorIPLib/drivers/canfd/src/xcanfd.c index 4b239e2c..a4fa9219 100644 --- a/XilinxProcessorIPLib/drivers/canfd/src/xcanfd.c +++ b/XilinxProcessorIPLib/drivers/canfd/src/xcanfd.c @@ -1156,7 +1156,7 @@ void XCanFd_AcceptFilterGet(XCanFd *InstancePtr, u32 FilterIndex, { Xil_AssertVoid(InstancePtr != NULL); Xil_AssertVoid(InstancePtr->IsReady == XIL_COMPONENT_IS_READY); - Xil_Assertvoid(FilterIndex < XCANFD_NOOF_AFR); + Xil_AssertVoid(FilterIndex < XCANFD_NOOF_AFR); *MaskValue = XCanFd_ReadReg(InstancePtr->CanFdConfig.BaseAddress, XCANFD_AFMR_OFFSET(FilterIndex)); @@ -1488,8 +1488,8 @@ void XCanFd_Enable_Tranceiver_Delay_Compensation(XCanFd *InstancePtr) { u32 RegValue = 0; - Xil_Assertvoid(InstancePtr != NULL); - Xil_Assertvoid(InstancePtr->IsReady == XIL_COMPONENT_IS_READY); + Xil_AssertVoid(InstancePtr != NULL); + Xil_AssertVoid(InstancePtr->IsReady == XIL_COMPONENT_IS_READY); RegValue = XCanFd_ReadReg(InstancePtr->CanFdConfig.BaseAddress, XCANFD_F_BRPR_OFFSET); @@ -1520,8 +1520,8 @@ void XCanFd_Set_Tranceiver_Delay_Compensation(XCanFd *InstancePtr, u32 RegValue=0; - Xil_Assertvoid(InstancePtr != NULL); - Xil_Assertvoid(InstancePtr->IsReady == XIL_COMPONENT_IS_READY); + Xil_AssertVoid(InstancePtr != NULL); + Xil_AssertVoid(InstancePtr->IsReady == XIL_COMPONENT_IS_READY); if (TdcOffset <= 32) { @@ -1553,8 +1553,8 @@ void XCanFd_Disable_Tranceiver_Delay_Compensation(XCanFd *InstancePtr) { u32 RegValue=0; - Xil_Assertvoid(InstancePtr != NULL); - Xil_Assertvoid(InstancePtr->IsReady == XIL_COMPONENT_IS_READY); + Xil_AssertVoid(InstancePtr != NULL); + Xil_AssertVoid(InstancePtr->IsReady == XIL_COMPONENT_IS_READY); RegValue = XCanFd_ReadReg(InstancePtr->CanFdConfig.BaseAddress, XCANFD_F_BRPR_OFFSET);