rrc-nr: fix rebase issue

Signed-off-by: Carlo Galiotto <carlo@srs.io>

lib/src/asn1/rrc_nr_utils.cc

@@ -1632,7 +1632,6 @@ bool make_csi_cfg_from_serv_cell(const asn1::rrc_nr::serving_cell_cfg_s& serv_ce
     auto& setup = serv_cell.csi_meas_cfg.setup();
 
     // Configure CSI-Report
-    if (setup.csi_report_cfg_to_add_mod_list_present) {
     for (uint32_t i = 0; i < setup.csi_report_cfg_to_add_mod_list.size(); ++i) {
       const auto& csi_rep = setup.csi_report_cfg_to_add_mod_list[i];
       if (not make_phy_csi_report(csi_rep, &csi_hl->reports[i])) {
@@ -1645,8 +1644,7 @@ bool make_csi_cfg_from_serv_cell(const asn1::rrc_nr::serving_cell_cfg_s& serv_ce
         const auto& asn1_resource               = pucch_setup.res_to_add_mod_list[pucch_resource_id];
         uint32_t    format2_rate                = 0;
         if (pucch_setup.format2_present and
-              pucch_setup.format2.type().value ==
+            pucch_setup.format2.type().value == asn1::setup_release_c<pucch_format_cfg_s>::types_opts::setup and
-                  asn1::rrc_nr::setup_release_c<pucch_format_cfg_s>::types_opts::setup and
             pucch_setup.format2.setup().max_code_rate_present) {
           format2_rate = pucch_setup.format2.setup().max_code_rate.to_number();
         }
@@ -1656,7 +1654,6 @@ bool make_csi_cfg_from_serv_cell(const asn1::rrc_nr::serving_cell_cfg_s& serv_ce
       }
     }
   }
-  }
 
   return true;
 }