From 0946e1fa3859bc69719f917da2579b82cf301cb5 Mon Sep 17 00:00:00 2001 From: Durga challa Date: Wed, 3 Sep 2014 15:43:53 +0530 Subject: [PATCH] Deinterlacer: Modified bit definitions Modified bit definitions of color mode and version register. Modified InReset macro. Signed-off-by: Durga challa --- .../drivers/deinterlacer/src/xdeint.h | 12 ++++++------ .../drivers/deinterlacer/src/xdeint_hw.h | 13 ++++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/deinterlacer/src/xdeint.h b/XilinxProcessorIPLib/drivers/deinterlacer/src/xdeint.h index 6e685d69..5eb48d54 100755 --- a/XilinxProcessorIPLib/drivers/deinterlacer/src/xdeint.h +++ b/XilinxProcessorIPLib/drivers/deinterlacer/src/xdeint.h @@ -71,7 +71,7 @@ * 2.00a rjh 18/01/12 Updated for v_deinterlacer 2.00 * 3.0 adk 19/12/13 Updated as per the New Tcl API's. * 3.2 adk 02/13/14 Modified XDeint_IntrDisable macro replace ISR_OFFSET -* with IER OFFSET. +* with IER OFFSET, XDeint_InReset. * Added Doxygen support, adherence to Xilinx * coding standards. * @@ -271,8 +271,8 @@ typedef struct { * ******************************************************************************/ #define XDeint_InReset(InstancePtr) \ - XDeint_ReadReg((InstancePtr)->Config.BaseAddress, \ - (XDEINT_RESET_OFFSET)) + (XDeint_ReadReg((InstancePtr)->Config.BaseAddress, \ + (XDEINT_RESET_OFFSET)) & (XDEINT_RESET_RESET_MASK)) /*****************************************************************************/ /** @@ -460,8 +460,8 @@ typedef struct { * @param InstancePtr is a pointer to XDeint instance to be worked on. * * @return Returns the color space. -* 0x00000004 - YUV color space, -* 0x00000000 - RGB color space. +* 0x00000004 - RGB color space, +* 0x00000000 - YUV color space. * * @note C-style signature: * u32 XDeint_GetColorSpace(XDeint *InstancePtr) @@ -469,7 +469,7 @@ typedef struct { ******************************************************************************/ #define XDeint_GetColorSpace(InstancePtr) \ XDeint_ReadReg((InstancePtr)->Config.BaseAddress, \ - (XDEINT_MODE_OFFSET)) & (XDEINT_MODE_COLOUR_YUV) + (XDEINT_MODE_OFFSET)) & (XDEINT_MODE_COL) /*****************************************************************************/ /** diff --git a/XilinxProcessorIPLib/drivers/deinterlacer/src/xdeint_hw.h b/XilinxProcessorIPLib/drivers/deinterlacer/src/xdeint_hw.h index 2a0a6d79..ffebd83c 100755 --- a/XilinxProcessorIPLib/drivers/deinterlacer/src/xdeint_hw.h +++ b/XilinxProcessorIPLib/drivers/deinterlacer/src/xdeint_hw.h @@ -51,6 +51,9 @@ * 3.2 adk 02/13/14 Suffixed "_OFFSET" to all register offset macros. * Added bit masks for the registers and added * backward compatibility for macros. +* Swapped bit definitions of XDEINT_MODE_COLOUR_YUV +* and XDEINT_MODE_COLOUR_RGB. +* Modified bit definitions of version register. * * ******************************************************************************/ @@ -161,9 +164,9 @@ extern "C" { /** @name Deinterlacer Control Fields: * @{ */ -#define XDEINT_VER_MAJOR_MASK 0xF0000000 /**< Major Version */ -#define XDEINT_VER_MAJOR_SHIFT 28 /**< Major Bit Shift */ -#define XDEINT_VER_MINOR_MASK 0x0FF00000 /**< Minor Version */ +#define XDEINT_VER_MAJOR_MASK 0xFF000000 /**< Major Version */ +#define XDEINT_VER_MAJOR_SHIFT 24 /**< Major Bit Shift */ +#define XDEINT_VER_MINOR_MASK 0x00F00000 /**< Minor Version */ #define XDEINT_VER_MINOR_SHIFT 20 /**< Minor Bit Shift */ #define XDEINT_VER_REV_MASK 0x000F0000 /**< Revision * Version */ @@ -203,9 +206,9 @@ extern "C" { #define XDEINT_MODE_PULL_22_FIELDP 0x00000200 /**< Pull down 2:2 * Field * Precedence */ -#define XDEINT_MODE_COLOUR_RGB 0x00000000 /**< Deinterlacer +#define XDEINT_MODE_COLOUR_YUV 0x00000000 /**< Deinterlacer * color space */ -#define XDEINT_MODE_COLOUR_YUV 0x00000004 /**< Deinterlacer +#define XDEINT_MODE_COLOUR_RGB 0x00000004 /**< Deinterlacer * color space */ #define XDEINT_MODE_ALGORITHM_RAW 0x00000000 /**< Deinterlacer * algorithm