rrc-nr: remove comments/dead code

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

lib/src/phy/phch/ra_ul_nr.c

@@ -551,32 +551,6 @@ int srsran_ra_ul_nr_pucch_resource(const srsran_pucch_nr_hl_cfg_t* pucch_cfg,
     return SRSRAN_SUCCESS;
   }
 
-#if 0
-  for (size_t n = 0; n < SRSRAN_PUCCH_NR_MAX_NOF_SETS; n++) {
-    if (pucch_cfg->sets[n].nof_resources > 0) {
-      printf("\n ==== Set index number %zu:  =====\n", n);
-      for (size_t k = 0; k < pucch_cfg->sets[n].nof_resources; k++) {
-        printf("\n PUCCH resource ID %zu", k);
-        printf("\n Format %u", pucch_cfg->sets[n].resources[k].format);
-        printf("\n Starting PRB %u", pucch_cfg->sets[n].resources[k].starting_prb);
-        printf("\n Intra slot hopping %s", pucch_cfg->sets[n].resources[k].intra_slot_hopping ? "True" : "False");
-        printf("\n Second PRB %u", pucch_cfg->sets[n].resources[k].second_hop_prb);
-        if (pucch_cfg->sets[n].resources[k].format == SRSRAN_PUCCH_NR_FORMAT_1) {
-          printf("\n ICS %u", pucch_cfg->sets[n].resources[k].initial_cyclic_shift);
-          printf("\n Num of symbols %u", pucch_cfg->sets[n].resources[k].nof_symbols);
-          printf("\n Starting sym idx %u", pucch_cfg->sets[n].resources[k].start_symbol_idx);
-          printf("\n Time domain OCC %u \n", pucch_cfg->sets[n].resources[k].time_domain_occ);
-        }
-        if (pucch_cfg->sets[n].resources[k].format == SRSRAN_PUCCH_NR_FORMAT_2) {
-          printf("\n Num of PRBs %u", pucch_cfg->sets[n].resources[k].nof_prb);
-          printf("\n Num of symbols %u", pucch_cfg->sets[n].resources[k].nof_symbols);
-          printf("\n Start symb idx %u \n", pucch_cfg->sets[n].resources[k].start_symbol_idx);
-        }
-      }
-    }
-  }
-#endif
-
   // Use SR PUCCH resource
   // - At least one positive SR
   // - up to 2 HARQ-ACK
@@ -645,12 +619,6 @@ int srsran_ra_ul_nr_pucch_resource(const srsran_pucch_nr_hl_cfg_t* pucch_cfg,
     return SRSRAN_SUCCESS;
   }
 
-#if 0
-  if (uci_cfg->ack.count > 0 && uci_cfg->nof_csi == 1 && uci_cfg->csi[0].cfg.type == SRSRAN_CSI_REPORT_TYPE_PERIODIC) {
-    printf("This is point where we fail");
-  }
-#endif
-
   // If a UE does not have dedicated PUCCH resource configuration, provided by PUCCH-ResourceSet in PUCCH-Config,
   // a PUCCH resource set is provided by pucch-ResourceCommon through an index to a row of Table 9.2.1-1 for size
   // transmission of HARQ-ACK information on PUCCH in an initial UL BWP of N BWP PRBs.

srsenb/src/phy/nr/slot_worker.cc

