summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4c6873a)
raw | patch | inline | side by side (parent: 4c6873a)
author | Tinku Mannan <tmannan@ti.com> | |
Fri, 17 May 2013 17:55:51 +0000 (13:55 -0400) | ||
committer | Tinku Mannan <tmannan@ti.com> | |
Fri, 17 May 2013 20:18:37 +0000 (16:18 -0400) |
index edd120f57086c73d2068aaff9baa660cf103be20..46bb3ec164060e537c6b48008319698f337b723d 100755 (executable)
QMSS_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/qmss
SA_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/sa
CPPI_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/cppi
QMSS_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/qmss
SA_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/sa
CPPI_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/cppi
+
+
+NETAPI_INC_DIR ?= $(TRANS_SDK_INSTALL_PATH)
+NETAPI_SRC_DIR ?= $(TRANS_SDK_INSTALL_PATH)/ti/runtime/netapi
+
#HPLIB_INC_DIR = $(HPLIB_INSTALL_PATH)/ti/runtime/hplib
HPLIB_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/runtime/hplib
#HPLIB_INC_DIR = $(HPLIB_INSTALL_PATH)/ti/runtime/hplib
HPLIB_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/runtime/hplib
-INCDIR := $(PDK_INSTALL_PATH); $(QMSS_INC_DIR); $(CPPI_INC_DIR); $(HPLIB_INC_DIR)
+INCDIR := $(PDK_INSTALL_PATH);$(QMSS_INC_DIR);$(CPPI_INC_DIR);$(HPLIB_INC_DIR);$(NETAPI_INC_DIR)
-WORKDIR ?= $(TRANS_SDK_INSTALL_PATH)
-#NETAPI_INC_DIR ?= $(NETAPI_INSTALL_PATH)/ti/runtime/netapi
-#NETAPI_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/runtime/netapi
-NETAPI_INC_DIR ?= $(WORKDIR)
export PDK_VER ?= v3
export PDK_VER ?= v3
-NETAPI_NAVIG_INIT_SRC=$(NETAPI_INC_DIR)/src/pdk$(PDK_VER)
+NETAPI_NAVIG_INIT_SRC=$(NETAPI_SRC_DIR)/src/pdk$(PDK_VER)
ifeq ($(CPU), cortex-a8)
CFLAGS += -DCORTEX_A8
ifeq ($(CPU), cortex-a8)
CFLAGS += -DCORTEX_A8
#NETAPI dirs
OBJEXT = o
INTERNALLINKDEFS =
#NETAPI dirs
OBJEXT = o
INTERNALLINKDEFS =
-#SRCDIR = ./src;$(NETAPI_INC_DIR)/src
SRCDIR = ./src
#VPATH=$(SRCDIR):$(NETAPI_NAVIG_INIT_SRC)
VPATH=$(SRCDIR):./src/pdk$(PDK_VER)
SRCDIR = ./src
#VPATH=$(SRCDIR):$(NETAPI_NAVIG_INIT_SRC)
VPATH=$(SRCDIR):./src/pdk$(PDK_VER)
pktio.c \
netapi_navig.c\
pktio.c \
netapi_navig.c\
-CFLAGS+= $(DEBUG_FLAG) -I$(NETAPI_INC_DIR) -I. -I $(SRCDIR) -I$(PDK_INSTALL_PATH) -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(TRANS_SDK_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(HPLIB_INC_DIR) -I$(QMSS_DEV_DIR) -I$(CPPI_DEV_DIR) -I$(NETAPI_NAVIG_INIT_SRC) -I$(SA_INSTALL_PATH) $(CSL_DEVICE) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -DNWAL_ENABLE_SA -pthread -D _GNU_SOURCE
-#CFLAGS+= $(DEBUG_FLAG) -I$(NETAPI_INC_DIR) -I. -I $(SRCDIR) -I$(PDK_INSTALL_PATH) -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(TRANS_SDK_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(HPLIB_INC_DIR) -I$(QMSS_DEV_DIR) -I$(CPPI_DEV_DIR) -I$(NETAPI_NAVIG_INIT_SRC) $(CSL_DEVICE) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -DNWAL_ENABLE_SA -pthread -D _GNU_SOURCE
+CFLAGS+= $(DEBUG_FLAG) -I. -I $(SRCDIR) -I$(PDK_INSTALL_PATH) -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(TRANS_SDK_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(HPLIB_INC_DIR) -I$(QMSS_DEV_DIR) -I$(CPPI_DEV_DIR) -I$(NETAPI_NAVIG_INIT_SRC) -I$(SA_INSTALL_PATH) $(CSL_DEVICE) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -DNWAL_ENABLE_SA -pthread -D _GNU_SOURCE
$(COMMONSRCCOBJS): $(ARMV7OBJDIR)/netapi/lib/%.$(OBJEXT): %.c
-@echo compiling $< ........
-@echo vpath = $(VPATH)
$(COMMONSRCCOBJS): $(ARMV7OBJDIR)/netapi/lib/%.$(OBJEXT): %.c
-@echo compiling $< ........
-@echo vpath = $(VPATH)
- -@echo workdir = $(WORKDIR)
@mkdir -p $(ARMV7OBJDIR)/netapi/lib/
$(CC) -c $(CFLAGS) $(INCS) $< -o $@
@mkdir -p $(ARMV7OBJDIR)/netapi/lib/
$(CC) -c $(CFLAGS) $(INCS) $< -o $@
index 8d0f595a80bd85931078304b4096ab3faaa7043b..7cfe3cb6b8237bbab8fb9003c0f4aa1db4cb2235 100755 (executable)
#include <string.h>
#include "ti/runtime/hplib/hplib.h"
#include <string.h>
#include "ti/runtime/hplib/hplib.h"
+#if 0
#include "ti/runtime/netapi/netapi_types.h"
#include "ti/runtime/netapi/netapi_tune.h"
#include "ti/runtime/netapi/pktio.h"
#include "ti/runtime/netapi/netapi_types.h"
#include "ti/runtime/netapi/netapi_tune.h"
#include "ti/runtime/netapi/pktio.h"
#include "ti/runtime/netapi/netapi_sec.h"
#include "ti/runtime/netapi/netapi_sched.h"
#include "ti/runtime/netapi/netapi_util.h"
#include "ti/runtime/netapi/netapi_sec.h"
#include "ti/runtime/netapi/netapi_sched.h"
#include "ti/runtime/netapi/netapi_util.h"
+#endif
-
+#include "netapi_types.h"
+#include "netapi_tune.h"
+#include "pktio.h"
+#include "netcp_cfg.h"
+#include "netapi_sec.h"
+#include "netapi_sched.h"
+#include "netapi_util.h"
/* Define NETAPI as a master group in Doxygen format and
/* Define NETAPI as a master group in Doxygen format and
index ce7d4f7ee9c2c75a94fa1f13428ae7c2a28c8202..bb710204e6eb6eafd36f278165ad9b79a7653fbf 100755 (executable)
//#include "ti/runtime/netapi/netapi.h"
#include "ti/drv/nwal/nwal_util.h"
//#include "ti/runtime/netapi/netapi.h"
#include "ti/drv/nwal/nwal_util.h"
-#include "ti/runtime/netapi/pktio.h"
+#include "pktio.h"
#include "ti/drv/nwal/nwal.h"
#include "ti/drv/nwal/nwal_util.h"
#include "ti/drv/nwal/nwal.h"
#include "ti/drv/nwal/nwal_util.h"
index 409ba066a91086c9f4868d1b1599832f9cc38beb..1539d702a00b0c3b5d0e214b4ff51b8aa16e1eef 100755 (executable)
export ARMV7SALIBDIR ?= ./lib
export ARMV7LIBDIRLOCAL ?= ../../lib
# INCLUDE Directories
export ARMV7SALIBDIR ?= ./lib
export ARMV7LIBDIRLOCAL ?= ../../lib
# INCLUDE Directories
-WORKDIR ?= $(TRANS_SDK_INSTALL_PATH)
+#WORKDIR ?= $(TRANS_SDK_INSTALL_PATH)
SA_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/sa
QMSS_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/qmss
CPPI_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/cppi
SA_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/sa
QMSS_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/qmss
CPPI_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/cppi
-HPLIB_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/runtime/hplib
-NETAPI_INC_DIR ?= $(WORKDIR)
+HPLIB_INC_DIR ?= $(TRANS_SDK_INSTALL_PATH)
+NETAPI_SRC_DIR ?= $(TRANS_SDK_INSTALL_PATH)/ti/runtime/netapi
+NETAPI_INC_DIR ?= $(TRANS_SDK_INSTALL_PATH)
NWAL_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/nwal
PKTLIB_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/runtime/pktlib
NWAL_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/nwal
PKTLIB_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/runtime/pktlib
-
-
-#NETAPI LIB Build directory
-NETAPI_BUILD_DIR = $(NETAPI_INC_DIR)/ti/runtime/netapi/build
-
-
# Set NETAPI INSTALL PATH to Transport SDK for default
CSL_DEVICE ?= -DDEVICE_K2H
# Set NETAPI INSTALL PATH to Transport SDK for default
CSL_DEVICE ?= -DDEVICE_K2H
#CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc -c
#AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar -r
#CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc -c
#AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar -r
-CFLAGS+= $(DEBUG_FLAG) -I../ -I. -I$(NETAPI_INC_DIR) -I$(NETAPI_INC_DIR)/src -I$(HPLIB_INC_DIR) -I$(PDK_INSTALL_PATH) -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(SA_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(SA_INC_DIR) $(CSL_DEVICE) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DNWAL_ENABLE_SA -DMAKEFILE_BUILD -D _GNU_SOURCE
+CFLAGS+= $(DEBUG_FLAG) -I../ -I. -I$(NETAPI_SRC_DIR) -I$(NETAPI_SRC_DIR)/src -I$(HPLIB_INC_DIR) -I$(NETAPI_INC_DIR)-I$(PDK_INSTALL_PATH) -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(SA_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(SA_INC_DIR) $(CSL_DEVICE) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DNWAL_ENABLE_SA -DMAKEFILE_BUILD -D _GNU_SOURCE
# Linker options
INTERNALLINKDEFS = -Wl,--start-group $(NETAPI_LIB) $(PKTLIB_LIB) $(HP_LIB) $(QMSS_LIB) $(CPPI_LIB) $(NWAL_LIB) $(PA_LIB) $(SA_LIB) -Wl,--end-group -lrt -pthread -L$(ARMV7LIBDIR) -L$(ARMV7LIBDIRLOCAL) -L$(ARMV7SALIBDIR)
# Linker options
INTERNALLINKDEFS = -Wl,--start-group $(NETAPI_LIB) $(PKTLIB_LIB) $(HP_LIB) $(QMSS_LIB) $(CPPI_LIB) $(NWAL_LIB) $(PA_LIB) $(SA_LIB) -Wl,--end-group -lrt -pthread -L$(ARMV7LIBDIR) -L$(ARMV7LIBDIRLOCAL) -L$(ARMV7SALIBDIR)
rm -f $(ARMV7BINDIR)/netapi/test/net_test_bench
rm -f $(ARMV7BINDIR)/netapi/test/net_test_bench
-$(ARMV7OBJDIR)/netapi/test/%.o: $(NETAPI_INC_DIR)/ti/runtime/netapi/test/%.c $(ARMV7OBJDIR)/netapi/test/.created
+$(ARMV7OBJDIR)/netapi/test/%.o: $(NETAPI_SRC_DIR)/test/%.c $(ARMV7OBJDIR)/netapi/test/.created
@echo compiling $<
@echo compiling $<
- @echo workdir = $(WORKDIR)
$(CC) -c $(CFLAGS) $< -o $@
$(ARMV7OBJDIR)/netapi/test/.created:
$(CC) -c $(CFLAGS) $< -o $@
$(ARMV7OBJDIR)/netapi/test/.created:
index a0fbd1775294c3e6b9693e2e26a7acfcdc827408..33f8591448653162d11e2260b217127abaebc443 100755 (executable)
#include "trie.h"
#include "string.h"
#include "trie.h"
#include "string.h"
-#include "ti/runtime/netapi/netapi.h"
-#include "ti/runtime/netapi/pktio.h"
+#include "netapi.h"
+#include "pktio.h"
#include "net_test.h"
#include <ti/drv/sa/salld.h>
#include "net_test.h"
#include <ti/drv/sa/salld.h>
index f65d9e9bea448b4823c1ab152ca60bf2223a0911..a5239d496ec2c6ea459cf0193c07cde8553c64b5 100755 (executable)
#ifndef __NET_TEST_H__
#define __NET_TEST_H__
#ifndef __NET_TEST_H__
#define __NET_TEST_H__
-#include "ti/runtime/netapi/netapi.h"
+#include "netapi.h"
#include "trie.h"
#include "net_test_sa_utils.h"
#include "trie.h"
#include "net_test_sa_utils.h"