Fix for SDOCM00107501:Compilation issues observed when compiling with C++

diff --git a/ti/runtime/netapi/netapi.h b/ti/runtime/netapi/netapi.h
index e8cbd7d6abda512a6d74af3da9b42bd11c78b7d6..9904b790339765849e01a3917d7ba461007183ff 100755 (executable)
--- a/ti/runtime/netapi/netapi.h
+++ b/ti/runtime/netapi/netapi.h
@@ -78,6 +78,10 @@
 #ifndef __NETAPI__H
 #define __NETAPI__H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -297,5 +301,7 @@ void netapi_netcpPoll(NETAPI_T  p);
  */
 void netapi_pollHeapGarbage(NETAPI_T p);
 
-
+#ifdef __cplusplus
+}
+#endif
 #endif

diff --git a/ti/runtime/netapi/netapi_sched.h b/ti/runtime/netapi/netapi_sched.h
index 4cc3ed9942b6c32cec00be3823facb06a09c1706..1fa1bd9a4c19059697d827e0ee65f30b57d53e3c 100755 (executable)
--- a/ti/runtime/netapi/netapi_sched.h
+++ b/ti/runtime/netapi/netapi_sched.h
@@ -47,6 +47,10 @@
 
 #ifndef __NETAPI_SCHED__
 #define __NETAPI_SCHED__
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "netapi.h"
 
 /**
@@ -337,4 +341,9 @@ void netapi_schedGetStats(NETAPI_SCHED_HANDLE_T*    s,
                           unsigned long long*       p_pkts, 
                           unsigned long long*       p_cycles,
                           unsigned long long*       p_ccycles);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/ti/runtime/netapi/netapi_sec.h b/ti/runtime/netapi/netapi_sec.h
index b731481241f23d3747da9f567b3a1a704a85ed30..bdd5c49f88b306ba56dfcc053663eef20e9f3853 100755 (executable)
--- a/ti/runtime/netapi/netapi_sec.h
+++ b/ti/runtime/netapi/netapi_sec.h
@@ -48,6 +48,12 @@
 
 #ifndef __NETAPI_SEC__H
 #define __NETAPI_SEC__H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #include "netapi.h"
 #include "ti/drv/nwal/nwal.h"
 #include <ti/drv/sa/salld.h>
@@ -261,4 +267,8 @@ void netapi_secGetChanCtxInfo(NETAPI_T h,
                            NETCP_CFG_APP_ID_T appId,
                            nwalChanCxtInfo_t* pInfo);
 
+
+#ifdef __cplusplus
+}
+#endif
 #endif

diff --git a/ti/runtime/netapi/netapi_tune.h b/ti/runtime/netapi/netapi_tune.h
index 079eafe8b294dabaab30b5a535c7d0f6517b4e72..1b457f75949cd0e75eace9df3788ac455db2a30a 100755 (executable)
--- a/ti/runtime/netapi/netapi_tune.h
+++ b/ti/runtime/netapi/netapi_tune.h
@@ -49,6 +49,9 @@
 #ifndef __NETAPI_TUNE__H
 #define __NETAPI_TUNE__H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 /**
  * @ingroup tune_parameters
  * @def NETAPI_ENABLE_SECURITY
@@ -364,4 +367,7 @@
 */
 #define TUNE_NETAPI_MAX_POLICY 128  //rx policies
 
+#ifdef __cplusplus
+}
+#endif
 #endif

diff --git a/ti/runtime/netapi/netapi_types.h b/ti/runtime/netapi/netapi_types.h
index a1db13348c7b225b709e50c3e010704b1c3c3399..ca5c075f422725eb193a69afda76fcfe36cb23dc 100755 (executable)
--- a/ti/runtime/netapi/netapi_types.h
+++ b/ti/runtime/netapi/netapi_types.h
@@ -44,6 +44,9 @@
 #ifndef __NETAPI_ERR__
 #define __NETAPI_ERR__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /**
  * @ingroup cfg_constants
