From 15ade0443899396acc44924320b874307a166bb0 Mon Sep 17 00:00:00 2001 From: Durga challa Date: Tue, 5 Aug 2014 12:41:29 +0530 Subject: [PATCH] tpg: Modified enum names. Modified enums in source files. Signed-off-by: Durga challa Acked-by: Srikanth Vemula --- XilinxProcessorIPLib/drivers/tpg/src/xtpg.c | 6 +++--- XilinxProcessorIPLib/drivers/tpg/src/xtpg.h | 16 ++++++++-------- XilinxProcessorIPLib/drivers/tpg/src/xtpg_hw.h | 1 - 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/tpg/src/xtpg.c b/XilinxProcessorIPLib/drivers/tpg/src/xtpg.c index a67a687f..e538fda6 100755 --- a/XilinxProcessorIPLib/drivers/tpg/src/xtpg.c +++ b/XilinxProcessorIPLib/drivers/tpg/src/xtpg.c @@ -318,7 +318,7 @@ void XTpg_GetActiveSize(XTpg *InstancePtr, u16 *HSize, u16 *VSize) * @note None. * ******************************************************************************/ -void XTpg_SetBackground(XTpg *InstancePtr, enum BackgroundPattern Pattern) +void XTpg_SetBackground(XTpg *InstancePtr, enum XTpg_BackgroundPattern Pattern) { u32 Background; @@ -513,7 +513,7 @@ void XTpg_DisableBox(XTpg *InstancePtr) * @note None. * ******************************************************************************/ -void XTpg_SetComponentMask(XTpg *InstancePtr, enum ComponentMask Mask) +void XTpg_SetComponentMask(XTpg *InstancePtr, enum XTpg_ComponentMask Mask) { u32 ColorComponent; @@ -1342,7 +1342,7 @@ u32 XTpg_GetNoiseGain(XTpg *InstancePtr) * ******************************************************************************/ void XTpg_SetBayerPhase(XTpg *InstancePtr, - enum BayerPhaseCombination BayerPhaseComb) + enum XTpg_BayerPhaseCombination BayerPhaseComb) { /* Verify arguments. */ Xil_AssertVoid(InstancePtr != NULL); diff --git a/XilinxProcessorIPLib/drivers/tpg/src/xtpg.h b/XilinxProcessorIPLib/drivers/tpg/src/xtpg.h index 2613d655..b86976c0 100755 --- a/XilinxProcessorIPLib/drivers/tpg/src/xtpg.h +++ b/XilinxProcessorIPLib/drivers/tpg/src/xtpg.h @@ -116,8 +116,8 @@ * XTPG_HANDLER_PROCSTART ,XTPG_HANDLER_FRAMEDONE and * XTPG_HANDLER_ERROR. * Defined the following enums: -* BackgroundPattern, ComponentMask and -* BayerPhaseCombination. +* XTpg_BackgroundPattern, XTpg_ComponentMask and +* XTpg_BayerPhaseCombination. * * Defined the following range macros * XTPG_MOTION_SPEED_MIN, XTPG_MOTION_SPEED_MAX, @@ -214,7 +214,7 @@ enum { * These constants specify different types of background patterns supported by * the core. */ -enum BackgroundPattern { +enum XTpg_BackgroundPattern { XTPG_PASS_THROUGH, /**< Pass video input straight through * the video output */ XTPG_H_RAMP, /**< Horizontal ramp */ @@ -240,7 +240,7 @@ enum BackgroundPattern { /** * These constants specify mask outs for a particular color component. */ -enum ComponentMask { +enum XTpg_ComponentMask { XTPG_NOMASK, /**< No masking */ XTPG_MASKOUT_RED, /**< Mask out red, * Cr(for YCbCr mode) component */ @@ -257,7 +257,7 @@ enum ComponentMask { /** * These constants specify Bayer phase combinations of the core. */ -enum BayerPhaseCombination { +enum XTpg_BayerPhaseCombination { XTPG_BAYER_PHASE_RGRG, /**< Red green combination */ XTPG_BAYER_PHASE_GRGR, /**< Green red combination */ XTPG_BAYER_PHASE_GBGB, /**< Green blue combination */ @@ -662,7 +662,7 @@ void XTpg_SetActiveSize(XTpg *InstancePtr, u16 HSize, u16 VSize); void XTpg_GetActiveSize(XTpg *InstancePtr, u16 *HSize, u16 *VSize); void XTpg_SetPattern(XTpg *InstancePtr, u32 Pattern); u32 XTpg_GetPattern(XTpg *InstancePtr); -void XTpg_SetBackground(XTpg *InstancePtr, enum BackgroundPattern Pattern); +void XTpg_SetBackground(XTpg *InstancePtr, enum XTpg_BackgroundPattern Pattern); u32 XTpg_GetBackground(XTpg *InstancePtr); void XTpg_EnableCrossHair(XTpg *InstancePtr); void XTpg_DisableCrossHair(XTpg *InstancePtr); @@ -670,7 +670,7 @@ void XTpg_EnableMotion(XTpg *InstancePtr); void XTpg_DisableMotion(XTpg *InstancePtr); void XTpg_EnableBox(XTpg *InstancePtr); void XTpg_DisableBox(XTpg *InstancePtr); -void XTpg_SetComponentMask(XTpg *InstancePtr, enum ComponentMask Mask); +void XTpg_SetComponentMask(XTpg *InstancePtr, enum XTpg_ComponentMask Mask); u32 XTpg_GetComponentMask(XTpg *InstancePtr); void XTpg_EnableStuckPixel(XTpg *InstancePtr); void XTpg_DisableStuckPixel(XTpg *InstancePtr); @@ -697,7 +697,7 @@ u32 XTpg_GetStuckPixelThreshold (XTpg *InstancePtr); void XTpg_SetNoiseGain(XTpg *InstancePtr, u32 NoiseGain); u32 XTpg_GetNoiseGain(XTpg *InstancePtr); void XTpg_SetBayerPhase(XTpg *InstancePtr, - enum BayerPhaseCombination BayerPhaseComb); + enum XTpg_BayerPhaseCombination BayerPhaseComb); u32 XTpg_GetBayerPhase(XTpg *InstancePtr); /* diff --git a/XilinxProcessorIPLib/drivers/tpg/src/xtpg_hw.h b/XilinxProcessorIPLib/drivers/tpg/src/xtpg_hw.h index a213ce4b..3f44ca69 100755 --- a/XilinxProcessorIPLib/drivers/tpg/src/xtpg_hw.h +++ b/XilinxProcessorIPLib/drivers/tpg/src/xtpg_hw.h @@ -349,7 +349,6 @@ extern "C" { #define TPG_CROSS_HATCH XTPG_CROSS_HATCH #define TPG_VER_HOR_RAMP XTPG_VER_HOR_RAMP #define TPG_CHECKER_BOARD XTPG_CHECKER_BOARD -#define TPG_CROSS_HAIRS XTPG_PTRN_CTL_EN_CROSSHAIR_MASK #define TPG_MOVING_BOX XTPG_PTRN_CTL_EN_BOX_MASK #define TPG_MASK_RED_CR XTPG_MASK_RED_CR #define TPG_MASK_GREEN_Y XTPG_MASK_GREEN_Y