merge measurement_parameters config source from branch feature_Malaysia

openair2/COMMON/x2ap_messages_types.h

@@ -39,7 +39,7 @@
 #define X2AP_HANDOVER_CANCEL(mSGpTR)            (mSGpTR)->ittiMsg.x2ap_handover_cancel
 
 
-#define X2AP_MAX_NB_ENB_IP_ADDRESS 2
+#define X2AP_MAX_NB_ENB_IP_ADDRESS 6
 
 // eNB application layer -> X2AP messages
 

openair2/RRC/LTE/rrc_defs.h

@@ -816,7 +816,27 @@ typedef struct {
   uint32_t                           sizeof_paging[MAX_MOBILES_PER_ENB];
 } rrc_eNB_carrier_data_t;
 
-  
+typedef struct measurement_event_info_s{
+  char                  *threshold_select;
+  uint8_t               threshold_RSRP;
+  uint8_t               threshold_RSRQ;
+  uint8_t               maxReportCells;
+  uint8_t               reportInterval;
+  uint8_t               a3_Offset;
+  uint8_t               hysteresis;
+  uint8_t               timeToTrigger;
+}measurement_event_info_t;
+
+typedef struct rrc_eNB_measurement_data_s{
+  uint8_t 							allowedMeasBandwidth;
+  measurement_event_info_t			event1_config;
+  measurement_event_info_t			event2_config;
+  measurement_event_info_t			event3_config;
+  measurement_event_info_t			event4_config;
+  measurement_event_info_t			event5_config;
+  measurement_event_info_t			event6_config;
+}rrc_eNB_measurement_data_t;
+
 typedef struct eNB_RRC_INST_s {
   /// southbound midhaul configuration
   ngran_node_t                    node_type;
@@ -868,7 +888,7 @@ typedef struct eNB_RRC_INST_s {
   pthread_mutex_t cell_info_mutex;
   uint16_t sctp_in_streams;
   uint16_t sctp_out_streams;
-
+  rrc_eNB_measurement_data_t measurement;
 } eNB_RRC_INST;
 
 #define MAX_UE_CAPABILITY_SIZE 255