merge with develop

openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c

@@ -42,6 +42,9 @@
 
 #include <dlfcn.h>
 
+#include "common/ran_context.h"
+extern RAN_CONTEXT_t RC;
+
 /*Array containing the Agent-MAC interfaces*/
 AGENT_MAC_xface *agent_mac_xface[NUM_MAX_ENB];
 

openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c

@@ -33,6 +33,9 @@
 #include "flexran_agent_mac_internal.h"
 #include "flexran_agent_mac_slice_verification.h"
 
+#include "common/ran_context.h"
+extern RAN_CONTEXT_t RC;
+
 extern SLIST_HEAD(flexran_so_handle,
                   flexran_agent_so_handle_s) flexran_handles[NUM_MAX_ENB];
 

openair2/ENB_APP/NB_IoT_interface.c

@@ -35,6 +35,9 @@
 #define NBIOT_INTERFACE_SOURCE
 #include "NB_IoT_interface.h"
 
+#include "common/ran_context.h"
+extern RAN_CONTEXT_t RC;
+
 
 
 

openair2/ENB_APP/NB_IoT_interface.h

@@ -31,6 +31,7 @@
 
 
 #define NBIOT_MODULENAME "NB_IoT"
+#include "common/ran_context.h"
 
 typedef void(*RCConfig_NbIoT_f_t)(RAN_CONTEXT_t *RC);
 #define NBIOT_RCCONFIG_FNAME "RCConfig_NbIoT"

openair2/ENB_APP/enb_config.c

@@ -63,6 +63,8 @@ extern uint32_t to_earfcn_UL(int eutra_bandP, uint32_t ul_CarrierFreq, uint32_t
 extern char *parallel_config;
 extern char *worker_config;
 
+RAN_CONTEXT_t RC;
+
 void RCconfig_flexran() {
   /* get number of eNBs */
   paramdef_t ENBSParams[] = ENBSPARAMS_DESC;

openair2/ENB_APP/enb_config.h

@@ -100,7 +100,6 @@ typedef struct ru_config_s {
   uint8_t   if_compress;
 } ru_config_t;
 
-extern void RCconfig_RU(void);
 extern void RCconfig_flexran(void);
 extern void RCconfig_L1(void);
 extern void RCconfig_macrlc(int macrlc_has_f1[MAX_MAC_INST]);

openair2/ENB_APP/flexran_agent.c

@@ -33,6 +33,9 @@
 #include <pthread.h>
 #include <arpa/inet.h>
 
+#include "common/ran_context.h"
+extern RAN_CONTEXT_t RC;
+
 int agent_task_created = 0;
 /* 
  * enb agent task mainly wakes up the tx thread for periodic and oneshot messages to the controller 

openair2/ENB_APP/flexran_agent_common.c

@@ -53,6 +53,9 @@
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
 #include "rrc_eNB_UE_context.h"
 
+#include "common/ran_context.h"
+extern RAN_CONTEXT_t RC;
+
 /*
  * message primitives
  */

openair2/ENB_APP/flexran_agent_ran_api.c

@@ -32,6 +32,9 @@
 #include "s1ap_eNB_management_procedures.h"
 #include "openair2/LAYER2/MAC/slicing/slicing.h"
 
+#include "common/ran_context.h"
+extern RAN_CONTEXT_t RC;
+
 static inline int phy_is_present(mid_t mod_id, uint8_t cc_id) {
   return RC.eNB && RC.eNB[mod_id] && RC.eNB[mod_id][cc_id];
 }

openair2/LAYER2/MAC/mac_extern.h

@@ -77,4 +77,8 @@ extern eNB_UE_STATS pre_scd_eNB_UE_stats[MAX_NUM_CCs][NUMBER_OF_UE_MAX];
 
 extern mac_rlc_am_muilist_t rlc_am_mui;
 extern SCHEDULER_MODES global_scheduler_mode;
+
+#include "common/ran_context.h"
+extern RAN_CONTEXT_t RC;
+
 #endif //DEF_H

openair2/PHY_INTERFACE/IF_Module.c

@@ -19,6 +19,8 @@ extern int oai_nfapi_rx_ind(nfapi_rx_indication_t *ind);
 extern uint16_t sf_ahead;
 extern UL_RCC_IND_t  UL_RCC_INFO;
 
+extern RAN_CONTEXT_t RC;
+
 uint16_t frame_cnt=0;
 void handle_rach(UL_IND_t *UL_info) {
   int i;