diff --git a/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb.c b/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb.c index 82779bde..c43ff75c 100755 --- a/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb.c +++ b/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb.c @@ -531,20 +531,21 @@ void XYCrCb2Rgb_SetActiveSize(XYCrCb2Rgb *InstancePtr, u16 HSize, u16 VSize) ******************************************************************************/ void XYCrCb2Rgb_GetActiveSize(XYCrCb2Rgb *InstancePtr, u16 *HSize, u16 *VSize) { + u32 Data; /* Verify arguments. */ Xil_AssertVoid(InstancePtr != NULL); Xil_AssertVoid(HSize != NULL); Xil_AssertVoid(VSize != NULL); + Data = XYCrCb2Rgb_ReadReg(InstancePtr->Config.BaseAddress, + (XYCC_ACTIVE_SIZE_OFFSET)); /* Reads Number of Active Pixels per scan line */ - *VSize = (u16)(XYCrCb2Rgb_ReadReg(InstancePtr->Config.BaseAddress, - (XYCC_ACTIVE_SIZE_OFFSET)) & + *VSize = (u16)((Data & (XYCC_ACTSIZE_NUM_LINE_MASK)) >> - (XYCC_ACTSIZE_NUM_LINE_SHIFT); + (XYCC_ACTSIZE_NUM_LINE_SHIFT)); /* Reads number of active lines per frame */ - *HSize = (u16)(XYCrCb2Rgb_ReadReg(InstancePtr->Config.BaseAddress, - (XYCC_ACTIVE_SIZE_OFFSET)) & + *HSize = (u16)(Data & (XYCC_ACTSIZE_NUM_PIXEL_MASK)); } diff --git a/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb_hw.h b/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb_hw.h index 0ba509bf..6f9f25e1 100755 --- a/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb_hw.h +++ b/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb_hw.h @@ -247,9 +247,18 @@ extern "C" { #define YCC_SYSDEBUG1 XYCC_SYSDEBUG1_OFFSET #define YCC_SYSDEBUG2 XYCC_SYSDEBUG2_OFFSET #define YCC_ACTIVE_SIZE XYCC_ACTIVE_SIZE_OFFSET +#define XYCC_RGBMAX XYCC_RGBMAX_OFFSET +#define XYCC_RGBMIN XYCC_RGBMIN_OFFSET +#define XYCC_ROFFSET XYCC_ROFFSET_OFFSET +#define XYCC_GOFFSET XYCC_GOFFSET_OFFSET +#define XYCC_BOFFSET XYCC_BOFFSET_OFFSET +#define XYCC_ACOEF XYCC_ACOEF_OFFSET +#define XYCC_BCOEF XYCC_BCOEF_OFFSET +#define XYCC_CCOEF XYCC_CCOEF_OFFSET +#define XYCC_DCOEF XYCC_DCOEF_OFFSET + #define YCC_CTL_EN_MASK XYCC_CTL_EN_MASK #define YCC_CTL_RUE_MASK XYCC_CTL_RUE_MASK -#define YCC_CTL_CS_MASK XYCC_CTL_CS_MASK #define YCC_RST_RESET XYCC_CTL_RESET_MASK #define YCC_RST_AUTORESET XYCC_CTL_AUTORESET_MASK @@ -258,6 +267,7 @@ extern "C" { #define XYCC_ReadReg XYCrCb2Rgb_ReadReg #define XYCC_WriteReg XYCrCb2Rgb_WriteReg + /*@}*/ /** @name Interrupt Registers