summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f5a1150)
raw | patch | inline | side by side (parent: f5a1150)
author | Prasad Konnur <prasadkonnur@ti.com> | |
Tue, 26 May 2020 08:54:33 +0000 (14:24 +0530) | ||
committer | Prasad Konnur <prasadkonnur@ti.com> | |
Tue, 26 May 2020 10:15:37 +0000 (15:45 +0530) |
Signed-off-by: Prasad Konnur <prasadkonnur@ti.com>
if(result == EDMA3_DRV_SOK)
{
printf("\nReserved Channel ID Test\n");
- printf ("The Requested Channel ID: %d \nThe allocated PARAM Id:%d\n",chId,paRAMId);
+ printf ("The Requested Channel ID: %d \nThe allocated PARAM Id:%d\n", (int)chId, (int)paRAMId);
if (chId == paRAMId)
{
*/
EDMA3_DRV_Result edma3_test_ping_pong_mode(EDMA3_DRV_Handle hEdma);
+ /**
+ * \brief EDMA3 mem-to-mem data copy test case with user requested paRAMId
+ * using a DMA channel.
+ * This test case doesnot rely on the callback mechanism.
+ * Instead, it Polls the IPR register to check the transfer
+ * completion status.
+ *
+ * \param edma3Instance [IN] EDMA3 Instance number
+ * \param acnt [IN] Number of bytes in an array
+ * \param bcnt [IN] Number of arrays in a frame
+ * \param ccnt [IN] Number of frames in a block
+ * \param syncType [IN] Synchronization type (A/AB Sync)
+ *
+ * \return EDMA3_DRV_SOK or EDMA3_DRV Error Code
+ */
+ EDMA3_DRV_Result edma3_test_user_req_paRAMId(
+ EDMA3_DRV_Handle hEdma,
+ uint32_t edmaInstance,
+ uint32_t acnt,
+ uint32_t bcnt,
+ uint32_t ccnt,
+ EDMA3_DRV_SyncType syncType);
+
#ifdef __cplusplus
}
#endif /* extern "C" */
diff --git a/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_am335x_arm_int_reg.c b/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_am335x_arm_int_reg.c
//hwiParams.enableInt = TRUE;
hwiCCXferCompInt = Hwi_create( ccXferCompInt[edma3Id][dsp_num],
- (&lisrEdma3ComplHandler0),
- (const Hwi_Params *) (&hwiParams),
- &eb);
+ ((Hwi_FuncPtr)&lisrEdma3ComplHandler0),
+ (const Hwi_Params *) (&hwiParams),
+ &eb);
if (TRUE == Error_check(&eb))
{
System_printf("HWI Create Failed\n",Error_getCode(&eb));
//hwiParams.enableInt = TRUE;
hwiCCErrInt = Hwi_create( ccErrorInt[edma3Id],
- (&lisrEdma3CCErrHandler0),
+ ((Hwi_FuncPtr)&lisrEdma3CCErrHandler0),
(const Hwi_Params *) (&hwiParams),
&eb);
//hwiParams.enableInt = TRUE;
hwiTCErrInt[numTc] = Hwi_create( tcErrorInt[edma3Id][numTc],
- (ptrEdma3TcIsrHandler[numTc]),
+ ((Hwi_FuncPtr)ptrEdma3TcIsrHandler[numTc]),
(const Hwi_Params *) (&hwiParams),
&eb);
if (TRUE == Error_check(&eb))
diff --git a/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_c6a811x_arm_int_reg.c b/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_c6a811x_arm_int_reg.c
* (Not all TC error ISRs need to be registered, register only for the
* available Transfer Controllers).
*/
-void (*ptrEdma3TcIsrHandler[EDMA3_MAX_TC])(unsigned int arg) =
+void (*ptrEdma3TcIsrHandler[EDMA3_MAX_TC])(uint32_t arg) =
{
&lisrEdma3TC0ErrHandler0,
&lisrEdma3TC1ErrHandler0,
//hwiParams.priority = hwIntXferComp[edma3Id];
hwiCCXferCompInt = Hwi_create( ccXferCompInt[edma3Id][dsp_num],
- (&lisrEdma3ComplHandler0),
- (const Hwi_Params *) (&hwiParams),
- &eb);
+ ((Hwi_FuncPtr)&lisrEdma3ComplHandler0),
+ (const Hwi_Params *) (&hwiParams),
+ &eb);
if (TRUE == Error_check(&eb))
{
System_printf("HWI Create Failed\n",Error_getCode(&eb));
hwiParams.priority = hwIntCcErr[edma3Id];
hwiCCErrInt = Hwi_create( ccErrorInt[edma3Id],
- (&lisrEdma3CCErrHandler0),
+ ((Hwi_FuncPtr)&lisrEdma3CCErrHandler0),
(const Hwi_Params *) (&hwiParams),
&eb);
hwiParams.priority = hwIntTcErr[edma3Id];
hwiTCErrInt[numTc] = Hwi_create( tcErrorInt[edma3Id][numTc],
- (ptrEdma3TcIsrHandler[numTc]),
+ ((Hwi_FuncPtr)ptrEdma3TcIsrHandler[numTc]),
(const Hwi_Params *) (&hwiParams),
&eb);
if (TRUE == Error_check(&eb))
if (hEdma != NULL)
{
retVal = EDMA3_DRV_initXbarEventMap(hEdma,
- sampleXbarToChanConfig,
- &sampleMapXbarEvtToChan,
- &sampleConfigScr);
+ sampleXbarToChanConfig,
+ (EDMA3_DRV_mapXbarEvtToChan)&sampleMapXbarEvtToChan,
+ (EDMA3_DRV_xbarConfigScr)&sampleConfigScr);
}
return retVal;
diff --git a/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_c6a811x_cfg.c b/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_c6a811x_cfg.c
@@ -932,91 +932,91 @@ EDMA3_DRV_GblXbarToChanConfigParams sampleXbarChanInitConfig[NUM_EDMA3_INSTANCES
{
/* Event to channel map for region 0 */
{
- -1, -1, -1, -1, -1, -1, -1, -1,
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, 26, 27, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 1 */
{
- -1, -1, -1, -1, -1, -1, -1, -1,
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, 26, 27, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 2 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 3 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 4 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 5 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 6 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 7 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
}
};
diff --git a/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_ti816x_arm_int_reg.c b/packages/ti/sdo/edma3/drv/sample/src/platforms/sample_ti816x_arm_int_reg.c
index 2679965ec6cc993ce24dd02fe33eca386102a038..ae2e54e90f80d7f5fdf077a1839ebcb4d48dcf70 100755 (executable)
* (Not all TC error ISRs need to be registered, register only for the
* available Transfer Controllers).
*/
-void (*ptrEdma3TcIsrHandler[EDMA3_MAX_TC])(unsigned int arg) =
+void (*ptrEdma3TcIsrHandler[EDMA3_MAX_TC])(uint32_t arg) =
{
&lisrEdma3TC0ErrHandler0,
&lisrEdma3TC1ErrHandler0,
//hwiParams.enableInt = TRUE;
hwiCCXferCompInt = Hwi_create( ccXferCompInt[edma3Id][dsp_num],
- (&lisrEdma3ComplHandler0),
- (const Hwi_Params *) (&hwiParams),
- &eb);
+ ((Hwi_FuncPtr)&lisrEdma3ComplHandler0),
+ (const Hwi_Params *) (&hwiParams),
+ &eb);
if (TRUE == Error_check(&eb))
{
System_printf("HWI Create Failed\n",Error_getCode(&eb));
//hwiParams.enableInt = TRUE;
hwiCCErrInt = Hwi_create( ccErrorInt[edma3Id],
- (&lisrEdma3CCErrHandler0),
+ ((Hwi_FuncPtr)&lisrEdma3CCErrHandler0),
(const Hwi_Params *) (&hwiParams),
&eb);
//hwiParams.enableInt = TRUE;
hwiTCErrInt[numTc] = Hwi_create( tcErrorInt[edma3Id][numTc],
- (ptrEdma3TcIsrHandler[numTc]),
+ ((Hwi_FuncPtr)ptrEdma3TcIsrHandler[numTc]),
(const Hwi_Params *) (&hwiParams),
&eb);
if (TRUE == Error_check(&eb))
diff --git a/packages/ti/sdo/edma3/rm/sample/src/platforms/sample_am335x_arm_int_reg.c b/packages/ti/sdo/edma3/rm/sample/src/platforms/sample_am335x_arm_int_reg.c
//hwiParams.enableInt = TRUE;
hwiCCXferCompInt = Hwi_create( ccXferCompInt[edma3Id][dsp_num],
- (&lisrEdma3ComplHandler0),
- (const Hwi_Params *) (&hwiParams),
- &eb);
+ ((Hwi_FuncPtr)&lisrEdma3ComplHandler0),
+ (const Hwi_Params *) (&hwiParams),
+ &eb);
if (TRUE == Error_check(&eb))
{
System_printf("HWI Create Failed\n",Error_getCode(&eb));
//hwiParams.enableInt = TRUE;
hwiCCErrInt = Hwi_create( ccErrorInt[edma3Id],
- (&lisrEdma3CCErrHandler0),
+ ((Hwi_FuncPtr)&lisrEdma3CCErrHandler0),
(const Hwi_Params *) (&hwiParams),
&eb);
//hwiParams.enableInt = TRUE;
hwiTCErrInt[numTc] = Hwi_create( tcErrorInt[edma3Id][numTc],
- (ptrEdma3TcIsrHandler[numTc]),
+ ((Hwi_FuncPtr)ptrEdma3TcIsrHandler[numTc]),
(const Hwi_Params *) (&hwiParams),
&eb);
if (TRUE == Error_check(&eb))
diff --git a/packages/ti/sdo/edma3/rm/sample/src/platforms/sample_c6a811x_arm_int_reg.c b/packages/ti/sdo/edma3/rm/sample/src/platforms/sample_c6a811x_arm_int_reg.c
* (Not all TC error ISRs need to be registered, register only for the
* available Transfer Controllers).
*/
-void (*ptrEdma3TcIsrHandler[EDMA3_MAX_TC])(unsigned int arg) =
+void (*ptrEdma3TcIsrHandler[EDMA3_MAX_TC])(uint32_t arg) =
{
&lisrEdma3TC0ErrHandler0,
&lisrEdma3TC1ErrHandler0,
//hwiParams.priority = hwIntXferComp[edma3Id];
hwiCCXferCompInt = Hwi_create( ccXferCompInt[edma3Id][dsp_num],
- (&lisrEdma3ComplHandler0),
- (const Hwi_Params *) (&hwiParams),
- &eb);
+ ((Hwi_FuncPtr)&lisrEdma3ComplHandler0),
+ (const Hwi_Params *) (&hwiParams),
+ &eb);
if (TRUE == Error_check(&eb))
{
System_printf("HWI Create Failed\n",Error_getCode(&eb));
hwiParams.priority = hwIntCcErr[edma3Id];
hwiCCErrInt = Hwi_create( ccErrorInt[edma3Id],
- (&lisrEdma3CCErrHandler0),
+ ((Hwi_FuncPtr)&lisrEdma3CCErrHandler0),
(const Hwi_Params *) (&hwiParams),
&eb);
hwiParams.priority = hwIntTcErr[edma3Id];
hwiTCErrInt[numTc] = Hwi_create( tcErrorInt[edma3Id][numTc],
- (ptrEdma3TcIsrHandler[numTc]),
+ ((Hwi_FuncPtr)ptrEdma3TcIsrHandler[numTc]),
(const Hwi_Params *) (&hwiParams),
&eb);
if (TRUE == Error_check(&eb))
if (hEdma != NULL)
{
retVal = EDMA3_RM_initXbarEventMap(hEdma,
- sampleXbarToChanConfig,
- &sampleMapXbarEvtToChan,
- &sampleConfigScr);
+ sampleXbarToChanConfig,
+ (EDMA3_RM_mapXbarEvtToChan)&sampleMapXbarEvtToChan,
+ (EDMA3_RM_xbarConfigScr)&sampleConfigScr);
}
return retVal;
diff --git a/packages/ti/sdo/edma3/rm/sample/src/platforms/sample_c6a811x_cfg.c b/packages/ti/sdo/edma3/rm/sample/src/platforms/sample_c6a811x_cfg.c
@@ -932,59 +932,59 @@ EDMA3_RM_GblXbarToChanConfigParams sampleXbarChanInitConfig[NUM_EDMA3_INSTANCES]
{
/* Event to channel map for region 0 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 1 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 26, 27, -1, -1, -1, -1
+ -1, 26, 27, -1, -1, -1, -1}
},
/* Event to channel map for region 2 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 3 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 4 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 5 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 6 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 7 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
}
};
diff --git a/packages/ti/sdo/edma3/rm/src/configs/edma3_c6a811x_cfg.c b/packages/ti/sdo/edma3/rm/src/configs/edma3_c6a811x_cfg.c
@@ -789,59 +789,59 @@ EDMA3_RM_GblXbarToChanConfigParams defXbarChanInitConfig[NUM_EDMA3_INSTANCES][ED
{
/* Event to channel map for region 0 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 1 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 2 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 3 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 4 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 5 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 6 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
/* Event to channel map for region 7 */
{
+ {-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1
+ -1, -1, -1, -1, -1, -1, -1}
},
}
};