Update for crash and compilation fix for latest in the branch FUL.NETAPI.KEYSTONE2.BASELINE1
authorRaghu Nambiath <rnambiath@ti.com>
Mon, 22 Oct 2012 18:22:23 +0000 (14:22 -0400)
committerRaghu Nambiath <rnambiath@ti.com>
Mon, 22 Oct 2012 18:22:23 +0000 (14:22 -0400)
ti/runtime/netapi/build/Makefile
ti/runtime/netapi/src/pdk/v2/netapi_navig.c
ti/runtime/netapi/test/net_test.c

index 8c80c064ad9cfb6f43b611dd1db5d3fa09a7c064..7e2be20e9bbe913b30ffeeddc7b199d4e8013ac9 100755 (executable)
@@ -55,7 +55,7 @@ COMMONSRCC = \
     netapi_navig.c\
     timlist.c
 
     netapi_navig.c\
     timlist.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$(SA_INSTALL_PATH) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -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$(QMSS_DEV_DIR) -I$(CPPI_DEV_DIR) -I$(NETAPI_NAVIG_INIT_SRC) -I$(SA_INSTALL_PATH) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -pthread -D _GNU_SOURCE
 INCS = -I$(strip $(subst ;, -I,$(subst $(space),\$(space),$(INCDIR))))
 all: lib
 
 INCS = -I$(strip $(subst ;, -I,$(subst $(space),\$(space),$(INCDIR))))
 all: lib
 
index 352ecd70026b4f363a56841279459132dab18e37..cff6674eb0f96b1fd7557be2e62f55616d156260 100644 (file)
@@ -271,10 +271,8 @@ int netapi_init_qm(int max_descriptors)
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmTimer16Reg[1]);
 
                          QMSS_CFG_BASE_ADDR,
                          (uint32_t)netapi_qmssGblCfgParams.qmTimer16Reg[1]);
 
-  netapi_qmssGblCfgParams.qmQueMgmtDataReg =
-    NETAPI_GET_REG_VADDR(netapi_VM_qmssDataVaddr,
-                         QMSS_DATA_BASE_ADDR,
-                         netapi_qmssGblCfgParams.qmQueMgmtDataReg);
+  netapi_qmssGblCfgParams.qmQueMgmtDataReg = 
+                                (void *)((uint32_t)netapi_VM_qmssDataVaddr);
 
   netapi_qmssGblCfgParams.qmQueMgmtProxyDataReg =
     NETAPI_GET_REG_VADDR(netapi_VM_qmssDataVaddr,
 
   netapi_qmssGblCfgParams.qmQueMgmtProxyDataReg =
     NETAPI_GET_REG_VADDR(netapi_VM_qmssDataVaddr,
index ce67fc979d10dbf3b0ced18a275bcb7e441ff1d3..ba5c75dca9b59e342dd102b408367856ba97026a 100755 (executable)
@@ -2579,7 +2579,7 @@ netcp_cfgCreateMacInterface(
 if (err) {printf("addmac0 failed %d\n",err); exit(1); } 
 
 //attach an IP to this interface
 if (err) {printf("addmac0 failed %d\n",err); exit(1); } 
 
 //attach an IP to this interface
-ip_rule0=netcp_addIp(
+ip_rule0=netcp_cfgAddIp(
                   netapi_handle,
                   0,
                   nwal_IPV4,
                   netapi_handle,
                   0,
                   nwal_IPV4,
@@ -2602,7 +2602,7 @@ netcp_cfgCreateMacInterface(
 if (err) {printf("addmac1 failed %d\n",err); exit(1); }
 
 //attach an IP to this interface
 if (err) {printf("addmac1 failed %d\n",err); exit(1); }
 
 //attach an IP to this interface
-ip_rule1=netcp_addIp(
+ip_rule1=netcp_cfgAddIp(
                   netapi_handle,
                   1,
                   nwal_IPV4,
                   netapi_handle,
                   1,
                   nwal_IPV4,