conflicting types error for a15 fixed
[keystone-rtos/edma3_lld.git] / packages / ti / sdo / edma3 / rm / sample / src / sample_arm_cs.c
index 060fc0ce489c868c76a6ddf0d29942cae9eb3cd8..1fb92a6d79196decb6cef2cfb5439599609ea5ac 100644 (file)
@@ -41,7 +41,7 @@
 
 #include <ti/sysbios/hal/Hwi.h>
 #include <ti/sysbios/knl/Task.h>
-#include <ti/sysbios/ipc/Semaphore.h>
+#include <ti/sysbios/knl/Semaphore.h>
 
 #include <ti/sdo/edma3/rm/sample/bios6_edma3_rm_sample.h>
 
@@ -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;