gnb: enable setting SR period as a parameter

Signed-off-by: Carlo Galiotto <[email protected]>

Author: carlo-gal

apps/gnb/gnb_appconfig.h

@@ -207,6 +207,11 @@ struct pucch_appconfig {
   /// Number of PUCCH Format 1 cell resources for CSI.
   unsigned nof_cell_csi_resources = 1;
 
+  /// \brief \c SR period in milliseconds.
+  /// Among all values given in \c periodicityAndOffset, part of \c \SchedulingRequestResourceConfig, TS 38.331,
+  /// these are the only ones supported. Values: {1, 2, 4, 8, 10, 16, 20, 40, 80, 160, 320}.
+  unsigned sr_period_msec = 20;
+
   /// PUCCH F1 resource parameters.
   /// Number of symbols for PUCCH Format 1. Values {4, 14}.
   unsigned f1_nof_symbols = 14;

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -551,6 +551,9 @@ static void configure_cli11_pucch_args(CLI::App& app, pucch_appconfig& pucch_par
 
         return "";
       });
+  app.add_option("--sr_period_ms", pucch_params.sr_period_msec, "SR period in msec")
+      ->capture_default_str()
+      ->check(CLI::IsMember({1, 2, 4, 8, 10, 16, 20, 40, 80, 160, 320}));
   app.add_option("--f1_nof_ue_res_harq",
                  pucch_params.nof_ue_pucch_f1_res_harq,
                  "Number of PUCCH F1 resources available per UE for HARQ")

apps/gnb/gnb_appconfig_translators.cpp

@@ -535,7 +535,7 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const gnb_appconfig&
       fill_csi_resources(out_cell.ue_ded_serv_cell_cfg, base_cell);
     }
 
-    // Parameters for PUCCH-Config.
+    // Parameters for PUCCH-Config builder (these parameters will be used later on to generate the PUCCH resources).
     pucch_builder_params&  du_pucch_cfg           = out_cell.pucch_cfg;
     const pucch_appconfig& user_pucch_cfg         = base_cell.pucch_cfg;
     du_pucch_cfg.nof_ue_pucch_f1_res_harq         = user_pucch_cfg.nof_ue_pucch_f1_res_harq;
@@ -604,6 +604,17 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const gnb_appconfig&
     b_offsets.beta_offset_csi_p2_idx_1 = base_cell.pusch_cfg.b_offset_csi_p2_idx_1;
     b_offsets.beta_offset_csi_p2_idx_2 = base_cell.pusch_cfg.b_offset_csi_p2_idx_2;
 
+    // Parameters for PUCCH-Config.
+    if (not out_cell.ue_ded_serv_cell_cfg.ul_config.value().init_ul_bwp.pucch_cfg.has_value()) {
+      out_cell.ue_ded_serv_cell_cfg.ul_config.value().init_ul_bwp.pucch_cfg.emplace();
+    }
+    auto& sr_cng = out_cell.ue_ded_serv_cell_cfg.ul_config.value().init_ul_bwp.pucch_cfg.value().sr_res_list;
+    if (sr_cng.empty()) {
+      sr_cng.emplace_back(scheduling_request_resource_config{});
+    }
+    sr_cng.front().period = static_cast<sr_periodicity>(get_nof_slots_per_subframe(base_cell.common_scs) *
+                                                        base_cell.pucch_cfg.sr_period_msec);
+
     // If any dependent parameter needs to be updated, this is the place.
     if (update_msg1_frequency_start) {
       rach_cfg.rach_cfg_generic.msg1_frequency_start = config_helpers::compute_prach_frequency_start(