diff --git a/XilinxProcessorIPLib/drivers/dp/data/dependencies.props b/XilinxProcessorIPLib/drivers/dp/data/dependencies.props
index e503e0f4..17983bbf 100644
--- a/XilinxProcessorIPLib/drivers/dp/data/dependencies.props
+++ b/XilinxProcessorIPLib/drivers/dp/data/dependencies.props
@@ -1,7 +1,7 @@
-xdprx_intr_timer_example.c=xdprx_intr_timer_example.c
-xdptx_audio_example.c=xdptx_example_common.h,xdptx_example_common.c
-xdptx_intr_example.c=xdptx_example_common.h,xdptx_example_common.c
-xdptx_mst_example.c=xdptx_example_common.h,xdptx_example_common.c
-xdptx_poll_example.c=xdptx_example_common.h,xdptx_example_common.c
-xdptx_selftest_example.c=xdptx_example_common.h,xdptx_example_common.c
-xdptx_timer_example.c=xdptx_example_common.h,xdptx_example_common.c
+xdp_selftest_example.c=xdp_selftest_example.c
+xdp_rx_intr_timer_example.c=xdp_rx_intr_timer_example.c
+xdp_tx_audio_example.c=xdp_tx_example_common.h,xdp_tx_example_common.c
+xdp_tx_intr_example.c=xdp_tx_example_common.h,xdp_tx_example_common.c
+xdp_tx_mst_example.c=xdp_tx_example_common.h,xdp_tx_example_common.c
+xdp_tx_poll_example.c=xdp_tx_example_common.h,xdp_tx_example_common.c
+xdp_tx_timer_example.c=xdp_tx_example_common.h,xdp_tx_example_common.c
diff --git a/XilinxProcessorIPLib/drivers/dp/examples/index.html b/XilinxProcessorIPLib/drivers/dp/examples/index.html
index eaec9b27..8b844ff1 100755
--- a/XilinxProcessorIPLib/drivers/dp/examples/index.html
+++ b/XilinxProcessorIPLib/drivers/dp/examples/index.html
@@ -10,13 +10,13 @@
Example applications for the dp driver.
Copyright © 1995-2015 Xilinx, Inc. All rights reserved.
diff --git a/XilinxProcessorIPLib/drivers/dp/examples/readme.txt b/XilinxProcessorIPLib/drivers/dp/examples/readme.txt
index 60aa436b..98cfaec6 100644
--- a/XilinxProcessorIPLib/drivers/dp/examples/readme.txt
+++ b/XilinxProcessorIPLib/drivers/dp/examples/readme.txt
@@ -1,5 +1,5 @@
There is 1 DisplayPort RX example included in this directory:
-1) xdprx_intr_timer_example.c : This interrupt with timer example shows how to
+1) xdp_rx_intr_timer_example.c : This interrupt with timer example shows how to
set up both the interrupt system with interrupt handlers and how to override
the default sleep/delay functionality for MicroBlaze. A timer needs to exist
in the hardware system and will be used for sleep/delay functionality inside
@@ -10,13 +10,13 @@ There is 1 DisplayPort RX example included in this directory:
built-in.
Note: All example functions start with Dprx_*, while all driver functions start
-with XDprx_*.
+with XDp_*.
There are 6 DisplayPort TX examples included in this directory:
-1) xdptx_audio_example.c : This audio example, apart from training the main link
- and outputting video, illustrates the sequence required for setting up audio
- in the DisplayPort TX. This example requires that an audio source, such as a
- S/PDIF instance be present and connected to the DisplayPort TX in the
+1) xdp_tx_audio_example.c : This audio example, apart from training the main
+ link and outputting video, illustrates the sequence required for setting up
+ audio in the DisplayPort TX. This example requires that an audio source, such
+ as a S/PDIF instance be present and connected to the DisplayPort TX in the
hardware system, and for the audio enable configuration parameter to be set
for the instantiated DisplayPort TX. For audio to output, the user will need
to implement the following functions:
@@ -25,12 +25,12 @@ There are 6 DisplayPort TX examples included in this directory:
b) Dptx_AudioSendInfoFrame : This function needs to set up and write an audio
info frame as per user requirements.
-2) xdptx_intr_example.c : This interrupt example shows how to set up the
+2) xdp_tx_intr_example.c : This interrupt example shows how to set up the
interrupt system and specify the interrupt handlers for when a DisplayPort
interrupt event occurs. An interrupt controller with a connection to the
DisplayPort interrupt signal needs to exist in the hardware system.
-3) xdptx_mst_example.c : This multi-stream transport (MST) example shows how to
+3) xdp_tx_mst_example.c : This multi-stream transport (MST) example shows how to
use the driver's MST capabilities. Streams can be directed at sinks using two
methods:
a) After topology discover has created a sink list, streams may be assigned
@@ -39,10 +39,10 @@ There are 6 DisplayPort TX examples included in this directory:
discovery if their relative addresses (and total number of DisplayPort
links) from the DisplayPort source is known beforehand.
-4) xdptx_poll_example.c : This interrupt example shows how to poll the
+4) xdp_tx_poll_example.c : This interrupt example shows how to poll the
DisplayPort TX instance's registers for DisplayPort interrupt events.
-5) xdptx_timer_example.c : This timer example shows how to override the default
+5) xdp_tx_timer_example.c : This timer example shows how to override the default
sleep/delay functionality for MicroBlaze. A timer needs to exist in the
hardware system and will be used for sleep/delay functionality inside of a
callback function. The default behavior in MicroBlaze for sleep/delay is to
@@ -50,13 +50,13 @@ There are 6 DisplayPort TX examples included in this directory:
For ARM/Zynq SoC systems, the supplied callback function will be ignored -
the usleep function will be called since the SoC has a timer built-in.
-6) xdptx_selftest_example.c : This self test example will perform a sanity check
- on the state of the DisplayPort TX instance. It may be called prior to usage
- of the core or after a reset to ensure that (a subset of) the registers hold
- their default values.
+6) xdp_tx_selftest_example.c : This self test example will perform a sanity
+ check on the state of the DisplayPort TX instance. It may be called prior to
+ usage of the core or after a reset to ensure that (a subset of) the registers
+ hold their default values.
Each of these examples are meant to be used in conjunction with
-xdptx_example_common.[ch] which holds common functionality for all examples.
+xdp_tx_example_common.[ch] which holds common functionality for all examples.
After importing the examples, these files will need to be manually copied into
the example src/ directory.
This code shows how to train the main link and set up a video stream.
@@ -70,7 +70,7 @@ examples, the user will need to implement and link the following functions:
timings and video attributes that correspond to the main stream attributes
(MSA) configuration, is received by the DisplayPort Tx. The examples call
this function from the Dptx_Run->Dptx_StartVideoStream functions in
- xdptx_example_common.c.
+ xdp_tx_example_common.c.
Note: All example functions start with Dptx_*, while all driver functions start
-with XDptx_*.
+with XDp_*.
diff --git a/XilinxProcessorIPLib/drivers/dp/examples/xdprx_intr_timer_example.c b/XilinxProcessorIPLib/drivers/dp/examples/xdp_rx_intr_timer_example.c
similarity index 83%
rename from XilinxProcessorIPLib/drivers/dp/examples/xdprx_intr_timer_example.c
rename to XilinxProcessorIPLib/drivers/dp/examples/xdp_rx_intr_timer_example.c
index fdd11386..8394539c 100644
--- a/XilinxProcessorIPLib/drivers/dp/examples/xdprx_intr_timer_example.c
+++ b/XilinxProcessorIPLib/drivers/dp/examples/xdp_rx_intr_timer_example.c
@@ -32,9 +32,9 @@
/******************************************************************************/
/**
*
- * @file xdprx_intr_timer_example.c
+ * @file xdp_rx_intr_timer_example.c
*
- * Contains a design example using the XDprx driver with a user-defined hook
+ * Contains a design example using the XDp driver with a user-defined hook
* for delay. The reasoning behind this is that MicroBlaze sleep is not very
* accurate without a hardware timer. For systems that have a hardware timer,
* the user may override the default MicroBlaze sleep with a function that will
@@ -46,7 +46,8 @@
* This example will print out the detected resolution of the incoming
* DisplayPort video stream.
* This example is meant to take in the incoming DisplayPort video stream and
- * output it over HDMI (pass-through).
+ * pass it through using the Dprd_Vidpipe* functions which are left for the user
+ * to implement.
*
* @note This example requires an AXI timer in the system.
* @note For this example to work, the user will need to implement
@@ -68,7 +69,7 @@
/******************************* Include Files ********************************/
-#include "xdprx.h"
+#include "xdp.h"
#include "xparameters.h"
#ifdef XPAR_INTC_0_DEVICE_ID
/* For MicroBlaze systems. */
@@ -107,10 +108,10 @@ XPAR_PROCESSOR_SUBSYSTEM_INTERCONNECT_AXI_INTC_1_DISPLAYPORT_0_AXI_INT_INTR
/**************************** Function Prototypes *****************************/
-u32 Dprx_IntrTimerExample(XDprx *InstancePtr, u16 DeviceId, INTC *IntcPtr,
+u32 Dprx_IntrTimerExample(XDp *InstancePtr, u16 DeviceId, INTC *IntcPtr,
u16 IntrId, u16 DpIntrId, XTmrCtr *TimerCounterPtr);
-static u32 Dprx_SetupExample(XDprx *InstancePtr, u16 DeviceId);
-static u32 Dprx_SetupInterruptHandler(XDprx *InstancePtr, INTC *IntcPtr,
+static u32 Dprx_SetupExample(XDp *InstancePtr, u16 DeviceId);
+static u32 Dprx_SetupInterruptHandler(XDp *InstancePtr, INTC *IntcPtr,
u16 IntrId, u16 DpIntrId);
static void Dprx_CustomWaitUs(void *InstancePtr, u32 MicroSeconds);
static void Dprx_ResetVideoOutput(void *InstancePtr);
@@ -127,12 +128,12 @@ static void Dprx_InterruptHandlerTp1(void *InstancePtr);
static void Dprx_InterruptHandlerTp2(void *InstancePtr);
static void Dprx_InterruptHandlerTp3(void *InstancePtr);
-extern void Dprx_VidpipeConfig(XDprx *InstancePtr);
+extern void Dprx_VidpipeConfig(XDp *InstancePtr);
extern void Dprx_VidpipeReset(void);
/*************************** Variable Declarations ****************************/
-XDprx DprxInstance; /* The Dprx instance. */
+XDp DpInstance; /* The Dp instance. */
INTC IntcInstance; /* The interrupt controller instance. */
XTmrCtr TimerCounterInst; /* The timer counter instance. */
@@ -144,9 +145,9 @@ u8 VBlankCount;
/******************************************************************************/
/**
- * This function is the main function of the XDprx interrupt with timer example.
- * If the DprxIntrTimerExample function, which sets up the system succeeds, this
- * function will wait for interrupts.
+ * This function is the main function of the XDp (operating in RX mode)
+ * interrupt with timer example. If the Dprx_IntrTimerExample function, which
+ * sets up the system succeeds, this function will wait for interrupts.
*
* @param None.
*
@@ -155,15 +156,15 @@ u8 VBlankCount;
* setup failed.
*
* @note Unless setup failed, main will never return since
- * DprxIntrTimerExample is blocking.
+ * Dprx_IntrTimerExample is blocking.
*
*******************************************************************************/
int main(void)
{
u32 Status;
- /* Run the XDprx timer example. */
- Status = Dprx_IntrTimerExample(&DprxInstance, DPRX_DEVICE_ID,
+ /* Run the XDp (in RX mode) interrupt with timer example. */
+ Status = Dprx_IntrTimerExample(&DpInstance, DPRX_DEVICE_ID,
&IntcInstance, INTC_DEVICE_ID, DP_INTERRUPT_ID,
&TimerCounterInst);
if (Status != XST_SUCCESS) {
@@ -175,11 +176,11 @@ int main(void)
/******************************************************************************/
/**
- * The main entry point for the interrupt with timer example using the XDprx
+ * The main entry point for the interrupt with timer example using the XDp
* driver. This function will set up the system, interrupt controller and
* interrupt handlers, and the custom sleep handler.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
* @param DeviceId is the unique device ID of the DisplayPort RX core
* instance.
* @param IntcPtr is a pointer to the interrupt instance.
@@ -196,7 +197,7 @@ int main(void)
* @note None.
*
*******************************************************************************/
-u32 Dprx_IntrTimerExample(XDprx *InstancePtr, u16 DeviceId, INTC *IntcPtr,
+u32 Dprx_IntrTimerExample(XDp *InstancePtr, u16 DeviceId, INTC *IntcPtr,
u16 IntrId, u16 DpIntrId, XTmrCtr *TimerCounterPtr)
{
u32 Status;
@@ -212,7 +213,7 @@ u32 Dprx_IntrTimerExample(XDprx *InstancePtr, u16 DeviceId, INTC *IntcPtr,
* Note: This only has an affect for MicroBlaze systems since the Zynq
* ARM SoC contains a timer, which is used when the driver calls the
* delay function. */
- XDprx_SetUserTimerHandler(InstancePtr, &Dprx_CustomWaitUs,
+ XDp_SetUserTimerHandler(InstancePtr, &Dprx_CustomWaitUs,
TimerCounterPtr);
/* Setup interrupt handling in the system. */
@@ -239,7 +240,7 @@ u32 Dprx_IntrTimerExample(XDprx *InstancePtr, u16 DeviceId, INTC *IntcPtr,
* configuration parameters will be retrieved based on the configuration
* to the DisplayPort RX core instance with the specified device ID.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
* @param DeviceId is the unique device ID of the DisplayPort RX core
* instance.
*
@@ -251,7 +252,7 @@ u32 Dprx_IntrTimerExample(XDprx *InstancePtr, u16 DeviceId, INTC *IntcPtr,
* @note None.
*
*******************************************************************************/
-static u32 Dprx_SetupExample(XDprx *InstancePtr, u16 DeviceId)
+static u32 Dprx_SetupExample(XDp *InstancePtr, u16 DeviceId)
{
XDp_Config *ConfigPtr;
u32 Status;
@@ -263,13 +264,13 @@ static u32 Dprx_SetupExample(XDprx *InstancePtr, u16 DeviceId)
}
/* Copy the device configuration into the InstancePtr's Config
* structure. */
- XDprx_CfgInitialize(InstancePtr, ConfigPtr, ConfigPtr->BaseAddr);
+ XDp_CfgInitialize(InstancePtr, ConfigPtr, ConfigPtr->BaseAddr);
- XDprx_SetLaneCount(InstancePtr, InstancePtr->Config.MaxLaneCount);
- XDprx_SetLinkRate(InstancePtr, InstancePtr->Config.MaxLinkRate);
+ XDp_RxSetLaneCount(InstancePtr, InstancePtr->Config.MaxLaneCount);
+ XDp_RxSetLinkRate(InstancePtr, InstancePtr->Config.MaxLinkRate);
/* Initialize the DisplayPort RX core. */
- Status = XDprx_InitializeRx(InstancePtr);
+ Status = XDp_Initialize(InstancePtr);
if (Status != XST_SUCCESS) {
return XST_FAILURE;
}
@@ -285,7 +286,7 @@ static u32 Dprx_SetupExample(XDprx *InstancePtr, u16 DeviceId)
* to the processor. The user should modify this function to fit the
* application.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
* @param IntcPtr is a pointer to the interrupt instance.
* @param IntrId is the unique device ID of the interrupt controller.
* @param DpIntrId is the interrupt ID of the DisplayPort RX connection to
@@ -299,33 +300,33 @@ static u32 Dprx_SetupExample(XDprx *InstancePtr, u16 DeviceId)
* to the processor and the DisplayPort RX core.
*
*******************************************************************************/
-static u32 Dprx_SetupInterruptHandler(XDprx *InstancePtr, INTC *IntcPtr,
+static u32 Dprx_SetupInterruptHandler(XDp *InstancePtr, INTC *IntcPtr,
u16 IntrId, u16 DpIntrId)
{
u32 Status;
/* Set the HPD interrupt handlers. */
- XDprx_SetIntrVmChangeHandler(InstancePtr,
+ XDp_RxSetIntrVmChangeHandler(InstancePtr,
Dprx_InterruptHandlerVmChange, InstancePtr);
- XDprx_SetIntrPowerStateHandler(InstancePtr,
+ XDp_RxSetIntrPowerStateHandler(InstancePtr,
Dprx_InterruptHandlerPowerState, InstancePtr);
- XDprx_SetIntrNoVideoHandler(InstancePtr,
+ XDp_RxSetIntrNoVideoHandler(InstancePtr,
Dprx_InterruptHandlerNoVideo, InstancePtr);
- XDprx_SetIntrVBlankHandler(InstancePtr,
+ XDp_RxSetIntrVBlankHandler(InstancePtr,
Dprx_InterruptHandlerVBlank, InstancePtr);
- XDprx_SetIntrTrainingLostHandler(InstancePtr,
+ XDp_RxSetIntrTrainingLostHandler(InstancePtr,
Dprx_InterruptHandlerTrainingLost, InstancePtr);
- XDprx_SetIntrVideoHandler(InstancePtr,
+ XDp_RxSetIntrVideoHandler(InstancePtr,
Dprx_InterruptHandlerVideo, InstancePtr);
- XDprx_SetIntrTrainingDoneHandler(InstancePtr,
+ XDp_RxSetIntrTrainingDoneHandler(InstancePtr,
Dprx_InterruptHandlerTrainingDone, InstancePtr);
- XDprx_SetIntrBwChangeHandler(InstancePtr,
+ XDp_RxSetIntrBwChangeHandler(InstancePtr,
Dprx_InterruptHandlerBwChange, InstancePtr);
- XDprx_SetIntrTp1Handler(InstancePtr,
+ XDp_RxSetIntrTp1Handler(InstancePtr,
Dprx_InterruptHandlerTp1, InstancePtr);
- XDprx_SetIntrTp2Handler(InstancePtr,
+ XDp_RxSetIntrTp2Handler(InstancePtr,
Dprx_InterruptHandlerTp2, InstancePtr);
- XDprx_SetIntrTp3Handler(InstancePtr,
+ XDp_RxSetIntrTp3Handler(InstancePtr,
Dprx_InterruptHandlerTp3, InstancePtr);
/* Initialize interrupt controller driver. */
@@ -351,10 +352,10 @@ static u32 Dprx_SetupInterruptHandler(XDprx *InstancePtr, INTC *IntcPtr,
* the specific interrupt processing for the device. */
#ifdef XPAR_INTC_0_DEVICE_ID
Status = XIntc_Connect(IntcPtr, DpIntrId,
- (XInterruptHandler)XDprx_InterruptHandler, InstancePtr);
+ (XInterruptHandler)XDp_InterruptHandler, InstancePtr);
#else
Status = XScuGic_Connect(IntcPtr, DpIntrId,
- (Xil_InterruptHandler)XDprx_InterruptHandler, InstancePtr);
+ (Xil_InterruptHandler)XDp_InterruptHandler, InstancePtr);
#endif /* XPAR_INTC_0_DEVICE_ID */
if (Status != XST_SUCCESS) {
return XST_FAILURE;
@@ -388,43 +389,43 @@ static u32 Dprx_SetupInterruptHandler(XDprx *InstancePtr, INTC *IntcPtr,
/******************************************************************************/
/**
* This function is used to override the driver's default sleep functionality.
- * For MicroBlaze systems, the XDprx_WaitUs driver function's default behavior
+ * For MicroBlaze systems, the XDp_WaitUs driver function's default behavior
* is to use the MB_Sleep function from microblaze_sleep.h, which is implemented
* in software and only has millisecond accuracy. For this reason, using a
* hardware timer is preferrable. For ARM/Zynq SoC systems, the SoC's timer is
- * used - XDprx_WaitUs will ignore this custom timer handler.
+ * used - XDp_WaitUs will ignore this custom timer handler.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
- * @note Use the XDprx_SetUserTimerHandler driver function to set this
- * function as the handler for when the XDprx_WaitUs driver
+ * @note Use the XDp_SetUserTimerHandler driver function to set this
+ * function as the handler for when the XDp_WaitUs driver
* function is called.
*
*******************************************************************************/
static void Dprx_CustomWaitUs(void *InstancePtr, u32 MicroSeconds)
{
- XDprx *XDprx_InstancePtr = (XDprx *)InstancePtr;
+ XDp *XDp_InstancePtr = (XDp *)InstancePtr;
u32 TimerVal;
- XTmrCtr_Start(XDprx_InstancePtr->UserTimerPtr, 0);
+ XTmrCtr_Start(XDp_InstancePtr->UserTimerPtr, 0);
/* Wait specified number of useconds. */
do {
- TimerVal = XTmrCtr_GetValue(XDprx_InstancePtr->UserTimerPtr, 0);
+ TimerVal = XTmrCtr_GetValue(XDp_InstancePtr->UserTimerPtr, 0);
}
while (TimerVal < (MicroSeconds *
- (XDprx_InstancePtr->Config.SAxiClkHz / 1000000)));
+ (XDp_InstancePtr->Config.SAxiClkHz / 1000000)));
- XTmrCtr_Stop(XDprx_InstancePtr->UserTimerPtr, 0);
+ XTmrCtr_Stop(XDp_InstancePtr->UserTimerPtr, 0);
}
/******************************************************************************/
/**
* This function is used to reset video output for this example.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -434,7 +435,7 @@ static void Dprx_CustomWaitUs(void *InstancePtr, u32 MicroSeconds)
static void Dprx_ResetVideoOutput(void *InstancePtr)
{
xil_printf("\tDisabling the display timing generator.\n");
- XDprx_DtgDis(InstancePtr);
+ XDp_RxDtgDis(InstancePtr);
xil_printf("\tResetting the video output pipeline.\n");
/* This is hardware system specific - it is up to the user to implement
@@ -449,14 +450,14 @@ static void Dprx_ResetVideoOutput(void *InstancePtr)
/*******************/
xil_printf("\tRe-enabling the display timing generator.\n");
- XDprx_DtgEn(InstancePtr);
+ XDp_RxDtgEn(InstancePtr);
}
/******************************************************************************/
/**
* This function will present the resolution of the incoming video stream.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -470,12 +471,12 @@ static void Dprx_DetectResolution(void *InstancePtr)
u32 GetResCount = 0;
do {
- DpHres = (XDprx_ReadReg(((XDprx *)InstancePtr)->Config.BaseAddr,
- XDPRX_MSA_HRES));
- DpVres = (XDprx_ReadReg(((XDprx *)InstancePtr)->Config.BaseAddr,
- XDPRX_MSA_VHEIGHT));
+ DpHres = (XDp_ReadReg(((XDp *)InstancePtr)->Config.BaseAddr,
+ XDP_RX_MSA_HRES));
+ DpVres = (XDp_ReadReg(((XDp *)InstancePtr)->Config.BaseAddr,
+ XDP_RX_MSA_VHEIGHT));
GetResCount++;
- XDprx_WaitUs(InstancePtr, 1000);
+ XDp_WaitUs(InstancePtr, 1000);
} while (((DpHres == 0) || (DpVres == 0)) && (GetResCount < 2000));
xil_printf("\n*** Detected resolution: %d x %d ***\n", DpHres, DpVres);
@@ -486,7 +487,7 @@ static void Dprx_DetectResolution(void *InstancePtr)
* This function is the callback function for when a video mode chang interrupt
* occurs.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -499,7 +500,7 @@ static void Dprx_InterruptHandlerVmChange(void *InstancePtr)
xil_printf("> Interrupt: video mode change.\n");
- Status = XDprx_CheckLinkStatus(InstancePtr);
+ Status = XDp_RxCheckLinkStatus(InstancePtr);
if ((Status == XST_SUCCESS) && (VBlankCount >= 20)) {
Dprx_ResetVideoOutput(InstancePtr);
Dprx_DetectResolution(InstancePtr);
@@ -511,7 +512,7 @@ static void Dprx_InterruptHandlerVmChange(void *InstancePtr)
* This function is the callback function for when the power state interrupt
* occurs.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -527,7 +528,7 @@ static void Dprx_InterruptHandlerPowerState(void *InstancePtr)
/**
* This function is the callback function for when a no video interrupt occurs.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -545,7 +546,7 @@ static void Dprx_InterruptHandlerNoVideo(void *InstancePtr)
* This function is the callback function for when a vertical blanking interrupt
* occurs.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -566,10 +567,10 @@ static void Dprx_InterruptHandlerVBlank(void *InstancePtr)
* outputting any video stream. */
if (VBlankCount >= 20) {
VBlankEnable = 0;
- XDprx_InterruptDisable(InstancePtr,
- XDPRX_INTERRUPT_MASK_VBLANK_MASK);
+ XDp_RxInterruptDisable(InstancePtr,
+ XDP_RX_INTERRUPT_MASK_VBLANK_MASK);
- Status = XDprx_CheckLinkStatus(InstancePtr);
+ Status = XDp_RxCheckLinkStatus(InstancePtr);
if (Status == XST_SUCCESS) {
Dprx_ResetVideoOutput(InstancePtr);
Dprx_DetectResolution(InstancePtr);
@@ -583,7 +584,7 @@ static void Dprx_InterruptHandlerVBlank(void *InstancePtr)
* This function is the callback function for when a training lost interrupt
* occurs.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -596,11 +597,11 @@ static void Dprx_InterruptHandlerTrainingLost(void *InstancePtr)
/* Re-enable vertical blanking interrupt and counter. */
VBlankEnable = 1;
- XDprx_InterruptEnable(InstancePtr, XDPRX_INTERRUPT_MASK_VBLANK_MASK);
+ XDp_RxInterruptEnable(InstancePtr, XDP_RX_INTERRUPT_MASK_VBLANK_MASK);
VBlankCount = 0;
xil_printf("\tDisabling the display timing generator.\n");
- XDprx_DtgDis(InstancePtr);
+ XDp_RxDtgDis(InstancePtr);
xil_printf("\tResetting the video output pipeline.\n");
/* This is hardware system specific - it is up to the user to implement
* this function if needed. */
@@ -613,7 +614,7 @@ static void Dprx_InterruptHandlerTrainingLost(void *InstancePtr)
* This function is the callback function for when a valid video interrupt
* occurs.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -631,7 +632,7 @@ static void Dprx_InterruptHandlerVideo(void *InstancePtr)
* This function is the callback function for when a training done interrupt
* occurs.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -648,7 +649,7 @@ static void Dprx_InterruptHandlerTrainingDone(void *InstancePtr)
* This function is the callback function for when a bandwidth change interrupt
* occurs.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -665,7 +666,7 @@ static void Dprx_InterruptHandlerBwChange(void *InstancePtr)
* This function is the callback function for when a training pattern 1
* interrupt occurs.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -682,7 +683,7 @@ static void Dprx_InterruptHandlerTp1(void *InstancePtr)
* This function is the callback function for when a training pattern 2
* interrupt occurs.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -699,7 +700,7 @@ static void Dprx_InterruptHandlerTp2(void *InstancePtr)
* This function is the callback function for when a training pattern 3
* interrupt occurs.
*
- * @param InstancePtr is a pointer to the XDprx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
diff --git a/XilinxProcessorIPLib/drivers/dp/examples/xdptx_selftest_example.c b/XilinxProcessorIPLib/drivers/dp/examples/xdp_selftest_example.c
similarity index 77%
rename from XilinxProcessorIPLib/drivers/dp/examples/xdptx_selftest_example.c
rename to XilinxProcessorIPLib/drivers/dp/examples/xdp_selftest_example.c
index 9f4f8b43..e03beb8f 100644
--- a/XilinxProcessorIPLib/drivers/dp/examples/xdptx_selftest_example.c
+++ b/XilinxProcessorIPLib/drivers/dp/examples/xdp_selftest_example.c
@@ -32,10 +32,10 @@
/******************************************************************************/
/**
*
- * @file xdptx_selftest_example.c
+ * @file xdp_selftest_example.c
*
- * Contains a design example using the XDptx driver. It performs a self test on
- * the DisplayPort TX core that will compare many of the DisplayPort TX core's
+ * Contains a design example using the XDp driver. It performs a self test on
+ * the DisplayPort TX/RX core that will compare many of the DisplayPort core's
* registers against their default reset values.
*
* @note None.
@@ -45,24 +45,33 @@
*
* Ver Who Date Changes
* ----- ---- -------- -----------------------------------------------
- * 1.0 als 06/17/14 Initial creation.
+ * 1.0 als 01/20/15 Initial creation.
*
*
*******************************************************************************/
/******************************* Include Files ********************************/
-#include "xdptx_example_common.h"
+#include "xdp.h"
+#include "xparameters.h"
+
+/**************************** Constant Definitions ****************************/
+
+#define DP_DEVICE_ID XPAR_DISPLAYPORT_0_DEVICE_ID
/**************************** Function Prototypes *****************************/
-u32 Dptx_SelfTestExample(XDptx *InstancePtr, u16 DeviceId);
+u32 Dp_SelfTestExample(XDp *InstancePtr, u16 DeviceId);
+
+/*************************** Variable Declarations ****************************/
+
+XDp DpInstance;
/**************************** Function Definitions ****************************/
/******************************************************************************/
/**
- * This function is the main function of the XDptx selftest example.
+ * This function is the main function of the XDp selftest example.
*
* @param None.
*
@@ -79,23 +88,23 @@ int main(void)
{
u32 Status;
- Status = Dptx_SelfTestExample(&DptxInstance, DPTX_DEVICE_ID);
+ Status = Dp_SelfTestExample(&DpInstance, DP_DEVICE_ID);
if (Status != XST_SUCCESS) {
- xil_printf("XDptx_SelfTest failed, check register values.\n");
+ xil_printf("XDp_SelfTest failed, check register values.\n");
return XST_FAILURE;
}
- xil_printf("XDptx_SelfTest passed.\n");
+ xil_printf("XDp_SelfTest passed.\n");
return Status;
}
/******************************************************************************/
/**
- * The main entry point for the selftest example using the XDptx driver. This
+ * The main entry point for the selftest example using the XDp driver. This
* function will check whether or not the DisplayPort TX's registers are at
* their default reset values to ensure that the core is in a known and working
* state.
*
- * @param InstancePtr is a pointer to the XDptx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
* @param DeviceId is the unique device ID of the DisplayPort TX core
* instance.
*
@@ -108,21 +117,21 @@ int main(void)
* @note None.
*
*******************************************************************************/
-u32 Dptx_SelfTestExample(XDptx *InstancePtr, u16 DeviceId)
+u32 Dp_SelfTestExample(XDp *InstancePtr, u16 DeviceId)
{
u32 Status;
- XDptx_Config *ConfigPtr;
+ XDp_Config *ConfigPtr;
/* Obtain the device configuration for the DisplayPort TX core. */
- ConfigPtr = XDptx_LookupConfig(DeviceId);
+ ConfigPtr = XDp_LookupConfig(DeviceId);
if (!ConfigPtr) {
return XST_FAILURE;
}
/* Copy the device configuration into the InstancePtr's Config
* structure. */
- XDptx_CfgInitialize(InstancePtr, ConfigPtr, ConfigPtr->BaseAddr);
+ XDp_CfgInitialize(InstancePtr, ConfigPtr, ConfigPtr->BaseAddr);
/* Run the self test. */
- Status = XDptx_SelfTest(InstancePtr);
+ Status = XDp_SelfTest(InstancePtr);
return Status;
}
diff --git a/XilinxProcessorIPLib/drivers/dp/examples/xdptx_audio_example.c b/XilinxProcessorIPLib/drivers/dp/examples/xdp_tx_audio_example.c
similarity index 76%
rename from XilinxProcessorIPLib/drivers/dp/examples/xdptx_audio_example.c
rename to XilinxProcessorIPLib/drivers/dp/examples/xdp_tx_audio_example.c
index 2d943a18..f76b1922 100644
--- a/XilinxProcessorIPLib/drivers/dp/examples/xdptx_audio_example.c
+++ b/XilinxProcessorIPLib/drivers/dp/examples/xdp_tx_audio_example.c
@@ -32,11 +32,11 @@
/******************************************************************************/
/**
*
- * @file xdptx_audio_example.c
+ * @file xdp_tx_audio_example.c
*
- * Contains a design example using the XDptx driver to train the main link and
- * to display video. In this example application, the sequence to enable audio
- * is illustrated.
+ * Contains a design example using the XDp driver (operating in TX mode) to
+ * train the main link and to display video. In this example application, the
+ * sequence to enable audio is illustrated.
*
* @note This example requires an audio source such as an S/PDIF instance
* to be part of the hardware system. See XAPP1178 for reference.
@@ -52,10 +52,10 @@
* @note For this example to display output, after training is complete,
* the user will need to implement configuration of the video
* stream source in order to provide the DisplayPort core with
- * input (Dptx_StreamSrc* - called in xdptx_example_common.c). See
+ * input (Dptx_StreamSrc* - called in xdp_tx_example_common.c). See
* XAPP1178 for reference.
* @note The functions Dptx_PlatformInit and Dptx_StreamSrc* are declared
- * extern in xdptx_example_common.h and are left up to the user to
+ * extern in xdp_tx_example_common.h and are left up to the user to
* implement. The functions Dptx_ConfigureAudioSrc and
* Dptx_AudioSendInfoFrame are present in this file and are also
* left for the user to implement.
@@ -65,27 +65,27 @@
*
* Ver Who Date Changes
* ----- ---- -------- -----------------------------------------------
- * 1.0 als 07/29/14 Initial creation.
+ * 1.0 als 01/20/15 Initial creation.
*
*
*******************************************************************************/
/******************************* Include Files ********************************/
-#include "xdptx_example_common.h"
+#include "xdp_tx_example_common.h"
/**************************** Function Prototypes *****************************/
-u32 Dptx_AudioExample(XDptx *InstancePtr, u16 DeviceId);
-static void Dptx_AudioInit(XDptx *InstancePtr);
-static void Dptx_ConfigureAudioSrc(XDptx *InstancePtr);
-static void Dptx_AudioSendInfoFrame(XDptx *InstancePtr);
+u32 Dptx_AudioExample(XDp *InstancePtr, u16 DeviceId);
+static void Dptx_AudioInit(XDp *InstancePtr);
+static void Dptx_ConfigureAudioSrc(XDp *InstancePtr);
+static void Dptx_AudioSendInfoFrame(XDp *InstancePtr);
/**************************** Function Definitions ****************************/
/******************************************************************************/
/**
- * This function is the main function of the XDptx audio example.
+ * This function is the main function of the XDp audio example.
*
* @param None.
*
@@ -100,8 +100,8 @@ int main(void)
{
u32 Status;
- /* Run the XDptx audio example. */
- Status = Dptx_AudioExample(&DptxInstance, DPTX_DEVICE_ID);
+ /* Run the XDp audio example. */
+ Status = Dptx_AudioExample(&DpInstance, DPTX_DEVICE_ID);
if (Status != XST_SUCCESS) {
return XST_FAILURE;
}
@@ -111,11 +111,11 @@ int main(void)
/******************************************************************************/
/**
- * The main entry point for the audio example using the XDptx driver. This
+ * The main entry point for the audio example using the XDp driver. This
* function will set up audio, initiate link training, and a video stream will
* start being sent over the main link.
*
- * @param InstancePtr is a pointer to the XDptx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
* @param DeviceId is the unique device ID of the DisplayPort TX core
* instance.
*
@@ -127,13 +127,13 @@ int main(void)
* @note None.
*
*******************************************************************************/
-u32 Dptx_AudioExample(XDptx *InstancePtr, u16 DeviceId)
+u32 Dptx_AudioExample(XDp *InstancePtr, u16 DeviceId)
{
u32 Status;
/* Use single-stream transport (SST) mode for this example. Audio is
* not supported in multi-stream transport (MST) mode. */
- XDptx_MstCfgModeDisable(InstancePtr);
+ XDp_TxMstCfgModeDisable(InstancePtr);
/* Do platform initialization here. This is hardware system specific -
* it is up to the user to implement this function. */
@@ -148,8 +148,8 @@ u32 Dptx_AudioExample(XDptx *InstancePtr, u16 DeviceId)
/* Initialize DisplayPort audio. */
Dptx_AudioInit(InstancePtr);
- XDptx_EnableTrainAdaptive(InstancePtr, TRAIN_ADAPTIVE);
- XDptx_SetHasRedriverInPath(InstancePtr, TRAIN_HAS_REDRIVER);
+ XDp_TxEnableTrainAdaptive(InstancePtr, TRAIN_ADAPTIVE);
+ XDp_TxSetHasRedriverInPath(InstancePtr, TRAIN_HAS_REDRIVER);
/* A sink monitor must be connected at this point. See the polling or
* interrupt examples for how to wait for a connection event. */
@@ -167,7 +167,7 @@ u32 Dptx_AudioExample(XDptx *InstancePtr, u16 DeviceId)
* to implement configuration of the audio stream and, if needed, sending of
* the info frame.
*
- * @param InstancePtr is a pointer to the XDptx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -176,7 +176,7 @@ u32 Dptx_AudioExample(XDptx *InstancePtr, u16 DeviceId)
* initialization.
*
*******************************************************************************/
-static void Dptx_AudioInit(XDptx *InstancePtr)
+static void Dptx_AudioInit(XDp *InstancePtr)
{
u32 Fs;
u32 MAud;
@@ -185,8 +185,7 @@ static void Dptx_AudioInit(XDptx *InstancePtr)
/* Disable audio in the DisplayPort TX. This will also flush the buffers
* in the DisplayPort TX and set MUTE bit in VB-ID. */
- XDptx_WriteReg(InstancePtr->Config.BaseAddr, XDPTX_TX_AUDIO_CONTROL,
- 0x0);
+ XDp_WriteReg(InstancePtr->Config.BaseAddr, XDP_TX_AUDIO_CONTROL, 0x0);
/* Configure the audio source (the S/PDIF controller). It is up to the
* user to implement this function. */
@@ -195,37 +194,38 @@ static void Dptx_AudioInit(XDptx *InstancePtr)
/* Write audio info frame as per user requirements. This may be optional
* for some systems. 8 writes are required to register
- * XDPTX_TX_AUDIO_INFO_DATA. It is up to the user to implement this
+ * XDP_TX_AUDIO_INFO_DATA. It is up to the user to implement this
* function. */
Dptx_AudioSendInfoFrame(InstancePtr);
/*******************/
Fs = 48; /* KHz (32 | 44.1 | 48) */
- if (InstancePtr->LinkConfig.LinkRate == XDPTX_LINK_BW_SET_540GBPS) {
+ if (InstancePtr->TxInstance.LinkConfig.LinkRate ==
+ XDP_TX_LINK_BW_SET_540GBPS) {
MAud = 512 * Fs;
}
- else if (InstancePtr->LinkConfig.LinkRate ==
- XDPTX_LINK_BW_SET_270GBPS) {
+ else if (InstancePtr->TxInstance.LinkConfig.LinkRate ==
+ XDP_TX_LINK_BW_SET_270GBPS) {
MAud = 512 * Fs;
}
- else if (InstancePtr->LinkConfig.LinkRate ==
- XDPTX_LINK_BW_SET_162GBPS) {
+ else if (InstancePtr->TxInstance.LinkConfig.LinkRate ==
+ XDP_TX_LINK_BW_SET_162GBPS) {
MAud = 512 * Fs;
}
/* Write the channel count. The value is (actual count - 1). */
NumChs = 2;
- XDptx_WriteReg(InstancePtr->Config.BaseAddr, XDPTX_TX_AUDIO_CHANNELS,
+ XDp_WriteReg(InstancePtr->Config.BaseAddr, XDP_TX_AUDIO_CHANNELS,
NumChs - 1);
/* NAud = 540000 | 270000 | 162000 */
- NAud = 27 * InstancePtr->LinkConfig.LinkRate * 1000;
+ NAud = 27 * InstancePtr->TxInstance.LinkConfig.LinkRate * 1000;
- XDptx_WriteReg(InstancePtr->Config.BaseAddr, XDPTX_TX_AUDIO_MAUD, MAud);
- XDptx_WriteReg(InstancePtr->Config.BaseAddr, XDPTX_TX_AUDIO_NAUD, NAud);
+ XDp_WriteReg(InstancePtr->Config.BaseAddr, XDP_TX_AUDIO_MAUD, MAud);
+ XDp_WriteReg(InstancePtr->Config.BaseAddr, XDP_TX_AUDIO_NAUD, NAud);
/* Enable audio in the DisplayPort TX. */
- XDptx_WriteReg(InstancePtr->Config.BaseAddr, XDPTX_TX_AUDIO_CONTROL,
+ XDp_WriteReg(InstancePtr->Config.BaseAddr, XDP_TX_AUDIO_CONTROL,
0x1);
}
@@ -233,7 +233,7 @@ static void Dptx_AudioInit(XDptx *InstancePtr)
/**
* This function needs to configure the audio source.
*
- * @param InstancePtr is a pointer to the XDptx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -241,7 +241,7 @@ static void Dptx_AudioInit(XDptx *InstancePtr)
* documentation for reference.
*
*******************************************************************************/
-static void Dptx_ConfigureAudioSrc(XDptx *InstancePtr)
+static void Dptx_ConfigureAudioSrc(XDp *InstancePtr)
{
xil_printf("Dptx_ConfigureAudioSrc: User defined function here.\n");
}
@@ -250,7 +250,7 @@ static void Dptx_ConfigureAudioSrc(XDptx *InstancePtr)
/**
* This function needs to send an info frame as per user requirements.
*
- * @param InstancePtr is a pointer to the XDptx instance.
+ * @param InstancePtr is a pointer to the XDp instance.
*
* @return None.
*
@@ -258,11 +258,11 @@ static void Dptx_ConfigureAudioSrc(XDptx *InstancePtr)
* documentation for reference.
* @note This may be optional for some systems.
* @note A sequence of 8 writes are required to register
- * XDPTX_TX_AUDIO_INFO_DATA. See XAPP1178 and the IP documentation
+ * XDP_TX_AUDIO_INFO_DATA. See XAPP1178 and the IP documentation
* for reference.
*
*******************************************************************************/
-static void Dptx_AudioSendInfoFrame(XDptx *InstancePtr)
+static void Dptx_AudioSendInfoFrame(XDp *InstancePtr)
{
xil_printf("Dptx_AudioSendInfoFrame: User defined function here.\n");
}
diff --git a/XilinxProcessorIPLib/drivers/dp/examples/xdptx_example_common.c b/XilinxProcessorIPLib/drivers/dp/examples/xdp_tx_example_common.c
similarity index 72%
rename from XilinxProcessorIPLib/drivers/dp/examples/xdptx_example_common.c
rename to XilinxProcessorIPLib/drivers/dp/examples/xdp_tx_example_common.c
index a40ae51c..817b565f 100644
--- a/XilinxProcessorIPLib/drivers/dp/examples/xdptx_example_common.c
+++ b/XilinxProcessorIPLib/drivers/dp/examples/xdp_tx_example_common.c
@@ -32,18 +32,19 @@
/******************************************************************************/
/**
*
- * @file xdptx_example_common.c
+ * @file xdp_tx_example_common.c
*
- * Contains a design example using the XDptx driver. It performs a self test on
- * the DisplayPort TX core by training the main link at the maximum common
- * capabilities between the TX and RX and checking the lane status.
+ * Contains a design example using the XDp driver (operating in TX mode). It
+ * performs a self test on the DisplayPort TX core by training the main link at
+ * the maximum common capabilities between the TX and RX and checking the lane
+ * status.
*
* @note The DisplayPort TX core does not work alone - video/audio
* sources need to be set up in the system correctly, as well as
* setting up the output path (for example, configuring the
* hardware system with the DisplayPort TX core output to an FMC
* card with DisplayPort output capabilities. Some platform
- * initialization will need to happen prior to calling XDptx driver
+ * initialization will need to happen prior to calling XDp driver
* functions. See XAPP1178 as a reference.
*
*