conflicting types error for a15 fixed

diff --git a/packages/ti/sdo/edma3/drv/sample/src/sample_arm_cs.c b/packages/ti/sdo/edma3/drv/sample/src/sample_arm_cs.c
index e118006eb34c6b645a50c604bbcd13c87c2afa3c..73ddd4f0227a1dbea26bd8746da40432d7b1c07d 100644 (file)
--- a/packages/ti/sdo/edma3/drv/sample/src/sample_arm_cs.c
+++ b/packages/ti/sdo/edma3/drv/sample/src/sample_arm_cs.c
@@ -75,8 +75,8 @@ extern unsigned int region_id;
  *      for EDMA3_OS_PROTECT_INTERRUPT protection level).
  * \return  None
  */
-void edma3OsProtectEntry (unsigned int edma3InstanceId,
-                                                       int level, unsigned int *intState)
+void edma3OsProtectEntry (uint32_t edma3InstanceId,
+                                                       int32_t level, uint32_t *intState)
     {
     if (((level == EDMA3_OS_PROTECT_INTERRUPT)
         || (level == EDMA3_OS_PROTECT_INTERRUPT_TC_ERROR))
@@ -155,8 +155,8 @@ void edma3OsProtectEntry (unsigned int edma3InstanceId,
  *      for EDMA3_OS_PROTECT_INTERRUPT protection level).
  * \return  None
  */
-void edma3OsProtectExit (unsigned int edma3InstanceId,
-                        int level, unsigned int intState)
+void edma3OsProtectExit (uint32_t edma3InstanceId,
+                        int32_t level, uint32_t intState)
     {
     switch (level)
         {
@@ -369,7 +369,7 @@ EDMA3_DRV_Result edma3OsSemDelete(EDMA3_OS_Sem_Handle hSem)
  * \param   mSecTimeout [IN] is wait time in milliseconds
  * \return  EDMA3_DRV_Result if successful else a suitable error code
  */
-EDMA3_DRV_Result edma3OsSemTake(EDMA3_OS_Sem_Handle hSem, int mSecTimeout)
+EDMA3_DRV_Result edma3OsSemTake(EDMA3_OS_Sem_Handle hSem, int32_t mSecTimeout)
     {
     EDMA3_DRV_Result semTakeResult = EDMA3_DRV_SOK;
     unsigned short semPendResult;

diff --git a/packages/ti/sdo/edma3/rm/sample/src/sample_arm_cs.c b/packages/ti/sdo/edma3/rm/sample/src/sample_arm_cs.c
index d1e5ebd0989350a2740dd60bb7170888da3a2cf2..1fb92a6d79196decb6cef2cfb5439599609ea5ac 100644 (file)
--- a/packages/ti/sdo/edma3/rm/sample/src/sample_arm_cs.c
+++ b/packages/ti/sdo/edma3/rm/sample/src/sample_arm_cs.c
@@ -74,8 +74,8 @@ extern unsigned int region_id;
  *      for EDMA3_OS_PROTECT_INTERRUPT protection level).
  * \return  None
  */
-void edma3OsProtectEntry (unsigned int edma3InstanceId, 
-                                                       int level, unsigned int *intState)
+void edma3OsProtectEntry (uint32_t edma3InstanceId, 
+                                                       int32_t level, uint32_t *intState)
     {
     if (((level == EDMA3_OS_PROTECT_INTERRUPT)
         || (level == EDMA3_OS_PROTECT_INTERRUPT_TC_ERROR))
@@ -154,8 +154,8 @@ void edma3OsProtectEntry (unsigned int edma3InstanceId,
  *      for EDMA3_OS_PROTECT_INTERRUPT protection level).
  * \return  None
  */
-void edma3OsProtectExit (unsigned int edma3InstanceId,
-                        int level, unsigned int intState)
+void edma3OsProtectExit (uint32_t edma3InstanceId,
+                        int32_t level, uint32_t intState)
     {
     switch (level)
         {
@@ -287,7 +287,7 @@ EDMA3_RM_Result edma3OsSemDelete(EDMA3_OS_Sem_Handle hSem)
  * \param   mSecTimeout [IN] is wait time in milliseconds
  * \return  EDMA3_RM_Result if successful else a suitable error code
  */
-EDMA3_RM_Result edma3OsSemTake(EDMA3_OS_Sem_Handle hSem, int mSecTimeout)
+EDMA3_RM_Result edma3OsSemTake(EDMA3_OS_Sem_Handle hSem, int32_t mSecTimeout)
     {
     EDMA3_RM_Result semTakeResult = EDMA3_RM_SOK;
     unsigned short semPendResult;

diff --git a/packages/ti/sdo/edma3/rm/src/edma3resmgr.h b/packages/ti/sdo/edma3/rm/src/edma3resmgr.h
index 0714fcbf815d495b10f4a28e2764cb3017a54730..8113376308abe9b2215d9249c3e4ab8271601898 100755 (executable)
--- a/packages/ti/sdo/edma3/rm/src/edma3resmgr.h
+++ b/packages/ti/sdo/edma3/rm/src/edma3resmgr.h
@@ -54,7 +54,7 @@ extern "C" {
  * Number of PaRAM Sets actually present on the SoC. This will be updated
  * while creating the Resource Manager Object.
  */
-extern unsigned int edma3NumPaRAMSets;
+extern uint32_t edma3NumPaRAMSets;
 
 
 /** Define for setting all bits of the EDMA3 Controller Registers */