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>
This commit is contained in:
Durga challa 2014-08-13 18:46:45 +05:30 committed by Jagannadha Sutradharudu Teki
parent 0ef01dc0d1
commit 37cee8b315
2 changed files with 34 additions and 42 deletions

View file

@ -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);

View file

@ -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);
}
/*****************************************************************************/
/**
*