@@ -182,16 +182,6 @@ bool slot_worker::work_ul()
     for (uint32_t i = 0; i < (uint32_t)pucch.candidates.size(); i++) {
       pucch_info[i].uci_data.cfg = pucch.candidates[i].uci_cfg;
 
-#if 0
-      if (pucch_info[i].uci_data.cfg.nof_csi == 1 && pucch_info[i].uci_data.cfg.ack.count > 0) {
-        printf("Stop here");
-      }
-
-      if (pucch_info[i].uci_data.cfg.nof_csi == 1 && pucch_info[i].uci_data.cfg.ack.count > 0) {
-        printf("Stop here");
-      }
-#endif
-
       // Decode PUCCH
       if (srsran_gnb_ul_get_pucch(&gnb_ul,
                                   &ul_slot_cfg,

srsgnb/src/stack/mac/sched_nr_worker.cc

@@ -185,12 +185,6 @@ void cc_worker::postprocess_decisions(bwp_slot_allocator& bwp_alloc)
         continue;
       }
 
-#if 0
-      if (uci_cfg.nof_csi == 1 and uci_cfg.ack.count == 1) {
-        printf("Stop here");
-      }
-#endif
-
       // If this slot has a SR opportunity and the selected PUCCH format is 1, consider positive SR.
       if (uci_cfg.o_sr > 0 and uci_cfg.ack.count > 0 and
           pucch.candidates.back().resource.format == SRSRAN_PUCCH_NR_FORMAT_1) {

srsgnb/src/stack/rrc/cell_asn1_config.cc

@@ -1056,9 +1056,6 @@ int fill_master_cell_cfg_from_enb_cfg(const rrc_nr_cfg_t& cfg, uint32_t cc, asn1
   fill_sp_cell_cfg_from_enb_cfg(cfg, cc, out.sp_cell_cfg);
   out.sp_cell_cfg.recfg_with_sync_present = false;
 
-  // The current CSI config make the PUCCH decoding fail. We temporarily disable it until further investigation
-  // out.sp_cell_cfg.sp_cell_cfg_ded.csi_meas_cfg_present = false;
-
   return SRSRAN_SUCCESS;
 }
 

srsgnb/src/stack/rrc/rrc_nr.cc

@@ -342,16 +342,10 @@ void rrc_nr::config_mac()
     cell.ssb_scs            = serv_cell.ssb_subcarrier_spacing;
   } else {
     cell.bwps[0].pdsch.p_zp_csi_rs_set = {};
-
     bzero(cell.bwps[0].pdsch.nzp_csi_rs_sets, sizeof(cell.bwps[0].pdsch.nzp_csi_rs_sets));
     cell.ssb_positions_in_burst = du_cfg->cell(cc).serv_cell_cfg_common().ssb_positions_in_burst;
     cell.ssb_periodicity_ms     = du_cfg->cell(cc).serv_cell_cfg_common().ssb_periodicity_serving_cell.to_number();
     cell.ssb_scs.value          = (subcarrier_spacing_e::options)cfg.cell_list[0].phy_cell.carrier.scs;
-#if 1
-    // bzero(cell.bwps[0].pdsch.nzp_csi_rs_sets, sizeof(cell.bwps[0].pdsch.nzp_csi_rs_sets));
-    bool valid_cfg = srsran::make_pdsch_cfg_from_serv_cell(base_sp_cell_cfg.sp_cell_cfg_ded, &cell.bwps[0].pdsch);
-    srsran_assert(valid_cfg, "Invalid NR cell configuration.");
-#endif
   }
 
   // Set SIB1 and SI messages

test/phy/nr_phy_test.cc

@@ -171,17 +171,6 @@ test_bench::args_t::args_t(int argc, char** argv)
   // Load default reference configuration
   phy_cfg = srsran::phy_cfg_nr_default_t(srsran::phy_cfg_nr_default_t::reference_cfg_t(reference_cfg_str));
 
-  // configure nzp
-#if 0
-  auto& uecfg_set_0 = phy_cfg.pdsch.nzp_csi_rs_sets[0];
-  uecfg_set_0.trs_info  = true;
-  uecfg_set_0.count     = 1;
-
-  auto& res_0 = uecfg_set_0.data[0];
-  res_0.id = 0;
-  res_0.resource_mapping.row = srsran_csi_rs_resource_mapping_row_2;
-#endif
-
   // Calculate the DL signal power from the number of PRBs
   dl_channel.awgn_signal_power_dBfs = srsran_gnb_dl_get_maximum_signal_power_dBfs(phy_cfg.carrier.nof_prb);