From 1eff98a6560cf2dce60d0cdb10219fd48c5682f2 Mon Sep 17 00:00:00 2001 From: Shadul Shaikh Date: Wed, 8 Jul 2015 15:18:12 +0530 Subject: [PATCH] dual_splitter: Defined number of instances macro if not defined This patch adds definition of macro XPAR_XDUALSPLITTER_NUM_INSTANCES, disables config table when XPAR_XDUALSPLITTER_NUM_INSTANCES undefined and equal to zero. These changes are to avoid compilation errors in DisplayPort Subsystem driver. DisplayPort Subsystem HIP does not include Dual Splitter core in Single Transport Mode (SST) but Subsystem driver adds depends clause in its .mdd file to pull Dual Splitter driver in BSP. DisplayPort Subsystem HIP does not include Dual Splitter core in Single Transport Mode (SST) but Subsystem driver adds depends clause in its .mdd file to pull Dual Splitter driver in BSP. Signed-off-by: Shadul Shaikh --- .../drivers/dual_splitter/src/xdualsplitter_g.c | 4 ++++ .../drivers/dual_splitter/src/xdualsplitter_sinit.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/XilinxProcessorIPLib/drivers/dual_splitter/src/xdualsplitter_g.c b/XilinxProcessorIPLib/drivers/dual_splitter/src/xdualsplitter_g.c index b5fc89fe..bfccfec7 100644 --- a/XilinxProcessorIPLib/drivers/dual_splitter/src/xdualsplitter_g.c +++ b/XilinxProcessorIPLib/drivers/dual_splitter/src/xdualsplitter_g.c @@ -47,6 +47,8 @@ XDualSplitter_Config XDualSplitter_ConfigTable[] = { { +#ifdef XPAR_XDUALSPLITTER_NUM_INSTANCES +#if XPAR_XDUALSPLITTER_NUM_INSTANCES > 0 XPAR_DUALSPLITTER_0_DEVICE_ID, XPAR_DUALSPLITTER_0_BASEADDR, XPAR_DUALSPLITTER_0_ACTIVE_COLS, @@ -59,5 +61,7 @@ XDualSplitter_Config XDualSplitter_ConfigTable[] = XPAR_DUALSPLITTER_0_MAX_SMPL_WIDTH, XPAR_DUALSPLITTER_0_HAS_AXI4_LITE, XPAR_DUALSPLITTER_0_HAS_IRQ +#endif +#endif } }; diff --git a/XilinxProcessorIPLib/drivers/dual_splitter/src/xdualsplitter_sinit.c b/XilinxProcessorIPLib/drivers/dual_splitter/src/xdualsplitter_sinit.c index 54071bc0..95716cee 100644 --- a/XilinxProcessorIPLib/drivers/dual_splitter/src/xdualsplitter_sinit.c +++ b/XilinxProcessorIPLib/drivers/dual_splitter/src/xdualsplitter_sinit.c @@ -44,8 +44,10 @@ * MODIFICATION HISTORY: * * Ver Who Date Changes -* ----- --- -------- -------------------------------------------------- +* ----- --- -------- ------------------------------------------------------- * 1.00 sha 07/21/14 Initial release. +* 1.00 sha 07/08/15 Defined macro XPAR_XDUALSPLITTER_NUM_INSTANCES if not +* defined in xparameters.h. * * ******************************************************************************/ @@ -57,6 +59,9 @@ /************************** Constant Definitions *****************************/ +#ifndef XPAR_XDUALSPLITTER_NUM_INSTANCES +#define XPAR_XDUALSPLITTER_NUM_INSTANCES 0 +#endif /***************** Macros (Inline Functions) Definitions *********************/