summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 6bf09ca)
raw | patch | inline | side by side (from parent 1: 6bf09ca)
author | Tinku Mannan <tmannan@ti.com> | |
Wed, 30 Apr 2014 18:07:00 +0000 (14:07 -0400) | ||
committer | Tinku Mannan <tmannan@ti.com> | |
Wed, 30 Apr 2014 18:07:00 +0000 (14:07 -0400) |
14 files changed:
diff --git a/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapi_ipsecmgr.c b/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapi_ipsecmgr.c
index d99ecbb3076069ec0d614686ac7b4647d02447ba..b6a13ffa34ef998383ede8439f0a1ea1dda23af8 100755 (executable)
#include <string.h>
#if defined(DEVICE_K2H)
-#include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
char* DTS_LOG_FILE_QUEUE_ETHx[] = {
char* DTS_LOG_FILE_FLOW_ETHx[] = {
"/proc/device-tree/soc/pktdma@2004000/channels/netrx0/flow"};
#elif defined (DEVICE_K2K)
-#include <ti/runtime/hplib/device/k2k/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2k/src/netapi_device.c>
#include <ti/drv/qmss/device/k2k/src/qmss_device.c>
#include <ti/drv/cppi/device/k2k/src/cppi_device.c>
char* DTS_LOG_FILE_QUEUE_ETHx[] = {
char* DTS_LOG_FILE_FLOW_ETHx[] = {
"/proc/device-tree/soc/pktdma@2004000/channels/netrx0/flow"};
#elif defined (DEVICE_K2L)
-#include <ti/runtime/hplib/device/k2l/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2l/src/netapi_device.c>
#include <ti/drv/qmss/device/k2l/src/qmss_device.c>
#include <ti/drv/cppi/device/k2l/src/cppi_device.c>
char* DTS_LOG_FILE_QUEUE_ETHx[] = {
char* DTS_LOG_FILE_FLOW_ETHx[] = {
"/proc/device-tree/soc/pktdma@26186000/channels/netrx0/flow"};
#elif defined (DEVICE_K2E)
-#include <ti/runtime/hplib/device/k2e/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2e/src/netapi_device.c>
#include <ti/drv/qmss/device/k2e/src/qmss_device.c>
#include <ti/drv/cppi/device/k2e/src/cppi_device.c>
char* DTS_LOG_FILE_QUEUE_ETHx[] = {
hplib_utilSetupThread(0, &cpu_set, hplib_spinLock_Type_LOL);
/* create netapi */
netapi_handle = netapi_init(NETAPI_SYS_MASTER,
- &our_netapi_default_cfg,
- &hplibDeviceGblCfgParam,
- &netapiDeviceGblCfgParam);
+ &our_netapi_default_cfg);
if(netapi_handle == NULL)
{
ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
index fe34011581fa458fd05400c39b3dbd659c84e2c3..0791f348ace1f04e94c2d18d2e5bf334176b828a 100755 (executable)
#CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc -c
#AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar -r
-CSL_DEVICE ?= -DDEVICE_K2H
#List the COMMONSRC Files
COMMONSRCC = \
index bb05dd3676b9d0c584a2f63af5097fe1f03ac196..87744b6a7c1cad8bdc0399abf3e1dc9ca877b22a 100755 (executable)
export ARMV7BINDIR ?= ./bin
-export DEVICE ?=k2h
+export DEVICE ?=k2l
#Enable the following to build for tci6614
#export CPU ?=cortex-a8
export MAKE = make
endif
+ifeq ($(DEVICE), k2h)
+export CSL_DEVICE = -DDEVICE_K2H
+endif
+ifeq ($(DEVICE), k2k)
+export CSL_DEVICE = -DDEVICE_K2K
+endif
+ifeq ($(DEVICE), k2l)
+export CSL_DEVICE = -DDEVICE_K2L -DNSS_GEN2
+endif
+ifeq ($(DEVICE), k2e)
+export CSL_DEVICE = -DDEVICE_K2E -DNSS_GEN2
+endif
+
# PHONY Targets
.PHONY: all clean lib tests examples install installbin
index 5229eac5a602e134d83781094f5fc406e27acbb1..4d5955cac5cc9c76a20fd7f6a18ee0cbef6ab194 100755 (executable)
*
* @param[in] master Can be either @ref NETAPI_SYS_MASTER or @ref NETAPI_NO_MASTER
* @param[in] p_cfg (master mode) pointer to @ref NETAPI_CFG_T or NULL to use netapi default configuration.
- * @param[in] p_hplibDeviceCfg (master mode) HPLIB device specific configuration.
- * @param[in] p_netapiDeviceCfg (master mode) NETAPI device specific configuration.
* @retval Handle to the instance or NULL on error, @ref NETAPI_T
* @pre none
*/
NETAPI_T netapi_init(int master,
- NETAPI_CFG_T * p_cfg,
- hplib_globalDeviceConfigParams_t *p_hplibDeviceCfg,
- NETCP_CFG_GLOB_DEVICE_PARAMS_T *p_netapiDeviceCfg);
-
+ NETAPI_CFG_T * p_cfg);
/**
* @ingroup netapi_gen_functions
* @brief netapi_shutdown API de-allocates all global resources allocated as part of @ref netapi_init
index 7b9bf365282af7f5096564e5d9617e277fb7c897..a953fef5c9eca3475a3dddd7ad981a1baaac72aa 100755 (executable)
@@ -122,10 +122,7 @@ Pktlib_HeapIfTable *netapi_getPktlibIfTable(void) {return &netapi_pktlib_ifTable
* DESCRIPTION: API instantiates the NETAPI and allocated global resources.
********************************************************************/
NETAPI_T netapi_init(int master,
- NETAPI_CFG_T * p_cfg,
- hplib_globalDeviceConfigParams_t *p_hplibDeviceCfg,
- NETCP_CFG_GLOB_DEVICE_PARAMS_T *p_netapiDeviceCfg)
-
+ NETAPI_CFG_T * p_cfg)
{
int i;
int err;
NETAPI_HANDLE_T * p_master;
if (!p) return NULL;
p->master = master;
- p->fNssGen2 = p_netapiDeviceCfg->fNssGen2;
+ //p->fNssGen2 = p_netapiDeviceCfg->fNssGen2;
/* SYS_MASTER: The following segment should be done 1 Time per system boot by global master process's main core/thread */
if (master == NETAPI_SYS_MASTER)
if(master == NETAPI_SYS_MASTER)
{
err = netapip_systemInit(p,
- p_hplibDeviceCfg,
- p_netapiDeviceCfg,
TRUE);
if (err<0)
{
{
/* More limited initialization */
err = netapip_systemInit(p,
- p_hplibDeviceCfg,
- p_netapiDeviceCfg,
FALSE);
if (err<0)
{
index 3af715ff85f4eae3699d3dbeaca04fbd981b6edf..c14d42114290cdcaba94c71db85d793af40d2f66 100755 (executable)
nwalGlobCfg.paVirtBaseAddr = (uint32_t) netapi_VM_VirtAddr->passCfgVaddr;
nwalGlobCfg.saVirtBaseAddr = (uint32_t) netapi_VM_VirtAddr->passCfgVaddr +
- p_netapi_device_cfg_local->cslNetCpCfgSaCfgRegs -
- p_netapi_device_cfg_local->cslNetCpCfgRegs;
+ CSL_NETCP_CFG_SA_CFG_REGS -
+ CSL_NETCP_CFG_REGS;
;
nwalGlobCfg.rxDefPktQ = QMSS_PARAM_NOT_SPECIFIED;
* DESCRIPTION: NETAPI internal function system initialization
********************************************************************/
int netapip_systemInit(NETAPI_HANDLE_T * handle,
- hplib_globalDeviceConfigParams_t *p_hplib_device_cfg,
- NETCP_CFG_GLOB_DEVICE_PARAMS_T *p_netapi_device_cfg,
Bool global_master_process)
{
- if(p_netapi_device_cfg)
- p_netapi_device_cfg_local = p_netapi_device_cfg;
- else
- {
- netapi_Log("netapip_systemInit: - netapi device cfg required\n");
- return -1;
- }
int32_t result;
Pktlib_HeapHandle sharedHeapHandle;
Pktlib_HeapHandle controlRxHeapHandle,controlTxHeapHandle;
- memory mapped peripherals we use, such as QMSS, PA, etc */
result = hplib_vmInit(&netapi_VM_VirtAddr[0],
2,
- &netapi_VM_MempoolAttr[0],
- p_hplib_device_cfg);
+ &netapi_VM_MempoolAttr[0]);
if (global_master_process == TRUE)
{
#endif
/* Initialize Queue Manager Sub System */
- result = netapip_initQm (pnetapiShm->netapi_global.cfg.def_max_descriptors,
- p_netapi_device_cfg);
+ result = netapip_initQm (pnetapiShm->netapi_global.cfg.def_max_descriptors);
if (result != 1)
{
netapi_Log("netapip_systemInit: returned from netapip_qmSetupMemRegion\n");
/* Initialize CPPI CPDMA */
- result = netapip_initCppi (p_netapi_device_cfg);
+ result = netapip_initCppi();
netapi_Log("netapip_systemInit: returned from netapip_initCppi\n");
if (result != 1)
{
index 476b19bca8bc36ee6b2bc3e898f08eb678099f22..c7d58bc612e8f2a3bcf3878aaeaadb4c15a5102e 100755 (executable)
/* thread cookie */
void* cookie; /*set by calling thread */
HPLIB_SPINLOCK_IF_T spinLock;
- uint32_t fNssGen2;
+ //uint32_t fNssGen2;
} NETAPI_HANDLE_T;
typedef struct NETAPI_SHM_Tag
} NETAPI_SHM_T;
//internal initialization routines */
-int netapip_initQm(int max_descriptors,
- NETCP_CFG_GLOB_DEVICE_PARAMS_T *p_netapi_device_cfg);
+int netapip_initQm(int max_descriptors);
-int netapip_initCppi(NETCP_CFG_GLOB_DEVICE_PARAMS_T *p_netapi_device_cfg);
+int netapip_initCppi(void);
int netapip_startQm(void);
int netapip_initNwal(int region2use,
uint32_t *swInfo0,
uint32_t *swInfo1);
-int netapip_systemInit(NETAPI_HANDLE_T * handle,
- hplib_globalDeviceConfigParams_t *p_hplib_device_cfg,
- NETCP_CFG_GLOB_DEVICE_PARAMS_T *p_netapi_device_cfg,
- Bool global_master_process);
+int netapip_systemInit(NETAPI_HANDLE_T *handle,
+ Bool global_master_process);
void netapip_cleanupAtStart(void);
index ba314884217fe6b45ca124022163dd11109a3ea3..2b3a6ae2072ddb0a38875480061e79c2f02a556f 100755 (executable)
netapip_freeTransInfo(pTransInfo);
return;
}
- if((n->fNssGen2) && (cb))
+#if defined(DEVICE_K2E) || defined(DEVICE_K2L)
+ if (cb)
{
cb(h, &netcp_stats);
}
-
+#endif
netapip_freeTransInfo(pTransInfo);
}
/********************************************************************
diff --git a/ti/runtime/netapi/src/pdkv3/netapi_navig.c b/ti/runtime/netapi/src/pdkv3/netapi_navig.c
index a5a8acd70c98f4867f5772db6db4d5fba828df02..39e156058801061b7c2d2e59dee86a37118d5c7b 100755 (executable)
*****************************************************************************
* DESCRIPTION: The function will initialize the CPPI
*****************************************************************************/
-int netapip_initCppi(NETCP_CFG_GLOB_DEVICE_PARAMS_T *p_netapi_device_cfg)
+int netapip_initCppi(void)
{
int32_t result;
/* PASS CPDMA regs */
netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].gblCfgRegs =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
- p_netapi_device_cfg->cslNetCpCfgRegs,
+ CSL_NETCP_CFG_REGS,
(uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].gblCfgRegs);
netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].txChRegs =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
- p_netapi_device_cfg->cslNetCpCfgRegs,
+ CSL_NETCP_CFG_REGS,
(uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].txChRegs);
netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].rxChRegs =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
- p_netapi_device_cfg->cslNetCpCfgRegs,
+ CSL_NETCP_CFG_REGS,
(uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].rxChRegs);
netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].txSchedRegs =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
- p_netapi_device_cfg->cslNetCpCfgRegs,
+ CSL_NETCP_CFG_REGS,
(uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].txSchedRegs);
netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].rxFlowRegs =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
- p_netapi_device_cfg->cslNetCpCfgRegs,
+ CSL_NETCP_CFG_REGS,
(uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].rxFlowRegs);
/* QMSS CPDMA regs */
netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].gblCfgRegs =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].gblCfgRegs);
netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].txChRegs =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
- (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].txChRegs);
+ CSL_QMSS_CFG_BASE,
+ (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].txChRegs);
netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].rxChRegs =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
- (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].rxChRegs);
+ CSL_QMSS_CFG_BASE,
+ (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].rxChRegs);
netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].txSchedRegs =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
- (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].txSchedRegs);
+ CSL_QMSS_CFG_BASE,
+ (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].txSchedRegs);
netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].rxFlowRegs =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
- (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].rxFlowRegs);
+ CSL_QMSS_CFG_BASE,
+ (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].rxFlowRegs);
result = Cppi_init (&netapi_cppiGblCfgParams);
if (result != CPPI_SOK) {
netapi_Log ("function testNwGlobCppiInit: Cppi_init failed with error code %d\n", result);
*****************************************************************************
* DESCRIPTION: The function will initialize the Queue Manager
*****************************************************************************/
-int netapip_initQm(int max_descriptors,
- NETCP_CFG_GLOB_DEVICE_PARAMS_T *p_netapi_device_cfg)
+int netapip_initQm(int max_descriptors)
{
Qmss_InitCfg qmssInitConfig;
int32_t result;
{
netapi_qmssGblCfgParams.groupRegs[count].qmConfigReg =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmConfigReg);
netapi_qmssGblCfgParams.groupRegs[count].qmDescReg =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmDescReg);
netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtReg =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtReg);
netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtProxyReg =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtProxyReg);
netapi_qmssGblCfgParams.groupRegs[count].qmQueStatReg =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmQueStatReg);
netapi_qmssGblCfgParams.groupRegs[count].qmStatusRAM =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmStatusRAM);
netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtDataReg =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssDataVaddr,
- p_netapi_device_cfg->cslQmssDataBase,
+ CSL_QMSS_DATA_BASE,
(uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtDataReg);
netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtProxyDataReg = NULL;
-#if 0
- netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtProxyDataReg =
- NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssDataVaddr,
- p_netapi_device_cfg->cslQmssDataBase,
- //CSL_QMSS_DATA_BASE,
-
- (uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtProxyDataReg);
-#endif
}
for(count=0;count < QMSS_MAX_INTD;count++)
{
netapi_qmssGblCfgParams.regs.qmQueIntdReg[count] =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.regs.qmQueIntdReg[count]);
}
{
netapi_qmssGblCfgParams.regs.qmPdspCmdReg[count] =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.regs.qmPdspCmdReg[count]);
netapi_qmssGblCfgParams.regs.qmPdspCtrlReg[count] =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.regs.qmPdspCtrlReg[count]);
netapi_qmssGblCfgParams.regs.qmPdspIRamReg[count] =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.regs.qmPdspIRamReg[count]);
}
netapi_qmssGblCfgParams.regs.qmLinkingRAMReg =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.regs.qmLinkingRAMReg);
netapi_qmssGblCfgParams.regs.qmBaseAddr =
NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
- p_netapi_device_cfg->cslQmssCfgBase,
+ CSL_QMSS_CFG_BASE,
(uint32_t)netapi_qmssGblCfgParams.regs.qmBaseAddr);
result = Qmss_init (&qmssInitConfig, &netapi_qmssGblCfgParams);
index f5a3f8fadc55d6f93b97bafd216c7eb64fe6caa8..bcb93f19b583baabd46b5cbba3524b14ae02a0c5 100755 (executable)
nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
Cppi_HostDesc* pPloadDesc;
- printf("netapip_pktioSendL4CkSumPort\n");
nwal_mCmdSetL4CkSumPort(pkt,
&p->tx_psCmdInfo,
pTxPktInfo->l4OffBytes,
Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
pPloadDesc,
NWAL_DESC_SIZE);
- printf("netapip_pktioSendL4CkSumPort: txQueue: %d\n",
- p->tx_psCmdInfo.txQueue);
}
index 3b2d5e8bf571a83e47541e1d2416983b55c53e01..87907d8acca8a4886f4e880487439d8ecba60906 100755 (executable)
ifeq ($(DEVICE), k2h)
-CSL_DEVICE = -DDEVICE_K2H
PA_LIB = -lpa
endif
ifeq ($(DEVICE), k2k)
-CSL_DEVICE = -DDEVICE_K2K
PA_LIB = -lpa
endif
ifeq ($(DEVICE), k2l)
-CSL_DEVICE = -DDEVICE_K2L -DNSS_GEN2
PA_LIB = -lpa2
endif
ifeq ($(DEVICE), k2e)
-CSL_DEVICE = -DDEVICE_K2E -DNSS_GEN2
PA_LIB = -lpa2
endif
index 2473c4213d88bfe4d6910fe5bdb19b3ef7b7190e..8516f7e1ce3b5ee8894e81be825fe8c8a9c64539 100755 (executable)
#include <ti/drv/sa/salld.h>
#if defined(DEVICE_K2H)
-#include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
#elif defined (DEVICE_K2K)
-#include <ti/runtime/hplib/device/k2k/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2k/src/netapi_device.c>
#include <ti/drv/qmss/device/k2k/src/qmss_device.c>
#include <ti/drv/cppi/device/k2k/src/cppi_device.c>
#elif defined (DEVICE_K2L)
-#include <ti/runtime/hplib/device/k2l/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2l/src/netapi_device.c>
#include <ti/drv/qmss/device/k2l/src/qmss_device.c>
#include <ti/drv/cppi/device/k2l/src/cppi_device.c>
#elif defined (DEVICE_K2E)
-#include <ti/runtime/hplib/device/k2e/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2e/src/netapi_device.c>
#include <ti/drv/qmss/device/k2e/src/qmss_device.c>
#include <ti/drv/cppi/device/k2e/src/cppi_device.c>
#else /*Default */
-#include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
#endif /* Device */
/* create netapi */
netapi_handle = netapi_init(NETAPI_SYS_MASTER,
- &our_netapi_default_cfg,
- &hplibDeviceGblCfgParam,
- &netapiDeviceGblCfgParam);
+ &our_netapi_default_cfg);
if (netapi_handle == NULL)
{
printf("main: netapi_init failure, exiting\n");
diff --git a/ti/runtime/netapi/test/net_test_loopback.c b/ti/runtime/netapi/test/net_test_loopback.c
index ccc15f034189809da9f92737d56ee4185d9983b0..cb70c1216c01183e3c929f711d74e53522481fe7 100755 (executable)
#if defined(DEVICE_K2H)
-#include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
#elif defined (DEVICE_K2K)
-#include <ti/runtime/hplib/device/k2k/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2k/src/netapi_device.c>
#include <ti/drv/qmss/device/k2k/src/qmss_device.c>
#include <ti/drv/cppi/device/k2k/src/cppi_device.c>
#elif defined (DEVICE_K2L)
-#include <ti/runtime/hplib/device/k2l/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2l/src/netapi_device.c>
#include <ti/drv/qmss/device/k2l/src/qmss_device.c>
#include <ti/drv/cppi/device/k2l/src/cppi_device.c>
#elif defined (DEVICE_K2E)
-#include <ti/runtime/hplib/device/k2e/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2e/src/netapi_device.c>
#include <ti/drv/qmss/device/k2e/src/qmss_device.c>
#include <ti/drv/cppi/device/k2e/src/cppi_device.c>
#else /*Default */
-#include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
#endif /* Device */
hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
#endif
worker_nh[thread_num] = netapi_init(NETAPI_CORE_MASTER,
- NULL,
- &hplibDeviceGblCfgParam,
- &netapiDeviceGblCfgParam);
+ NULL);
if (worker_nh[thread_num] == NULL)
{
hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
#endif
worker_nh[thread_num]=netapi_init(NETAPI_CORE_MASTER,
- NULL,
- &hplibDeviceGblCfgParam,
- &netapiDeviceGblCfgParam);
+ NULL);
if (worker_nh[thread_num] == NULL)
{
printf("fast_path_thread: netapi_init failure, exiting\n");
hplib_utilSetupThread(0, &cpu_set, hplib_spinLock_Type_LOL);
#endif
- /* hplib_globalDeviceConfigParams_t hplibDeviceGblCfgParam/
/* create netapi */
netapi_handle = netapi_init(NETAPI_SYS_MASTER,
- &our_netapi_default_cfg,
- &hplibDeviceGblCfgParam,
- &netapiDeviceGblCfgParam);
+ &our_netapi_default_cfg);
if (netapi_handle == NULL)
{
index f1202ee78f57bf90c517acd738a11a396336efb3..2370339834841e484f6f21a1670d72b28550ad0e 100755 (executable)
#if defined(DEVICE_K2H)
-#include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
#elif defined (DEVICE_K2K)
-#include <ti/runtime/hplib/device/k2k/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2k/src/netapi_device.c>
#include <ti/drv/qmss/device/k2k/src/qmss_device.c>
#include <ti/drv/cppi/device/k2k/src/cppi_device.c>
#elif defined (DEVICE_K2L)
-#include <ti/runtime/hplib/device/k2l/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2l/src/netapi_device.c>
#include <ti/drv/qmss/device/k2l/src/qmss_device.c>
#include <ti/drv/cppi/device/k2l/src/cppi_device.c>
#elif defined (DEVICE_K2E)
-#include <ti/runtime/hplib/device/k2e/src/hplib_device.c>
-#include <ti/runtime/netapi/device/k2e/src/netapi_device.c>
#include <ti/drv/qmss/device/k2e/src/qmss_device.c>
#include <ti/drv/cppi/device/k2e/src/cppi_device.c>
#else /*Default */
-#include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2h/src/nwal_device.c>
-#include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
#endif
hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
#endif
worker_nh[thread_num]=netapi_init(NETAPI_CORE_MASTER,
- NULL,
- &hplibDeviceGblCfgParam,
- &netapiDeviceGblCfgParam);
+ NULL);
if (worker_nh[thread_num] == NULL)
{
printf("slow_path_thread: netapi_init failure, exiting\n");
hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
#endif
worker_nh[thread_num]=netapi_init(NETAPI_CORE_MASTER,
- NULL,
- &hplibDeviceGblCfgParam,
- &netapiDeviceGblCfgParam);
+ NULL);
if (worker_nh[thread_num] == NULL)
{
printf("fast_path_thread: netapi_init failure, exiting\n");
#endif
/* create netapi */
netapi_handle = netapi_init(NETAPI_SYS_MASTER,
- &our_netapi_default_cfg,
- &hplibDeviceGblCfgParam,
- &netapiDeviceGblCfgParam);
+ &our_netapi_default_cfg);
if (netapi_handle == NULL)
{