From bd4db0d1d229ae856ab4a22dd680b5dc9807f7c0 Mon Sep 17 00:00:00 2001 From: Rohit Consul Date: Fri, 7 Aug 2015 16:04:59 -0700 Subject: [PATCH] v_deinterlacer: Update dependency driver version Updated video common version to 2.0 to reflect new driver in repo Removed hls generated comments in makefile Added width and height to debug API Signed-off-by: Rohit Consul Acked-by: Andrei-Liviu Simion --- .../drivers/v_deinterlacer/data/v_deinterlacer.mdd | 2 +- XilinxProcessorIPLib/drivers/v_deinterlacer/src/Makefile | 7 ------- .../drivers/v_deinterlacer/src/xv_deinterlacer_l2.c | 6 +++++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/v_deinterlacer/data/v_deinterlacer.mdd b/XilinxProcessorIPLib/drivers/v_deinterlacer/data/v_deinterlacer.mdd index acd7d230..4da18e14 100755 --- a/XilinxProcessorIPLib/drivers/v_deinterlacer/data/v_deinterlacer.mdd +++ b/XilinxProcessorIPLib/drivers/v_deinterlacer/data/v_deinterlacer.mdd @@ -35,7 +35,7 @@ BEGIN driver v_deinterlacer OPTION supported_peripherals = (v_deinterlacer_v5_0 ); OPTION driver_state = ACTIVE; - OPTION DEPENDS = (video_common_v1_1); + OPTION DEPENDS = (video_common_v2_0); OPTION copyfiles = all; OPTION name = v_deinterlacer; OPTION version = 5.0; diff --git a/XilinxProcessorIPLib/drivers/v_deinterlacer/src/Makefile b/XilinxProcessorIPLib/drivers/v_deinterlacer/src/Makefile index 3a3b5f90..a5ee8298 100644 --- a/XilinxProcessorIPLib/drivers/v_deinterlacer/src/Makefile +++ b/XilinxProcessorIPLib/drivers/v_deinterlacer/src/Makefile @@ -1,10 +1,3 @@ -# ============================================================== -# File generated by Vivado(TM) HLS - High-Level Synthesis from C, C++ and SystemC -# Version: 2015.3 -# Copyright (C) 2015 Xilinx Inc. All rights reserved. -# -# ============================================================== - COMPILER= ARCHIVER= CP=cp diff --git a/XilinxProcessorIPLib/drivers/v_deinterlacer/src/xv_deinterlacer_l2.c b/XilinxProcessorIPLib/drivers/v_deinterlacer/src/xv_deinterlacer_l2.c index 30f82c01..196ded9d 100644 --- a/XilinxProcessorIPLib/drivers/v_deinterlacer/src/xv_deinterlacer_l2.c +++ b/XilinxProcessorIPLib/drivers/v_deinterlacer/src/xv_deinterlacer_l2.c @@ -135,7 +135,7 @@ void XV_DeintDbgReportStatus(XV_deinterlacer *InstancePtr) XV_deinterlacer *pDeint = InstancePtr; u32 done, idle, ready, ctrl; u32 rfb, wfb, colformat, algo; - + u32 width, height; /* * Assert validates the input arguments */ @@ -152,6 +152,8 @@ void XV_DeintDbgReportStatus(XV_deinterlacer *InstancePtr) wfb = XV_deinterlacer_Get_write_fb(pDeint); colformat = XV_deinterlacer_Get_colorFormat(pDeint); algo = XV_deinterlacer_Get_algo(pDeint); + width = XV_deinterlacer_Get_width(pDeint); + height = XV_deinterlacer_Get_height(pDeint); xil_printf("IsDone: %d\r\n", done); xil_printf("IsIdle: %d\r\n", idle); @@ -162,5 +164,7 @@ void XV_DeintDbgReportStatus(XV_deinterlacer *InstancePtr) xil_printf("Write Frame Buffer: 0x%x\r\n", wfb); xil_printf("Color Format: %d\r\n", colformat); xil_printf("Algo Selected: %d\r\n", algo); + xil_printf("Width : %d\r\n", width); + xil_printf("Height : %d\r\n", height); } /** @} */