From 201d9e148a6e65eea40f01938730a476288b2542 Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Sun, 29 Mar 2015 10:55:25 -0700 Subject: [PATCH] dp: mst: Renamed link address related structures to reflect RX/TX commonality. Signed-off-by: Andrei-Liviu Simion --- XilinxProcessorIPLib/drivers/dp/src/xdp.h | 13 ++++++++---- XilinxProcessorIPLib/drivers/dp/src/xdp_mst.c | 20 +++++++++---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/dp/src/xdp.h b/XilinxProcessorIPLib/drivers/dp/src/xdp.h index 475607eb..1ea2c715 100644 --- a/XilinxProcessorIPLib/drivers/dp/src/xdp.h +++ b/XilinxProcessorIPLib/drivers/dp/src/xdp.h @@ -544,7 +544,7 @@ typedef struct { port can handle. */ u8 NumSdpStreamSinks; /**< The number of SDP streams associated with this port. */ -} XDp_TxSbMsgLinkAddressReplyPortDetail; +} XDp_SbMsgLinkAddressReplyPortDetail; /** * This typedef describes a DisplayPort branch device. This structure is used @@ -555,10 +555,10 @@ typedef struct { of the branch device. */ u8 NumPorts; /**< The number of ports associated with this branch device. */ - XDp_TxSbMsgLinkAddressReplyPortDetail PortDetails[16]; /**< An array + XDp_SbMsgLinkAddressReplyPortDetail PortDetails[16]; /**< An array describing all ports attached to this branch device. */ -} XDp_TxSbMsgLinkAddressReplyDeviceInfo; +} XDp_SbMsgLinkAddressReplyDeviceInfo; /** * This typedef contains configuration information about the main link settings. @@ -955,7 +955,7 @@ u32 XDp_TxSendSbMsgRemoteIicRead(XDp *InstancePtr, u8 LinkCountTotal, u8 *RelativeAddress, u8 IicDeviceId, u8 Offset, u8 BytesToRead, u8 *ReadData); u32 XDp_TxSendSbMsgLinkAddress(XDp *InstancePtr, u8 LinkCountTotal, - u8 *RelativeAddress, XDp_TxSbMsgLinkAddressReplyDeviceInfo *DeviceInfo); + u8 *RelativeAddress, XDp_SbMsgLinkAddressReplyDeviceInfo *DeviceInfo); u32 XDp_TxSendSbMsgEnumPathResources(XDp *InstancePtr, u8 LinkCountTotal, u8 *RelativeAddress, u16 *AvailPbn, u16 *FullPbn); u32 XDp_TxSendSbMsgAllocatePayload(XDp *InstancePtr, u8 LinkCountTotal, @@ -1040,4 +1040,9 @@ void XDp_RxSetUserPixelWidth(XDp *InstancePtr, u8 UserPixelWidth); #define XDPTX XDP_TX #define XDPRX XDP_RX +#define XDp_TxSbMsgLinkAddressReplyDeviceInfo \ + XDp_SbMsgLinkAddressReplyDeviceInfo +#define XDp_TxSbMsgLinkAddressReplyPortDetail \ + XDp_SbMsgLinkAddressReplyPortDetail + #endif /* XDP_H_ */ diff --git a/XilinxProcessorIPLib/drivers/dp/src/xdp_mst.c b/XilinxProcessorIPLib/drivers/dp/src/xdp_mst.c index 911f0733..56dc8014 100644 --- a/XilinxProcessorIPLib/drivers/dp/src/xdp_mst.c +++ b/XilinxProcessorIPLib/drivers/dp/src/xdp_mst.c @@ -152,14 +152,14 @@ static void XDp_TxIssueGuid(XDp *InstancePtr, u8 LinkCountTotal, u8 *RelativeAddress, XDp_TxTopology *Topology, u32 *Guid); static void XDp_TxAddBranchToList(XDp *InstancePtr, - XDp_TxSbMsgLinkAddressReplyDeviceInfo *DeviceInfo, + XDp_SbMsgLinkAddressReplyDeviceInfo *DeviceInfo, u8 LinkCountTotal, u8 *RelativeAddress); static void XDp_TxAddSinkToList(XDp *InstancePtr, - XDp_TxSbMsgLinkAddressReplyPortDetail *SinkDevice, + XDp_SbMsgLinkAddressReplyPortDetail *SinkDevice, u8 LinkCountTotal, u8 *RelativeAddress); static void XDp_TxGetDeviceInfoFromSbMsgLinkAddress( XDp_SidebandReply *SbReply, - XDp_TxSbMsgLinkAddressReplyDeviceInfo *FormatReply); + XDp_SbMsgLinkAddressReplyDeviceInfo *FormatReply); static u32 XDp_TxGetFirstAvailableTs(XDp *InstancePtr, u8 *FirstTs); static u32 XDp_TxSendActTrigger(XDp *InstancePtr); static u32 XDp_SendSbMsgFragment(XDp *InstancePtr, XDp_SidebandMsg *Msg); @@ -641,8 +641,8 @@ u32 XDp_TxFindAccessibleDpDevices(XDp *InstancePtr, u8 LinkCountTotal, u8 NumDownBranches = 0; u8 OverallFailures = 0; XDp_TxTopology *Topology; - XDp_TxSbMsgLinkAddressReplyPortDetail *PortDetails; - static XDp_TxSbMsgLinkAddressReplyDeviceInfo DeviceInfo; + XDp_SbMsgLinkAddressReplyPortDetail *PortDetails; + static XDp_SbMsgLinkAddressReplyDeviceInfo DeviceInfo; /* Verify arguments. */ Xil_AssertNonvoid(InstancePtr != NULL); @@ -1909,7 +1909,7 @@ u32 XDp_TxSendSbMsgRemoteIicRead(XDp *InstancePtr, u8 LinkCountTotal, * *******************************************************************************/ u32 XDp_TxSendSbMsgLinkAddress(XDp *InstancePtr, u8 LinkCountTotal, - u8 *RelativeAddress, XDp_TxSbMsgLinkAddressReplyDeviceInfo *DeviceInfo) + u8 *RelativeAddress, XDp_SbMsgLinkAddressReplyDeviceInfo *DeviceInfo) { u32 Status; XDp_SidebandMsg Msg; @@ -2348,7 +2348,7 @@ static void XDp_TxIssueGuid(XDp *InstancePtr, u8 LinkCountTotal, * *******************************************************************************/ static void XDp_TxAddBranchToList(XDp *InstancePtr, - XDp_TxSbMsgLinkAddressReplyDeviceInfo *DeviceInfo, + XDp_SbMsgLinkAddressReplyDeviceInfo *DeviceInfo, u8 LinkCountTotal, u8 *RelativeAddress) { u8 Index; @@ -2393,7 +2393,7 @@ static void XDp_TxAddBranchToList(XDp *InstancePtr, * *******************************************************************************/ static void XDp_TxAddSinkToList(XDp *InstancePtr, - XDp_TxSbMsgLinkAddressReplyPortDetail *SinkDevice, + XDp_SbMsgLinkAddressReplyPortDetail *SinkDevice, u8 LinkCountTotal, u8 *RelativeAddress) { u8 Index; @@ -2445,11 +2445,11 @@ static void XDp_TxAddSinkToList(XDp *InstancePtr, * *******************************************************************************/ static void XDp_TxGetDeviceInfoFromSbMsgLinkAddress(XDp_SidebandReply - *SbReply, XDp_TxSbMsgLinkAddressReplyDeviceInfo *FormatReply) + *SbReply, XDp_SbMsgLinkAddressReplyDeviceInfo *FormatReply) { u8 ReplyIndex = 1; u8 Index, Index2; - XDp_TxSbMsgLinkAddressReplyPortDetail *PortDetails; + XDp_SbMsgLinkAddressReplyPortDetail *PortDetails; /* Determine the device information from the sideband message reply * structure. */