From 37cee8b3157f770e5cd535d353199ceba12e0e25 Mon Sep 17 00:00:00 2001
From: Durga challa <vnsl.durga.challa@xilinx.com>
Date: Wed, 13 Aug 2014 18:46:45 +0530
Subject: [PATCH] vtc: Modified VTC_V6_1 driver
Modified intr.c file if conditions and xvtc.c file.
Signed-off-by: Durga challa <vnsldurg@xilinx.com>
Acked-by: Srikanth Vemula <svemula@xilinx.com>
---
XilinxProcessorIPLib/drivers/vtc/src/xvtc.c | 39 +++++++++----------
.../drivers/vtc/src/xvtc_intr.c | 37 ++++++++----------
2 files changed, 34 insertions(+), 42 deletions(-)
diff --git a/XilinxProcessorIPLib/drivers/vtc/src/xvtc.c b/XilinxProcessorIPLib/drivers/vtc/src/xvtc.c
index 38583b68..e83aba7e 100755
--- a/XilinxProcessorIPLib/drivers/vtc/src/xvtc.c
+++ b/XilinxProcessorIPLib/drivers/vtc/src/xvtc.c
@@ -2562,10 +2562,9 @@ u16 XVtc_ConvTiming2VideoMode(XVtc *InstancePtr, XVtc_Timing *TimingPtr)
******************************************************************************/
void XVtc_SetGeneratorTiming(XVtc *InstancePtr, XVtc_Timing * TimingPtr)
{
- XVtc_Polarity Polarity = {0};
- XVtc_Signal Signal = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0};
- XVtc_HoriOffsets Hoff = {0};
+ XVtc_Polarity Polarity;
+ XVtc_Signal Signal;
+ XVtc_HoriOffsets Hoff;
/* Verify arguments. */
Xil_AssertVoid(InstancePtr != NULL);
@@ -2623,23 +2622,21 @@ void XVtc_SetGeneratorVideoMode(XVtc *InstancePtr, u16 Mode)
******************************************************************************/
void XVtc_GetGeneratorTiming(XVtc *InstancePtr, XVtc_Timing *TimingPtr)
{
- XVtc_Polarity Polarity = {0};
- /* Signal.OriginMode set to 1 */
- XVtc_Signal Signal = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0};
- XVtc_HoriOffsets Hoff = {0};
+ XVtc_Polarity Polarity;
+ XVtc_Signal Signal;
+ XVtc_HoriOffsets Hoff;
/* Verify arguments. */
Xil_AssertVoid(InstancePtr != NULL);
Xil_AssertVoid(InstancePtr->IsReady == (u32)(XIL_COMPONENT_IS_READY));
Xil_AssertVoid(TimingPtr != NULL);
- /* Signal.OriginMode = 1 */
- XVtc_GetGeneratorHoriOffset(InstancePtr, &Hoff);
- XVtc_GetPolarity(InstancePtr, &Polarity);
- XVtc_GetGenerator(InstancePtr, &Signal);
+ Signal.OriginMode = 1;
+ XVtc_GetPolarity(InstancePtr, &Polarity);
+ XVtc_GetGeneratorHoriOffset(InstancePtr, &Hoff);
+ XVtc_GetGenerator(InstancePtr, &Signal);
XVtc_ConvSignal2Timing(InstancePtr, &Signal, &Hoff, &Polarity,
TimingPtr);
@@ -2693,20 +2690,20 @@ u16 XVtc_GetGeneratorVideoMode(XVtc *InstancePtr)
******************************************************************************/
void XVtc_GetDetectorTiming(XVtc *InstancePtr, XVtc_Timing *TimingPtr)
{
- XVtc_Polarity Polarity = {0};
- XVtc_Signal Signal = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0};
- XVtc_HoriOffsets Hoff = {0};
+ XVtc_Polarity Polarity;
+ XVtc_Signal Signal;
+ XVtc_HoriOffsets Hoff;
/* Verify arguments */
Xil_AssertVoid(InstancePtr != NULL);
Xil_AssertVoid(InstancePtr->IsReady == (u32)(XIL_COMPONENT_IS_READY));
Xil_AssertVoid(TimingPtr != NULL);
- /* Signal.OriginMode = 1U */
- XVtc_GetDetector(InstancePtr, &Signal);
- XVtc_GetDetectorPolarity(InstancePtr, &Polarity);
- XVtc_GetDetectorHoriOffset(InstancePtr, &Hoff);
+
+ Signal.OriginMode = 1;
+ XVtc_GetDetector(InstancePtr, &Signal);
+ XVtc_GetDetectorPolarity(InstancePtr, &Polarity);
+ XVtc_GetDetectorHoriOffset(InstancePtr, &Hoff);
XVtc_ConvSignal2Timing(InstancePtr, &Signal, &Hoff, &Polarity,
TimingPtr);
diff --git a/XilinxProcessorIPLib/drivers/vtc/src/xvtc_intr.c b/XilinxProcessorIPLib/drivers/vtc/src/xvtc_intr.c
index 750b7b8c..13123e98 100755
--- a/XilinxProcessorIPLib/drivers/vtc/src/xvtc_intr.c
+++ b/XilinxProcessorIPLib/drivers/vtc/src/xvtc_intr.c
@@ -184,36 +184,31 @@ void XVtc_IntrHandler(void *InstancePtr)
if ((u32)0x0 == (PendingIntr | (XVTC_IXR_ALLINTR_MASK))) {
ErrorStatus = (u32)0x0;
XVtcPtr->ErrCallBack(XVtcPtr->ErrRef, ErrorStatus);
+ return;
}
/* A generator event has happened */
- if ((PendingIntr & (XVTC_IXR_G_ALL_MASK)) ==
- (XVTC_IXR_G_ALL_MASK)) {
- XVtcPtr->GeneratorCallBack
- (XVtcPtr->GeneratorRef, PendingIntr);
- }
+ if ((PendingIntr & XVTC_IXR_G_ALL_MASK))
+ XVtcPtr->GeneratorCallBack(XVtcPtr->GeneratorRef,
+ PendingIntr);
/* A detector event has happened */
- if ((PendingIntr & (XVTC_IXR_D_ALL_MASK)) ==
- (XVTC_IXR_D_ALL_MASK)) {
- XVtcPtr->DetectorCallBack
- (XVtcPtr->DetectorRef, PendingIntr);
- }
+ if ((PendingIntr & XVTC_IXR_D_ALL_MASK))
+ XVtcPtr->DetectorCallBack(XVtcPtr->DetectorRef,
+ PendingIntr);
- /* A frame sync has happened */
- if ((PendingIntr & (XVTC_IXR_FSYNCALL_MASK)) ==
- (XVTC_IXR_FSYNCALL_MASK)) {
- XVtcPtr->FrameSyncCallBack
- (XVtcPtr->FrameSyncRef, PendingIntr);
- }
+ /* A frame sync is done */
+ if ((PendingIntr & XVTC_IXR_FSYNCALL_MASK))
+ XVtcPtr->FrameSyncCallBack(XVtcPtr->FrameSyncRef,
+ PendingIntr);
- /* A signal lock has happened */
- if ((PendingIntr & (XVTC_IXR_LOCKALL_MASK)) ==
- (XVTC_IXR_LOCKALL_MASK)) {
- XVtcPtr->LockCallBack(XVtcPtr->LockRef, PendingIntr);
- }
+ /* A signal lock is detected */
+ if ((PendingIntr & XVTC_IXR_LOCKALL_MASK))
+ XVtcPtr->LockCallBack(XVtcPtr->LockRef,
+ PendingIntr);
}
+
/*****************************************************************************/
/**
*