From 37e7f6c93382ab51b4bdc2e54d524f134b3ece10 Mon Sep 17 00:00:00 2001 From: Shadul Shaikh Date: Thu, 16 Jul 2015 20:04:51 +0530 Subject: [PATCH] axivdma: Defined number of instances macro if not defined This patch adds definition of macro XPAR_XAXIVDMA_NUM_INSTANCES, controls config table parameters with macro XPAR_XAXIVDMA_NUM_INSTANCES. These changes are to avoid compilation errors in Subsystem driver if Subsystem HIP is not included axivdma as subcore, results axivdma driver not in BSP. Signed-off-by: Shadul Shaikh Acked-by: Srikanth Vemula --- XilinxProcessorIPLib/drivers/axivdma/src/xaxivdma_g.c | 4 ++++ XilinxProcessorIPLib/drivers/axivdma/src/xaxivdma_sinit.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/XilinxProcessorIPLib/drivers/axivdma/src/xaxivdma_g.c b/XilinxProcessorIPLib/drivers/axivdma/src/xaxivdma_g.c index 3bc7feb9..53a5df4e 100644 --- a/XilinxProcessorIPLib/drivers/axivdma/src/xaxivdma_g.c +++ b/XilinxProcessorIPLib/drivers/axivdma/src/xaxivdma_g.c @@ -57,6 +57,8 @@ * 4.03a srt 01/18/13 Added TDATA_WIDTH parameters (CR: 691866) * 4.04a srt 03/03/13 Support for *_ENABLE_DEBUG_INFO_* debug configuration * parameters (CR: 703738) +* 5.1 sha 07/15/15 Added XPAR_XAXIVDMA_NUM_INSTANCES macro to control +* config table parameters. * * * @@ -72,6 +74,7 @@ XAxiVdma_Config XAxiVdma_ConfigTable[] = { { +#ifdef XPAR_XAXIVDMA_NUM_INSTANCES XPAR_AXIVDMA_0_DEVICE_ID, XPAR_AXIVDMA_0_BASEADDR, XPAR_AXIVDMA_0_NUM_FSTORES, @@ -102,6 +105,7 @@ XAxiVdma_Config XAxiVdma_ConfigTable[] = XPAR_AXIVDMA_0_ENABLE_DEBUG_INFO_14, XPAR_AXIVDMA_0_ENABLE_DEBUG_INFO_15, XPAR_AXIVDMA_0_ENABLE_DEBUG_ALL +#endif } }; /** @} */ diff --git a/XilinxProcessorIPLib/drivers/axivdma/src/xaxivdma_sinit.c b/XilinxProcessorIPLib/drivers/axivdma/src/xaxivdma_sinit.c index 82a6f122..ef78e21e 100644 --- a/XilinxProcessorIPLib/drivers/axivdma/src/xaxivdma_sinit.c +++ b/XilinxProcessorIPLib/drivers/axivdma/src/xaxivdma_sinit.c @@ -48,6 +48,8 @@ * 1.00a jz 08/16/10 First release * 2.00a jz 12/10/10 Added support for direct register access mode, v3 core * 2.01a jz 01/19/11 Added ability to re-assign BD addresses +* 5.1 sha 07/15/15 Defined macro XPAR_XAXIVDMA_NUM_INSTANCES if not +* defined in xparameters.h * * ******************************************************************************/ @@ -57,6 +59,12 @@ #include "xaxivdma.h" #include "xparameters.h" +/************************** Constant Definitions *****************************/ + +#ifndef XPAR_XAXIVDMA_NUM_INSTANCES +#define XPAR_XAXIVDMA_NUM_INSTANCES 0 +#endif + /*****************************************************************************/ /** * Look up the hardware configuration for a device instance