combine all report configuration with all measurement objects

srsenb/rr.conf.example

@@ -87,7 +87,7 @@ cell_list =
       }
     );
 
-    // Select measurement triggers (A3 and A4 events are all mapped to all cells in meas_cell_list)
+    // Select measurement report configuration (all reports are combined with all measurement objects)
     meas_report_desc =
     (
         {

srsenb/src/stack/rrc/ue_meas_cfg.cc

@@ -351,24 +351,11 @@ bool fill_meascfg_enb_cfg(meas_cfg_s& meascfg, const ue_cell_ded_list& ue_cell_l
   meascfg.quant_cfg.quant_cfg_eutra         = pcell_meascfg.quant_cfg;
 
   // Insert all measIds
-  // TODO: add this to the parser. Now we map all neighbours to all A3/A4 events and Pcell to A1/A2
+  // TODO: add this to the parser. Now we combine all reports with all objects
   if (meascfg.report_cfg_to_add_mod_list.size() > 0) {
     for (const auto& measobj : meascfg.meas_obj_to_add_mod_list) {
-      std::array<asn1::rrc::eutra_event_s::event_id_c_::types_opts::options, 2> events;
-      if (measobj.meas_obj.meas_obj_eutra().carrier_freq == pcell->get_dl_earfcn()) {
-        events[0] = asn1::rrc::eutra_event_s::event_id_c_::types_opts::event_a1;
-        events[1] = asn1::rrc::eutra_event_s::event_id_c_::types_opts::event_a2;
-      } else {
-        events[0] = asn1::rrc::eutra_event_s::event_id_c_::types_opts::event_a3;
-        events[1] = asn1::rrc::eutra_event_s::event_id_c_::types_opts::event_a4;
-      }
       for (const auto& measrep : meascfg.report_cfg_to_add_mod_list) {
-        for (const auto& event : events) {
-          if (measrep.report_cfg.report_cfg_eutra().trigger_type.event().event_id.type().value == event) {
-            add_measid_cfg(meascfg.meas_id_to_add_mod_list, measobj.meas_obj_id, measrep.report_cfg_id);
-            break;
-          }
-        }
+        add_measid_cfg(meascfg.meas_id_to_add_mod_list, measobj.meas_obj_id, measrep.report_cfg_id);
       }
     }
   }