stv0g/embeddedsw
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

dptx: Fixed some bugs introduced with asserts.

Browse source 
Signed-off-by: Andrei-Liviu Simion <andrei.simion@xilinx.com>
This commit is contained in:
Andrei-Liviu Simion 2014-08-10 23:37:06 -07:00 • committed by Jagannadha Sutradharudu Teki
parent a5ac285040
commit be98293a83
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
XilinxProcessorIPLib/drivers/dptx/src/xdptx_mst.c
View file

@ -341,7 +341,6 @@ u32 XDptx_MstEnable(XDptx *InstancePtr)
XDptx_WriteReg(InstancePtr->Config.BaseAddr, XDPTX_TX_MST_CONFIG, XDptx_WriteReg(InstancePtr->Config.BaseAddr, XDPTX_TX_MST_CONFIG,
XDPTX_TX_MST_CONFIG_MST_EN_MASK); XDPTX_TX_MST_CONFIG_MST_EN_MASK);
XDptx_MstCfgModeEnable(InstancePtr);
return XST_SUCCESS; return XST_SUCCESS;
} }
@ -382,7 +381,6 @@ u32 XDptx_MstDisable(XDptx *InstancePtr)
/* Disable MST mode in the DisplayPort TX. */ /* Disable MST mode in the DisplayPort TX. */
XDptx_WriteReg(InstancePtr->Config.BaseAddr, XDPTX_TX_MST_CONFIG, 0x0); XDptx_WriteReg(InstancePtr->Config.BaseAddr, XDPTX_TX_MST_CONFIG, 0x0);
XDptx_MstCfgModeDisable(InstancePtr);
return XST_SUCCESS; return XST_SUCCESS;
} }

4
XilinxProcessorIPLib/drivers/dptx/src/xdptx_spm.c
View file

@ -280,7 +280,6 @@ void XDptx_CfgMsaUseStandardVideoMode(XDptx *InstancePtr, u8 Stream,
/* Verify arguments. */ /* Verify arguments. */
Xil_AssertVoid(InstancePtr != NULL); Xil_AssertVoid(InstancePtr != NULL);
Xil_AssertVoid(MsaConfig != NULL);
Xil_AssertVoid(VideoMode <= XDPTX_VM_LAST); Xil_AssertVoid(VideoMode <= XDPTX_VM_LAST);
Xil_AssertVoid((Stream == XDPTX_STREAM_ID1) || Xil_AssertVoid((Stream == XDPTX_STREAM_ID1) ||
(Stream == XDPTX_STREAM_ID2) || (Stream == XDPTX_STREAM_ID3) || (Stream == XDPTX_STREAM_ID2) || (Stream == XDPTX_STREAM_ID3) ||
@ -332,8 +331,6 @@ void XDptx_CfgMsaUseEdidPreferredTiming(XDptx *InstancePtr, u8 Stream)
/* Verify arguments. */ /* Verify arguments. */
Xil_AssertVoid(InstancePtr != NULL); Xil_AssertVoid(InstancePtr != NULL);
Xil_AssertVoid(MsaConfig != NULL);
Xil_AssertVoid(Ptm != NULL);
Xil_AssertVoid((Stream == XDPTX_STREAM_ID1) || Xil_AssertVoid((Stream == XDPTX_STREAM_ID1) ||
(Stream == XDPTX_STREAM_ID2) || (Stream == XDPTX_STREAM_ID3) || (Stream == XDPTX_STREAM_ID2) || (Stream == XDPTX_STREAM_ID3) ||
(Stream == XDPTX_STREAM_ID4)); (Stream == XDPTX_STREAM_ID4));
@ -445,7 +442,6 @@ void XDptx_CfgMsaUseCustom(XDptx *InstancePtr, u8 Stream,
Xil_AssertVoid((Stream == XDPTX_STREAM_ID1) || Xil_AssertVoid((Stream == XDPTX_STREAM_ID1) ||
(Stream == XDPTX_STREAM_ID2) || (Stream == XDPTX_STREAM_ID3) || (Stream == XDPTX_STREAM_ID2) || (Stream == XDPTX_STREAM_ID3) ||
(Stream == XDPTX_STREAM_ID4)); (Stream == XDPTX_STREAM_ID4));
Xil_AssertVoid(MsaConfig != NULL);
Xil_AssertVoid(MsaConfigCustom != NULL); Xil_AssertVoid(MsaConfigCustom != NULL);
MsaConfig = &InstancePtr->MsaConfig[Stream - 1]; MsaConfig = &InstancePtr->MsaConfig[Stream - 1];