diff --git a/packages/ti/sdo/edma3/rm/sample/src/sample_init.c b/packages/ti/sdo/edma3/rm/sample/src/sample_init.c
index b74f7e0b0357c844f767821388b1995dcc35b3db..2b7f0695c4dc15eee3428f71221ebde0e9e74ce1 100755 (executable)
#include <ti/sdo/edma3/rm/sample/bios6_edma3_rm_sample.h>\r
\r
/** @brief EDMA3 Driver Instance specific Semaphore handle */\r
-extern EDMA3_OS_Sem_Handle rmSemHandle[];\r
+extern EDMA3_OS_Sem_Handle rmSemHandle[EDMA3_MAX_EDMA3_INSTANCES];\r
\r
/** To Register the ISRs with the underlying OS, if required. */\r
-extern void registerEdma3Interrupts (unsigned int edma3Id);\r
+extern void registerEdma3Interrupts (uint32_t edma3Id);\r
/** To Unregister the ISRs with the underlying OS, if previously registered. */\r
-extern void unregisterEdma3Interrupts (unsigned int edma3Id);\r
+extern void unregisterEdma3Interrupts (uint32_t edma3Id);\r
\r
/* To find out the DSP# */\r
-extern unsigned short determineProcId();\r
+extern uint16_t determineProcId(void);\r
\r
/**\r
* To check whether the global EDMA3 configuration is required or not.\r
* by one of the masters. Hence this function will return TRUE only once\r
* and FALSE for all other masters. \r
*/\r
-extern unsigned short isGblConfigRequired(unsigned int dspNum);\r
+extern uint16_t isGblConfigRequired(uint32_t dspNum);\r
\r
/**\r
* DSP instance number on which the executable is running. Its value is\r
* determined by reading the processor specific register DNUM.\r
*/\r
-unsigned int dsp_num;\r
+uint32_t dsp_num;\r
\r
/**\r
* Shadow Region on which the executable is runnig. Its value is populated\r
* with the dsp_num here in this case.\r
*/\r
-unsigned int region_id;\r
+uint32_t region_id;\r
\r
/* Number of EDMA3 controllers present in the system */\r
-extern const unsigned int numEdma3Instances;\r
+extern const uint32_t numEdma3Instances;\r
\r
/* External Global Configuration Structure */\r
-extern EDMA3_RM_GblConfigParams sampleEdma3GblCfgParams[];\r
+extern EDMA3_RM_GblConfigParams sampleEdma3GblCfgParams[EDMA3_MAX_EDMA3_INSTANCES];\r
\r
/* External Instance Specific Configuration Structure */\r
-extern EDMA3_RM_InstanceInitConfig sampleInstInitConfig[][EDMA3_MAX_REGIONS];\r
+extern EDMA3_RM_InstanceInitConfig sampleInstInitConfig[EDMA3_MAX_EDMA3_INSTANCES][EDMA3_MAX_REGIONS];\r
\r
-#if defined (CHIP_TI814X)
-extern EDMA3_RM_Result sampleInitXbarEvt(EDMA3_RM_Handle hEdma, unsigned int edma3Id);
+#ifdef DMA_XBAR_AVAILABLE
+extern EDMA3_RM_Result sampleInitXbarEvt(EDMA3_RM_Handle hEdma, uint32_t edma3Id);
#endif
/**\r
*\r
* \return EDMA3_RM_SOK if success, else error code\r
*/\r
-EDMA3_RM_Handle edma3init (unsigned int edma3Id, EDMA3_RM_Result *errorCode)\r
+EDMA3_RM_Handle edma3init (uint32_t edma3Id, EDMA3_RM_Result *errorCode)\r
{\r
EDMA3_RM_Param initParam;\r
EDMA3_RM_Result edma3Result = EDMA3_RM_SOK;\r
EDMA3_RM_Handle hEdmaResMgr = NULL;\r
\r
if ((edma3Id >= numEdma3Instances) || (errorCode == NULL))\r
- return hEdmaResMgr;\r
-\r
+ {\r
+ hEdmaResMgr = NULL;\r
+ }\r
+ else\r
+ {\r
/* DSP instance number */\r
dsp_num = determineProcId();\r
\r
Semaphore_Params_init(&semParams);\r
\r
initParam.rmSemHandle = NULL;\r
- edma3Result = edma3OsSemCreate(1, &semParams, &initParam.rmSemHandle);\r
+ edma3Result = edma3OsSemCreate((int32_t)1, &semParams, &initParam.rmSemHandle);\r
}\r
\r
if (edma3Result == EDMA3_DRV_SOK)\r
&edma3Result);\r
}\r
\r
-#if defined (CHIP_TI814X)\r
+#ifdef DMA_XBAR_AVAILABLE
{\r
- if(hEdmaResMgr && (edma3Result == EDMA3_RM_SOK))\r
+ if((hEdmaResMgr != NULL) && (edma3Result == EDMA3_RM_SOK))\r
{\r
edma3Result = sampleInitXbarEvt(hEdmaResMgr, edma3Id);\r
}\r
}\r
#endif \r
- if(hEdmaResMgr && (edma3Result == EDMA3_DRV_SOK))\r
+ if((hEdmaResMgr != NULL) && (edma3Result == EDMA3_DRV_SOK))\r
{\r
/**\r
* Register Interrupt Handlers for various interrupts\r
}\r
\r
*errorCode = edma3Result; \r
+ }\r
return hEdmaResMgr;\r
}\r
\r
*\r
* \return EDMA3_RM_SOK if success, else error code\r
*/\r
-EDMA3_RM_Result edma3deinit (unsigned int edma3Id, EDMA3_RM_Handle hEdmaResMgr)\r
+EDMA3_RM_Result edma3deinit (uint32_t edma3Id, EDMA3_RM_Handle hEdma)\r
{\r
EDMA3_RM_Result edma3Result = EDMA3_RM_SOK;\r
\r
rmSemHandle[edma3Id] = NULL;\r
\r
/* Now, close the EDMA3 RM Instance */\r
- edma3Result = EDMA3_RM_close (hEdmaResMgr, NULL);\r
+ edma3Result = EDMA3_RM_close (hEdma, NULL);\r
}\r
\r
if (EDMA3_RM_SOK == edma3Result)\r