Merge branch 'refactoring_mu' of...

Merge branch 'refactoring_mu' of http://10.37.145.15:8000/gitlab/vran/contribute_oai into refactoring_mu

openair2/NETWORK_DRIVER/UE_IP/constant.h

@@ -18,8 +18,7 @@
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
  */
-
-#include "openairinterface5g_limits.h"
+//#include "openairinterface5g_limits.h"
 #ifndef _UE_IP_CST
 #define _UE_IP_CST
 
@@ -52,8 +51,6 @@
 
 
 
-//#define UE_IP_NB_INSTANCES_MAX       NUMBER_OF_UE_MAX /*MAX_MOBILES_PER_ENB*/
-signed int UE_IP_NB_INSTANCES_MAX;
+#define UE_IP_NB_INSTANCES_MAX       256 /* NUMBER_OF_UE_MAX or MAX_MOBILES_PER_ENB*/
 
 #endif
-

openair2/NETWORK_DRIVER/UE_IP/device.c

@@ -48,8 +48,7 @@
 
 
 
-//struct net_device *ue_ip_dev[UE_IP_NB_INSTANCES_MAX];
-struct net_device **ue_ip_dev;
+struct net_device *ue_ip_dev[UE_IP_NB_INSTANCES_MAX];
 
 #ifdef OAI_NW_DRIVER_USE_NETLINK
   extern void ue_ip_netlink_release(void);
@@ -367,8 +366,6 @@ int init_module (void) {
   // Initialize parameters shared with RRC
   printk("[UE_IP_DRV][%s] Starting OAI IP driver", __FUNCTION__);
 
-  UE_IP_NB_INSTANCES_MAX = NUMBER_OF_UE_MAX;
-  ue_ip_dev = (struct net_device **)malloc(sizeof(struct net_device*)*UE_IP_NB_INSTANCES_MAX);
   for (inst=0; inst<UE_IP_NB_INSTANCES_MAX; inst++) {
     printk("[UE_IP_DRV][%s] begin init instance %d\n", __FUNCTION__,inst);
     sprintf(devicename,"oip%d",inst+1);

openair2/NETWORK_DRIVER/UE_IP/local.h

@@ -109,7 +109,6 @@ typedef struct pdcp_data_ind_header_s {
 
 
 
-//extern struct net_device *ue_ip_dev[UE_IP_NB_INSTANCES_MAX];
-extern struct net_device **ue_ip_dev;
+extern struct net_device *ue_ip_dev[UE_IP_NB_INSTANCES_MAX];
 
 #endif

targets/COMMON/openairinterface5g_limits.h

 #ifndef OPENAIRINTERFACE5G_LIMITS_H_
 #define OPENAIRINTERFACE5G_LIMITS_H_
 
-signed int NUMBER_OF_UE_MAX;
-signed int NUMBER_OF_UCI_VARS_MAX;
+unsigned int NUMBER_OF_UE_MAX;
+unsigned int NUMBER_OF_UCI_VARS_MAX;
 
 #if defined(CBMIMO1) || defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_LMSSDR)
 #        define NUMBER_OF_eNB_MAX 1

targets/RT/USER/lte-softmodem.c

@@ -100,7 +100,6 @@ pthread_cond_t nfapi_sync_cond;
 pthread_mutex_t nfapi_sync_mutex;
 int nfapi_sync_var=-1; //!< protected by mutex \ref nfapi_sync_mutex
 
-
 uint16_t sf_ahead=4;
 
 pthread_cond_t sync_cond;

targets/RT/USER/lte-uesoftmodem.c

@@ -106,7 +106,6 @@ uint16_t sf_ahead=2;
 int tddflag;
 char *emul_iface;
 
-
 pthread_cond_t sync_cond;
 pthread_mutex_t sync_mutex;
 int sync_var=-1; //!< protected by mutex \ref sync_mutex.