diff --git a/XilinxProcessorIPLib/drivers/ycrcb2rgb/data/ycrcb2rgb.tcl b/XilinxProcessorIPLib/drivers/ycrcb2rgb/data/ycrcb2rgb.tcl index 881d8bf7..55fb6cff 100755 --- a/XilinxProcessorIPLib/drivers/ycrcb2rgb/data/ycrcb2rgb.tcl +++ b/XilinxProcessorIPLib/drivers/ycrcb2rgb/data/ycrcb2rgb.tcl @@ -31,7 +31,7 @@ proc generate {drv_handle} { xdefine_include_file $drv_handle "xparameters.h" "YCRCB2RGB" "NUM_INSTANCES" "DEVICE_ID" "C_BASEADDR" "C_HIGHADDR" "C_S_AXIS_VIDEO_DATA_WIDTH" "C_MAX_COLS" "C_ACTIVE_COLS" "C_ACTIVE_ROWS" "C_MWIDTH" "C_COEF_RANGE" "C_ACOEF" "C_BCOEF" "C_CCOEF" "C_DCOEF" "C_ROFFSET" "C_GOFFSET" "C_BOFFSET" "C_HAS_CLIP" "C_HAS_CLAMP" "C_RGBMAX" "C_RGBMIN" "C_S_AXIS_VIDEO_FORMAT" "C_M_AXIS_VIDEO_FORMAT" "C_HAS_DEBUG" "C_HAS_INTC_IF" "C_S_AXI_CLK_FREQ_HZ" "C_STANDARD_SEL" "C_OUTPUT_RANGE" - xdefine_config_file $drv_handle "xycrcb2rgb_g.c" "XYCrCr2Rgb" "DEVICE_ID" "C_BASEADDR" "C_HIGHADDR" "C_S_AXIS_VIDEO_FORMAT" "C_M_AXIS_VIDEO_FORMAT" "C_HAS_DEBUG" "C_HAS_INTC_IF" "C_MAX_COLS" "C_ACTIVE_COLS" "C_ACTIVE_ROWS" "C_MWIDTH" "C_COEF_RANGE" "C_ACOEF" "C_BCOEF" "C_CCOEF" "C_DCOEF" "C_ROFFSET" "C_GOFFSET" "C_BOFFSET" "C_HAS_CLIP" "C_HAS_CLAMP" "C_RGBMAX" "C_RGBMIN" "C_S_AXI_CLK_FREQ_HZ" "C_STANDARD_SEL" "C_OUTPUT_RANGE" + xdefine_config_file $drv_handle "xycrcb2rgb_g.c" "XYCrCb2Rgb" "DEVICE_ID" "C_BASEADDR" "C_S_AXIS_VIDEO_FORMAT" "C_M_AXIS_VIDEO_FORMAT" "C_HAS_DEBUG" "C_HAS_INTC_IF" "C_MAX_COLS" "C_ACTIVE_COLS" "C_ACTIVE_ROWS" "C_MWIDTH" "C_COEF_RANGE" "C_ACOEF" "C_BCOEF" "C_CCOEF" "C_DCOEF" "C_ROFFSET" "C_GOFFSET" "C_BOFFSET" "C_HAS_CLIP" "C_HAS_CLAMP" "C_RGBMAX" "C_RGBMIN" "C_S_AXI_CLK_FREQ_HZ" "C_STANDARD_SEL" "C_OUTPUT_RANGE" xdefine_canonical_xpars $drv_handle "xparameters.h" "YCRCB2RGB" "DEVICE_ID" "C_BASEADDR" "C_HIGHADDR" "C_S_AXIS_VIDEO_DATA_WIDTH" "C_MAX_COLS" "C_ACTIVE_COLS" "C_ACTIVE_ROWS" "C_MWIDTH" "C_COEF_RANGE" "C_ACOEF" "C_BCOEF" "C_CCOEF" "C_DCOEF" "C_ROFFSET" "C_GOFFSET" "C_BOFFSET" "C_HAS_CLIP" "C_HAS_CLAMP" "C_RGBMAX" "C_RGBMIN" "C_S_AXIS_VIDEO_FORMAT" "C_M_AXIS_VIDEO_FORMAT" "C_HAS_DEBUG" "C_HAS_INTC_IF" "C_S_AXI_CLK_FREQ_HZ" "C_STANDARD_SEL" "C_OUTPUT_RANGE" diff --git a/XilinxProcessorIPLib/drivers/ycrcb2rgb/examples/ycrcb2rgb_example.c b/XilinxProcessorIPLib/drivers/ycrcb2rgb/examples/ycrcb2rgb_example.c index 16e6d515..aaaa23f6 100755 --- a/XilinxProcessorIPLib/drivers/ycrcb2rgb/examples/ycrcb2rgb_example.c +++ b/XilinxProcessorIPLib/drivers/ycrcb2rgb/examples/ycrcb2rgb_example.c @@ -59,7 +59,7 @@ * xparameters.h file. They are defined here such that a user can easily * change all the needed parameters in one place. */ -#define XYCC_DEVICE_ID XPAR_XYCC_0_DEVICE_ID +#define XYCC_DEVICE_ID XPAR_YCRCB2RGB_0_DEVICE_ID /**************************** Type Definitions *******************************/ diff --git a/XilinxProcessorIPLib/drivers/ycrcb2rgb/examples/ycrcb2rgb_selftest_example.c b/XilinxProcessorIPLib/drivers/ycrcb2rgb/examples/ycrcb2rgb_selftest_example.c index d6ef7646..d3cfc82a 100755 --- a/XilinxProcessorIPLib/drivers/ycrcb2rgb/examples/ycrcb2rgb_selftest_example.c +++ b/XilinxProcessorIPLib/drivers/ycrcb2rgb/examples/ycrcb2rgb_selftest_example.c @@ -62,7 +62,7 @@ * xparameters.h file. They are defined here such that a user can easily * change all the needed parameters in one place. */ -#define XYCC_DEVICE_ID XPAR_XYCC_0_DEVICE_ID +#define XYCC_DEVICE_ID XPAR_YCRCB2RGB_0_DEVICE_ID /**************************** Type Definitions *******************************/ diff --git a/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb.h b/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb.h index 5982b18d..00f44c9c 100755 --- a/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb.h +++ b/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb.h @@ -589,9 +589,9 @@ typedef struct { u32 BCoef; /**< B Coefficient */ u32 CCoef; /**< C Coefficient */ u32 DCoef; /**< D Coefficient */ - u16 ROffset; /**< R Offset */ - u16 GOffset; /**< G Offset */ - u16 BOffset; /**< B Offset */ + u32 ROffset; /**< R Offset */ + u32 GOffset; /**< G Offset */ + u32 BOffset; /**< B Offset */ u16 HasClip; /**< Clipping support */ u16 HasClamp; /**< Clamping support */ u16 RgbMax; /**< RGB Max value */ diff --git a/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb_sinit.c b/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb_sinit.c index 96e985ce..45ee12d7 100755 --- a/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb_sinit.c +++ b/XilinxProcessorIPLib/drivers/ycrcb2rgb/src/xycrcb2rgb_sinit.c @@ -92,11 +92,11 @@ XYCrCb2Rgb_Config *XYCrCb2Rgb_LookupConfig(u16 DeviceId) { u32 Index; extern XYCrCb2Rgb_Config - XYCrCb2Rgb_ConfigTable[XPAR_XYCC_NUM_INSTANCES]; + XYCrCb2Rgb_ConfigTable[XPAR_YCRCB2RGB_NUM_INSTANCES]; XYCrCb2Rgb_Config *CfgPtr = NULL; /* Get the reference pointer to XYCrCb2Rgb_Config structure */ - for (Index = (u32)0x0; Index < (u32)(XPAR_XYCC_NUM_INSTANCES); + for (Index = (u32)0x0; Index < (u32)(XPAR_YCRCB2RGB_NUM_INSTANCES); Index++) { /* Compare device Id with configTable's device Id */