Integration with highperf-lib

[keystone-rtos/netapi.git] / ti / runtime / netapi / src / pdk / v2 / netapi_navig.c

diff --git a/ti/runtime/netapi/src/pdk/v2/netapi_navig.c b/ti/runtime/netapi/src/pdk/v2/netapi_navig.c
old mode 100644 (file)
new mode 100755 (executable)
index cff6674..b14f0c1
--- a/ti/runtime/netapi/src/pdk/v2/netapi_navig.c
+++ b/ti/runtime/netapi/src/pdk/v2/netapi_navig.c
@@ -50,7 +50,8 @@
 
 #include <ti/csl/cslr_device.h>
 #include <ti/drv/qmss/qmss_qm.h>
-#include "netapi_vm.h"
+#include "netapi.h"
+#include "hplib.h"
 
 //pull in device config for qmss, cppi
 #include "qmss_device.c"
@@ -84,79 +85,79 @@ int netapi_init_cppi(void)
 
   /* SRIO CPDMA regs */
   netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].gblCfgRegs =
-   NETAPI_GET_REG_VADDR(netapi_VM_srioCfgVaddr,
+   NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->srioCfgVaddr,
                         CSL_SRIO_CONFIG_REGS,
                         (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].gblCfgRegs);
 
   netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].txChRegs =
-   NETAPI_GET_REG_VADDR(netapi_VM_srioCfgVaddr,
+   NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->srioCfgVaddr,
                         CSL_SRIO_CONFIG_REGS,
                         (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].txChRegs);
 
   netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].rxChRegs =
-   NETAPI_GET_REG_VADDR(netapi_VM_srioCfgVaddr,
+   NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->srioCfgVaddr,
                         CSL_SRIO_CONFIG_REGS,
                         (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].rxChRegs);
 
   netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].txSchedRegs =
-   NETAPI_GET_REG_VADDR(netapi_VM_srioCfgVaddr,
+   NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->srioCfgVaddr,
                         CSL_SRIO_CONFIG_REGS,
                         (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].txSchedRegs);
 
  netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].rxFlowRegs =
-   NETAPI_GET_REG_VADDR(netapi_VM_srioCfgVaddr,
+   NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->srioCfgVaddr,
                         CSL_SRIO_CONFIG_REGS,
                         (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].rxFlowRegs);
 
   /* PASS CPDMA regs */
   netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].gblCfgRegs =
-    NETAPI_GET_REG_VADDR(netapi_VM_passCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
                          CSL_PA_SS_CFG_REGS,
                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].gblCfgRegs);
 
   netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].txChRegs =
-    NETAPI_GET_REG_VADDR(netapi_VM_passCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
                          CSL_PA_SS_CFG_REGS,
                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].txChRegs);
 
   netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].rxChRegs =
-    NETAPI_GET_REG_VADDR(netapi_VM_passCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
                          CSL_PA_SS_CFG_REGS,
                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].rxChRegs);
 
   netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].txSchedRegs =
-    NETAPI_GET_REG_VADDR(netapi_VM_passCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
                          CSL_PA_SS_CFG_REGS,
                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].txSchedRegs);
 
   netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].rxFlowRegs =
-    NETAPI_GET_REG_VADDR(netapi_VM_passCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
                          CSL_PA_SS_CFG_REGS,
                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].rxFlowRegs);
 
  /* QMSS CPDMA regs */
   netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].gblCfgRegs =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].gblCfgRegs);
 
   netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].txChRegs =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].txChRegs);
 
   netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].rxChRegs =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].rxChRegs);
 
   netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].txSchedRegs =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].txSchedRegs);
 
   netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].rxFlowRegs =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].rxFlowRegs);
 
@@ -189,93 +190,94 @@ int netapi_init_qm(int max_descriptors)
   netapi_qmssGblCfgParams = qmssGblCfgParams[0];
 
   netapi_qmssGblCfgParams.qmConfigReg =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmConfigReg);
 
   netapi_qmssGblCfgParams.qmDescReg =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmDescReg);
 
   netapi_qmssGblCfgParams.qmQueMgmtReg =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmQueMgmtReg);
 
   netapi_qmssGblCfgParams.qmQueMgmtProxyReg =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmQueMgmtProxyReg);
 
   netapi_qmssGblCfgParams.qmQueStatReg =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmQueStatReg);
 
   netapi_qmssGblCfgParams.qmQueIntdReg =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmQueIntdReg);
 
   netapi_qmssGblCfgParams.qmPdspCmdReg[0] =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmPdspCmdReg[0]);
 
   netapi_qmssGblCfgParams.qmPdspCmdReg[1] =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmPdspCmdReg[1]);
 
   netapi_qmssGblCfgParams.qmPdspCtrlReg[0] =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmPdspCtrlReg[0]);
 
   netapi_qmssGblCfgParams.qmPdspCtrlReg[1] =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmPdspCtrlReg[1]);
 
   netapi_qmssGblCfgParams.qmPdspIRamReg[0] =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmPdspIRamReg[0]);
 
   netapi_qmssGblCfgParams.qmPdspIRamReg[1] =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmPdspIRamReg[1]);
 
   netapi_qmssGblCfgParams.qmStatusRAM =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmStatusRAM);
   netapi_qmssGblCfgParams.qmLinkingRAMReg =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmLinkingRAMReg);
   netapi_qmssGblCfgParams.qmMcDMAReg =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmMcDMAReg);
 
   netapi_qmssGblCfgParams.qmTimer16Reg[0] =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmTimer16Reg[0]);
 
   netapi_qmssGblCfgParams.qmTimer16Reg[1] =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssCfgVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmTimer16Reg[1]);
 
-  netapi_qmssGblCfgParams.qmQueMgmtDataReg = 
-                                (void *)((uint32_t)netapi_VM_qmssDataVaddr);
 
+  netapi_qmssGblCfgParams.qmQueMgmtDataReg = 
+                                                    (void *)((uint32_t)netapi_VM_VirtAddr->qmssDataVaddr);
+  
   netapi_qmssGblCfgParams.qmQueMgmtProxyDataReg =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssDataVaddr,
+    NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssDataVaddr,
                          QMSS_DATA_BASE_ADDR,
                          QMSS_DATA_ARM_PROXY_QUEUE_DEQUEUE_REGS);