Merge remote-tracking branch 'origin/lamarr'
authorTinku Mannan <tmannan@ti.com>
Thu, 24 Apr 2014 17:38:25 +0000 (13:38 -0400)
committerTinku Mannan <tmannan@ti.com>
Thu, 24 Apr 2014 17:38:25 +0000 (13:38 -0400)
Conflicts:
ti/runtime/netapi/src/netapi_loc.h

1  2 
ti/runtime/netapi/netapi.h
ti/runtime/netapi/netapi_util.h
ti/runtime/netapi/netcp_cfg.h
ti/runtime/netapi/pktio.h
ti/runtime/netapi/src/netapi_loc.h

Simple merge
Simple merge
Simple merge
Simple merge
index 9aeabaafc04de05315cebde49057eec0b5f8bb38,09f5f34a3f2c6e92a065edb05474227a41399694..476b19bca8bc36ee6b2bc3e898f08eb678099f22
@@@ -433,14 -429,11 +435,19 @@@ int netapip_netcpCfgGetSaInflowInfo(NET
                                        uint32_t *swInfo0,
                                        uint32_t *swInfo1);
  
- int netapip_systemInit(NETAPI_HANDLE_T *, Bool);
+ 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);
  void netapip_cleanupAtStart(void);
 +
 +
 +
 +
 +#ifdef __cplusplus
 +}
 +#endif
 +
  #endif