@@ -148,5 +151,9 @@ typedef int16_t netapi_RetValue;
  */
 #define NETAPI_ERR_NWAL_TX_ERR -65536
 
+#ifdef __cplusplus
+}
+#endif
+
 
 #endif

diff --git a/ti/runtime/netapi/netapi_util.h b/ti/runtime/netapi/netapi_util.h
index 34fc55e9ff6b2f8916084d0e8061b14291777c53..a98f72afdc09a197a2f6b5ed9d05cfba164d93c4 100755 (executable)
--- a/ti/runtime/netapi/netapi_util.h
+++ b/ti/runtime/netapi/netapi_util.h
@@ -43,6 +43,11 @@
 #ifndef __NETAPI_UTIL__H
 #define __NETAPI_UTIL__H
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 #include "./src/netapi_loc.h"
 
@@ -417,4 +422,9 @@ static inline netapi_RetValue netapi_netcpCfgUpdateUserData(NETAPI_T h,
     }
 }
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif

diff --git a/ti/runtime/netapi/netapi_ver.h b/ti/runtime/netapi/netapi_ver.h
index eb94f22edefe2f40bb5ed3effd2729ec7fee9196..ecee4fd7bcc0f50bea6f2ac3545901ed6f9b16ac 100755 (executable)
--- a/ti/runtime/netapi/netapi_ver.h
+++ b/ti/runtime/netapi/netapi_ver.h
@@ -43,20 +43,25 @@
 
 #ifndef __NETAPI_ERR__
 #define __NETAPI_ERR__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @def NETAPI_VERSION_ID
  *      This is the NETAPI Version. Versions numbers are encoded in the following 
  *      format:
  *              0xAABBCCDD -> Arch (AA); API Changes (BB); Major (CC); Minor (DD)
  */
-#define NETAPI_VERSION_ID                   (0x0100000A)
+#define NETAPI_VERSION_ID                   (0x0100000B)
 
 /**
  * @def NETAPI_VERSION_STR
  *      This is the version string which describes the NETAPI along with the
  *      date and build information.
  */
-#define NETAPI_VERSION_STR      "NETAPI Revision: 01.00.00.10"
+#define NETAPI_VERSION_STR      "NETAPI Revision: 01.00.00.11"
 
 /**
  *  @ingroup netapi_gen_functions
@@ -80,4 +85,10 @@ return NETAPI_VERSION_ID;
  *  @pre        @ref netapi_init
  */
 static inline char * netapi_getVersionString(void) { return NETAPI_VERSION_STR;}
+
+
+
+#ifdef __cplusplus
+}
+#endif
 #endif

diff --git a/ti/runtime/netapi/netcp_cfg.h b/ti/runtime/netapi/netcp_cfg.h
index cd4bb2d9142228348aef0dc27645afacb5116991..09adecc601c809f7f42d102cfd6cbabd40a5ffe3 100755 (executable)
--- a/ti/runtime/netapi/netcp_cfg.h
+++ b/ti/runtime/netapi/netcp_cfg.h
@@ -50,6 +50,10 @@
 #ifndef __NETCP_CFG__H
 #define __NETCP_CFG__H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "netapi.h"
 
 /**
@@ -832,5 +836,8 @@ NETCP_CFG_EXCEPTION_PKT_T netapi_netcpCfgExceptions(NETAPI_T
                                                     NETCP_CFG_ROUTE_HANDLE_T    p_route);
 
 
+#ifdef __cplusplus
+}
+#endif
 #endif
 

diff --git a/ti/runtime/netapi/netsync.h b/ti/runtime/netapi/netsync.h
index 7bab14fc1e931a49ff685ee24b7070bdd98678eb..133cf3c1afe351cbf1a1323f9b6ded444fd72b70 100755 (executable)
--- a/ti/runtime/netapi/netsync.h
+++ b/ti/runtime/netapi/netsync.h
@@ -43,6 +43,9 @@
 #ifndef NETAPI_SYNC_H
 #define NETAPI_SYNCH_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include "hplib_sync.h"
 
 /*--------------------------*/
