From 5b850941267e96072acf01fa0a15254c4cc9da83 Mon Sep 17 00:00:00 2001 From: Durga challa Date: Mon, 4 Aug 2014 18:05:59 +0530 Subject: [PATCH] rgb2ycrcb: Changed enum names. Removed Haddress in TCL file under config structure and Modified doxygen report, modified enum names in xrgb2ycrcb.c and xrgb2ycrcb.c files. Signed-off-by: Durga challa Acked-by: Srikanth Vemula --- .../drivers/rgb2ycrcb/data/rgb2ycrcb.tcl | 2 +- .../drivers/rgb2ycrcb/src/xrgb2ycrcb.c | 11 ++++++----- .../drivers/rgb2ycrcb/src/xrgb2ycrcb.h | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/rgb2ycrcb/data/rgb2ycrcb.tcl b/XilinxProcessorIPLib/drivers/rgb2ycrcb/data/rgb2ycrcb.tcl index e2382233..002b22ab 100755 --- a/XilinxProcessorIPLib/drivers/rgb2ycrcb/data/rgb2ycrcb.tcl +++ b/XilinxProcessorIPLib/drivers/rgb2ycrcb/data/rgb2ycrcb.tcl @@ -32,7 +32,7 @@ proc generate {drv_handle} { xdefine_include_file $drv_handle "xparameters.h" "RGB2YCRCB" "NUM_INSTANCES" "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_HAS_CLIP" "C_HAS_CLAMP" "C_ACOEF" "C_BCOEF" "C_CCOEF" "C_DCOEF" "C_YOFFSET" "C_CBOFFSET" "C_CROFFSET" "C_YMAX" "C_YMIN" "C_CBMAX" "C_CBMIN" "C_CRMAX" "C_CRMIN" "C_S_AXI_CLK_FREQ_HZ" "C_STANDARD_SEL" "C_OUTPUT_RANGE" - xdefine_config_file $drv_handle "xrgb2ycrcb_g.c" "XRgb2YCrCb" "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_HAS_CLIP" "C_HAS_CLAMP" "C_ACOEF" "C_BCOEF" "C_CCOEF" "C_DCOEF" "C_YOFFSET" "C_CBOFFSET" "C_CROFFSET" "C_YMAX" "C_YMIN" "C_CBMAX" "C_CBMIN" "C_CRMAX" "C_CRMIN" "C_S_AXI_CLK_FREQ_HZ" "C_STANDARD_SEL" "C_OUTPUT_RANGE" + xdefine_config_file $drv_handle "xrgb2ycrcb_g.c" "XRgb2YCrCb" "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_HAS_CLIP" "C_HAS_CLAMP" "C_ACOEF" "C_BCOEF" "C_CCOEF" "C_DCOEF" "C_YOFFSET" "C_CBOFFSET" "C_CROFFSET" "C_YMAX" "C_YMIN" "C_CBMAX" "C_CBMIN" "C_CRMAX" "C_CRMIN" "C_S_AXI_CLK_FREQ_HZ" "C_STANDARD_SEL" "C_OUTPUT_RANGE" xdefine_canonical_xpars $drv_handle "xparameters.h" "RGB2YCRCB" "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_HAS_CLIP" "C_HAS_CLAMP" "C_ACOEF" "C_BCOEF" "C_CCOEF" "C_DCOEF" "C_YOFFSET" "C_CBOFFSET" "C_CROFFSET" "C_YMAX" "C_YMIN" "C_CBMAX" "C_CBMIN" "C_CRMAX" "C_CRMIN" "C_S_AXI_CLK_FREQ_HZ" "C_STANDARD_SEL" "C_OUTPUT_RANGE" } diff --git a/XilinxProcessorIPLib/drivers/rgb2ycrcb/src/xrgb2ycrcb.c b/XilinxProcessorIPLib/drivers/rgb2ycrcb/src/xrgb2ycrcb.c index 900f500b..443f586b 100755 --- a/XilinxProcessorIPLib/drivers/rgb2ycrcb/src/xrgb2ycrcb.c +++ b/XilinxProcessorIPLib/drivers/rgb2ycrcb/src/xrgb2ycrcb.c @@ -1133,7 +1133,7 @@ void XRgb2YCrCb_GetCoefs(XRgb2YCrCb *InstancePtr, double *ACoef, double *BCoef, * from the selected video standard. * * @param InstancePtr is a pointer to the XRgb2YCrCb instance. -* @param StandardSel needs to be set from enum Standards value as : +* @param StandardSel needs to be set from enum XRgb_Standards value as : * 0 = XRGB_STANDARD_ITU_601_SD * 1 = XRGB_STANDARD_ITU_709_NTSC * 2 = XRGB_STANDARD_ITU_709_PAL @@ -1154,8 +1154,8 @@ void XRgb2YCrCb_GetCoefs(XRgb2YCrCb *InstancePtr, double *ACoef, double *BCoef, * ******************************************************************************/ void XRgb2YCrCb_Select_Standard(XRgb2YCrCb *InstancePtr, - enum Standards StandardSel, - enum OutputRanges InputRange, u32 DataWidth, + enum XRgb_Standards StandardSel, + enum XRgb_OutputRanges InputRange, u32 DataWidth, struct XRgb2YCrCb_Coef_Inputs *CoefIn) { /* Verify arguments. */ @@ -1344,7 +1344,8 @@ u32 XRgb2YCrCb_Coefficient_Translation(XRgb2YCrCb *InstancePtr, * conversion coefficients as well as the clipping and clamping values. * * @param InstancePtr is a pointer to the XRgb2YCrCb instance. -* @param Range needs to be set from the enum OutputRanges values as: +* @param Range needs to be set from the enum XRgb_OutputRanges +* values as: * 0 = XRGB_TV_16_TO_240, * 1 = XRGB_STUDIO_16_TO_235, * 2 = XRGB_GRAPHICS_0_TO_255. @@ -1355,7 +1356,7 @@ u32 XRgb2YCrCb_Coefficient_Translation(XRgb2YCrCb *InstancePtr, * *****************************************************************************/ void XRgb2YCrCb_Select_OutputRange(XRgb2YCrCb *InstancePtr, - enum OutputRanges Range) + enum XRgb_OutputRanges Range) { /* Verify arguments. */ Xil_AssertVoid(InstancePtr != NULL); diff --git a/XilinxProcessorIPLib/drivers/rgb2ycrcb/src/xrgb2ycrcb.h b/XilinxProcessorIPLib/drivers/rgb2ycrcb/src/xrgb2ycrcb.h index 56aff325..3a944bc3 100755 --- a/XilinxProcessorIPLib/drivers/rgb2ycrcb/src/xrgb2ycrcb.h +++ b/XilinxProcessorIPLib/drivers/rgb2ycrcb/src/xrgb2ycrcb.h @@ -221,7 +221,7 @@ enum { * These constants specify different types of standards used to represent * standard color encoding. */ -enum Standards { +enum XRgb_Standards { XRGB_STANDARD_ITU_601_SD = 0, /**< Standard ITU 601 SD. */ XRGB_STANDARD_ITU_709_NTSC, /**< Standard ITU 709 NTSC. */ XRGB_STANDARD_ITU_709_PAL, /**< Standard ITU 709 PAL. */ @@ -238,7 +238,7 @@ enum Standards { * These constants specify different ranges used for studio equipment, * television and computer graphics respectively. */ -enum OutputRanges { +enum XRgb_OutputRanges { XRGB_TV_16_TO_240 = 0, /**< 16 to 240, for Television. */ XRGB_STUDIO_16_TO_235, /**< 16 to 235, for Studio Equipment. */ XRGB_GRAPHICS_0_TO_255 /**< 0 to 255, for Computer Graphics. */ @@ -808,8 +808,8 @@ void XRgb2YCrCb_GetCoefs(XRgb2YCrCb *InstancePtr, double *ACoef, double *BCoef, double *CCoef, double *DCoef); void XRgb2YCrCb_Select_Standard(XRgb2YCrCb *InstancePtr, - enum Standards StandardSel, - enum OutputRanges InputRange, u32 DataWidth, + enum XRgb_Standards StandardSel, + enum XRgb_OutputRanges InputRange, u32 DataWidth, struct XRgb2YCrCb_Coef_Inputs *CoefIn); u32 XRgb2YCrCb_Coefficient_Translation(XRgb2YCrCb *InstancePtr, @@ -818,7 +818,7 @@ u32 XRgb2YCrCb_Coefficient_Translation(XRgb2YCrCb *InstancePtr, u32 Data_Width); void XRgb2YCrCb_Select_OutputRange(XRgb2YCrCb *InstancePtr, - enum OutputRanges Range); + enum XRgb_OutputRanges Range); /* Self-test function implemented in xrgb2ycrcb_selftest.c */ int XRgb2YCrCb_SelfTest(XRgb2YCrCb *InstancePtr);