1 files changed, 33 insertions, 38 deletions

diff --git a/src/pruicss_intc.c b/src/pruicss_intc.c
index f2ccc1b..d681dd4 100644
--- a/src/pruicss_intc.c
+++ b/src/pruicss_intc.c
@@ -7,7 +7,7 @@
  */
 
 /*
-* Copyright (C) 2015 Texas Instruments Incorporated - http://www.ti.com/
+* Copyright (C) 2015-2018 Texas Instruments Incorporated - http://www.ti.com/
 *
 *
 *  Redistribution and use in source and binary forms, with or without
@@ -79,7 +79,7 @@ static void PRUICSS_intcSetCmr(uint8_t sysevt,
                                uint8_t channel,
                                uint8_t polarity,
                                uint8_t type,
-                               uint32_t baseaddr);
+                               uintptr_t baseaddr);
 /**
  * \brief    Sets Channel-Host Map registers: \n
  *
@@ -91,7 +91,7 @@ static void PRUICSS_intcSetCmr(uint8_t sysevt,
  */
 static void PRUICSS_intcSetHmr(uint8_t channel,
                                uint8_t host,
-                               uint32_t baseaddr);
+                               uintptr_t baseaddr);
 
 /**
  * \brief   PRUICSS interrupt handler
@@ -123,17 +123,17 @@ static void PRUICSS_hwiIntHandler(uintptr_t ptrPpruEvtoutNum);
  */
 int32_t PRUICSS_pruIntcInit(PRUICSS_Handle handle, const PRUICSS_IntcInitData * prussintc_init_data)
 {
-    uint32_t baseaddr;
+    uintptr_t baseaddr;
     PRUICSS_HwAttrs      const    *hwAttrs;
     PRUICSS_V1_Object    *object;
 
     uint32_t i = 0, mask1 = 0, mask2 = 0;
 
-    uint32_t temp_addr = 0U;
+    uintptr_t temp_addr = 0U;
 
     int32_t ret_val = PRUICSS_RETURN_SUCCESS;
 
-    object = (PRUICSS_V1_Object*)handle->object;
+    object = (PRUICSS_V1_Object *)handle->object;
     hwAttrs = (PRUICSS_HwAttrs const *)handle->hwAttrs;
     baseaddr = hwAttrs->baseAddr;
 
@@ -163,7 +163,7 @@ int32_t PRUICSS_pruIntcInit(PRUICSS_Handle handle, const PRUICSS_IntcInitData *
         for (i = 0; i < (PRUICSS_NUM_PRU_SYS_EVTS + 3U) >> 2; i++)
         {
             temp_addr = ((baseaddr +  CSL_ICSSINTC_CMR0 ) + (i << 2));
-            HWREG(temp_addr) = 0;
+            CSL_REG32_WR(temp_addr, 0);
         }
         for (i = 0;
              ((prussintc_init_data->sysevt_to_channel_map[i].sysevt != 0xFF)
@@ -180,7 +180,7 @@ int32_t PRUICSS_pruIntcInit(PRUICSS_Handle handle, const PRUICSS_IntcInitData *
         for (i = 0; i < (PRUICSS_NUM_PRU_HOSTS + 3U) >> 2; i++)
         {
             temp_addr = (baseaddr  +  CSL_ICSSINTC_HMR0 + (i << 2));
-            HWREG(temp_addr) = 0;
+            CSL_REG32_WR(temp_addr, 0);
         }
         for (i = 0;
                ((i<PRUICSS_NUM_PRU_HOSTS) &&
@@ -337,7 +337,7 @@ int32_t PRUICSS_registerIrqHandler2(PRUICSS_Handle handle,
     SemaphoreP_Params           semParams;
     HwiP_Handle hwiHandle = NULL;
     void*    semHandle = NULL;
-    object = (PRUICSS_V1_Object*)handle->object;
+    object = (PRUICSS_V1_Object *)handle->object;
     HwiP_Params           hwiInputParams;
     MuxIntcP_inParams       muxInParams;
     MuxIntcP_outParams      muxOutParams;
@@ -445,41 +445,41 @@ static void PRUICSS_intcSetCmr( uint8_t sysevt,
                                 uint8_t channel,
                                 uint8_t polarity,
                                 uint8_t type,
-                                uint32_t baseaddr)
+                                uintptr_t baseaddr)
 {
-    uint32_t temp_addr1 = 0U;
-    uint32_t temp_addr2 = 0U;
+    uintptr_t temp_addr1 = 0U;
+    uintptr_t temp_addr2 = 0U;
 
     temp_addr1 = ((baseaddr)+(CSL_ICSSINTC_CMR0 + (((uint32_t)sysevt) & ~((uint32_t)0x3U))));
-    HWREG(temp_addr1) |= ((((uint32_t)channel) & ((uint32_t)0xFU)) << ((((uint32_t)sysevt) & ((uint32_t)0x3U)) << 3U));
+    CSL_REG32_WR(temp_addr1, CSL_REG32_RD(temp_addr1) | ((((uint32_t)channel) & ((uint32_t)0xFU)) << ((((uint32_t)sysevt) & ((uint32_t)0x3U)) << 3U)));
 
     if(sysevt < 32U)
     {
         temp_addr1 = (baseaddr + CSL_ICSSINTC_SIPR0);
         temp_addr2 = (baseaddr + CSL_ICSSINTC_SITR0);
-        HWREG(temp_addr1) &= ~(((uint32_t)polarity) << sysevt);
-        HWREG(temp_addr2) &= ~(((uint32_t)type) << sysevt);
+        CSL_REG32_WR(temp_addr1, CSL_REG32_RD (temp_addr1) & ~(((uint32_t)polarity) << sysevt));
+        CSL_REG32_WR(temp_addr2, CSL_REG32_RD (temp_addr2) & ~(((uint32_t)type) << sysevt));
     }
     else
     {
         temp_addr1 = (baseaddr + CSL_ICSSINTC_SIPR1);
         temp_addr2 = (baseaddr + CSL_ICSSINTC_SITR1);
-        HWREG(temp_addr1) &= ~(((uint32_t)polarity) << (sysevt - 32U));
-        HWREG(temp_addr2) &= ~(((uint32_t)type) << (sysevt - 32U));
+        CSL_REG32_WR(temp_addr1, CSL_REG32_RD(temp_addr1) & ~(((uint32_t)polarity) << (sysevt - 32U)));
+        CSL_REG32_WR(temp_addr2, CSL_REG32_RD(temp_addr2) & ~(((uint32_t)type) << (sysevt - 32U)));
     }
 }
 
 
 static void PRUICSS_intcSetHmr( uint8_t channel,
                                 uint8_t host,
-                                uint32_t baseaddr)
+                                uintptr_t baseaddr)
 {
-    uint32_t temp_addr1 = 0U;
-    uint32_t temp_addr2 = 0U;
+    uintptr_t temp_addr1 = 0U;
+    uintptr_t temp_addr2 = 0U;
 
     temp_addr1 = ((baseaddr) + (CSL_ICSSINTC_HMR0 + (((uint32_t)channel) & ~((uint32_t)0x3U))));
     temp_addr2 = ((baseaddr) + (CSL_ICSSINTC_HMR0 + (((uint32_t)channel) & ~((uint32_t)0x3U))));
-    HWREG(temp_addr1) = HWREG(temp_addr2) | ((((uint32_t)host) & ((uint32_t)0xFU)) << ((((uint32_t)channel) & ((uint32_t)0x3U)) << 3U));
+    CSL_REG32_WR(temp_addr1, CSL_REG32_RD(temp_addr2) | ((((uint32_t)host) & ((uint32_t)0xFU)) << ((((uint32_t)channel) & ((uint32_t)0x3U)) << 3U)));
 }
 
 /**
@@ -491,21 +491,22 @@ static void PRUICSS_intcSetHmr( uint8_t channel,
  */
 int32_t PRUICSS_pruIntcClear(PRUICSS_Handle handle)
 {
-    uint32_t baseaddr;
+    uintptr_t baseaddr;
     PRUICSS_HwAttrs      const    *hwAttrs;
     PRUICSS_V1_Object    *object;
 
     uint32_t i = 0;
 
-    uint32_t temp_addr = 0U;
+    uintptr_t temp_addr = 0U;
 
     int32_t ret_val = PRUICSS_RETURN_SUCCESS;
 
     /* verify the handle */
     if (handle != NULL)
     {
-        object = (PRUICSS_V1_Object*)handle->object;
+        object = (PRUICSS_V1_Object *)handle->object;
         hwAttrs = (PRUICSS_HwAttrs const *)handle->hwAttrs;
+
         /* verify the instance */
         if ((object->instance == PRUICCSS_INSTANCE_ONE) || (object->instance == PRUICCSS_INSTANCE_TWO))
         {
@@ -521,32 +522,26 @@ int32_t PRUICSS_pruIntcClear(PRUICSS_Handle handle)
             for (i = 0; i < PRUICSS_NUM_PRU_SYS_EVTS >> 2; i++)
             {
                 temp_addr = ((baseaddr +  CSL_ICSSINTC_CMR0 ) + (i << 2));
-                HWREG(temp_addr) = 0;
+                CSL_REG32_WR(temp_addr, 0);
             }
         
             for (i = 0; i < (PRUICSS_NUM_PRU_HOSTS + 3U) >> 2; i++)
             {
                 temp_addr = (baseaddr  +  CSL_ICSSINTC_HMR0 + (i << 2));
-                HWREG(temp_addr) = 0;
+                CSL_REG32_WR(temp_addr, 0);
             }
 
-            temp_addr = baseaddr + CSL_ICSSINTC_ESR0;
-            HWREG(temp_addr) = 0;
+            CSL_REG32_WR(baseaddr + CSL_ICSSINTC_ESR0, 0);
 
-            temp_addr = baseaddr + CSL_ICSSINTC_SECR0;
-            HWREG(temp_addr) = 0;
+            CSL_REG32_WR(baseaddr + CSL_ICSSINTC_SECR0, 0);
 
-            temp_addr = baseaddr + CSL_ICSSINTC_ERS1;
-            HWREG(temp_addr) = 0;
+            CSL_REG32_WR(baseaddr + CSL_ICSSINTC_ERS1, 0);
 
-             temp_addr = baseaddr + CSL_ICSSINTC_SECR1;
-            HWREG(temp_addr) = 0;
+            CSL_REG32_WR(baseaddr + CSL_ICSSINTC_SECR1, 0);
 
-            temp_addr = baseaddr + CSL_ICSSINTC_HIER;
-            HWREG(temp_addr) = 0;
+            CSL_REG32_WR(baseaddr + CSL_ICSSINTC_HIER, 0);
 
-            temp_addr = baseaddr + CSL_ICSSINTC_GER;
-            HWREG(temp_addr) = 0;
+            CSL_REG32_WR(baseaddr + CSL_ICSSINTC_GER, 0);
         }
         else
         {