@@ -153,4 +156,7 @@
 #define netapi_wmb hplib_mWriteMemBarrier
 
 
+#ifdef __cplusplus
+}
+#endif
 #endif

diff --git a/ti/runtime/netapi/pktio.h b/ti/runtime/netapi/pktio.h
index 7f2e6e19dc89bb553f2753c62197969846ce949d..c0d6250f932ca894b3e54e55c6c44d7820e13ee3 100755 (executable)
--- a/ti/runtime/netapi/pktio.h
+++ b/ti/runtime/netapi/pktio.h
@@ -51,6 +51,12 @@
 
 #ifndef __PKTIO__H
 #define __PKTIO__H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 #include "netapi.h"
 #include "ti/drv/nwal/nwal.h"
 #include "ti/drv/nwal/nwal_util.h"
@@ -807,5 +813,8 @@ static inline nwal_Inst pktio_mGetNwalInstance(PKTIO_HANDLE_T *h)
     return h->nwalInstanceHandle;
 }
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif

diff --git a/ti/runtime/netapi/src/netapi_loc.h b/ti/runtime/netapi/src/netapi_loc.h
index e20a647b2298e80440531a8b68b0638af66b2d7e..9aeabaafc04de05315cebde49057eec0b5f8bb38 100755 (executable)
--- a/ti/runtime/netapi/src/netapi_loc.h
+++ b/ti/runtime/netapi/src/netapi_loc.h
@@ -6,6 +6,12 @@
 #ifndef __NETAPI_LOC__H
 #define __NETAPI_LOC__H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
 #include "ti/drv/nwal/nwal_util.h"
 #include "ti/runtime/netapi/pktio.h"
 #include "ti/drv/nwal/nwal.h"
@@ -397,6 +403,7 @@ void netapip_netcpCfgBuildRoute(NETCP_CFG_ROUTE_T * p_route,
 
 //database utilities
 void netapip_netcpCfgDeleteSa(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,int sa_slot);
+
 void netapip_netcpCfgInsertSa(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
                           int sa_slot,  //we 'reserved it already'
                           int dir,
@@ -405,7 +412,11 @@ void netapip_netcpCfgInsertSa(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
                           void * temp2,
                           void * handle_inflow,
                           void * handle_sideband,
-                          nwalTxDmPSCmdInfo_t *dmPSCmdInfo;);
+                          nwalTxDmPSCmdInfo_t *dmPSCmdInfo,
+                          uint32_t swInfo0,
+                          uint32_t swInfo1,
+                          void* user_data);
+
 void *netapip_netcpCfgGetSaHandles( NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
                           int sa_slot, void ** p_sideband);
 void* netapip_netcpCfgGetMacHandle(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,int iface_no);
@@ -424,4 +435,12 @@ int netapip_netcpCfgGetSaInflowInfo(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
 
 int netapip_systemInit(NETAPI_HANDLE_T *, Bool);
 void netapip_cleanupAtStart(void);
+
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/ti/runtime/netapi/src/netapi_sec.c b/ti/runtime/netapi/src/netapi_sec.c
index f4c456036a26d1e4798e59a4245643df2745a0c4..a077236f7a6f33cbcf302cb8241c93d430359587 100755 (executable)
--- a/ti/runtime/netapi/src/netapi_sec.c
+++ b/ti/runtime/netapi/src/netapi_sec.c
@@ -307,7 +307,8 @@ NETCP_CFG_SA_T netapi_secAddSA(NETAPI_T h,
                           tunnelId,
                           (sa_info->dir ==   NWAL_SA_DIR_INBOUND) ? TRUE: FALSE,
                           inflow_mode,
-                          &saInfo, &createParam,
+                          &saInfo,
+                         &createParam,
                           *p_inflow_mode_handle,
                           *p_data_mode_handle,
                           &dmPSCmdInfo,