gnb: enable to option to set TDD pattern2

Author: frankist

apps/gnb/gnb_appconfig.h

@@ -51,8 +51,8 @@ struct prach_appconfig {
   optional<unsigned> prach_frequency_start;
 };
 
-/// TDD configuration. See TS 38.331, \c TDD-UL-DL-Pattern.
-struct tdd_ul_dl_appconfig {
+/// TDD pattern configuration. See TS 38.331, \c TDD-UL-DL-Pattern.
+struct tdd_ul_dl_pattern_appconfig {
   /// Periodicity of the DL-UL pattern in Milliseconds. Values {0.5, 0.625, 1, 1.25, 2, 2.5, 5, 10}.
   float dl_ul_tx_period = 5.0F;
   /// Values: {0,...,maxNrofSlots=80}.
@@ -65,6 +65,12 @@ struct tdd_ul_dl_appconfig {
   unsigned nof_ul_symbols = 0;
 };
 
+/// TDD configuration. See TS 38.331, \c TDD-UL-DL-ConfigCommon.
+struct tdd_ul_dl_appconfig {
+  tdd_ul_dl_pattern_appconfig           pattern1;
+  optional<tdd_ul_dl_pattern_appconfig> pattern2;
+};
+
 /// Paging related configuration. See TS 38.331, PCCH-Config.
 struct paging_appconfig {
   /// SearchSpace to use for Paging. Values {0, 1}.

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -489,29 +489,44 @@ static void configure_cli11_amplitude_control_args(CLI::App& app, amplitude_cont
       ->capture_default_str();
 }
 
-static void configure_cli11_tdd_ul_dl_args(CLI::App& app, tdd_ul_dl_appconfig& tdd_ul_dl_params)
+static void configure_cli11_tdd_ul_dl_pattern_args(CLI::App& app, tdd_ul_dl_pattern_appconfig& pattern_params)
 {
-  app.add_option("--dl_ul_tx_period", tdd_ul_dl_params.dl_ul_tx_period, "TDD pattern periodicity in milliseconds")
+  app.add_option("--dl_ul_tx_period", pattern_params.dl_ul_tx_period, "TDD pattern periodicity in milliseconds")
       ->capture_default_str()
       ->check(CLI::Range(0.0, 10.0));
-  app.add_option("--nof_dl_slots", tdd_ul_dl_params.nof_dl_slots, "TDD pattern nof. consecutive full DL slots")
+  app.add_option("--nof_dl_slots", pattern_params.nof_dl_slots, "TDD pattern nof. consecutive full DL slots")
       ->capture_default_str()
       ->check(CLI::Range(0, 80));
   app.add_option("--nof_dl_symbols",
-                 tdd_ul_dl_params.nof_dl_symbols,
+                 pattern_params.nof_dl_symbols,
                  "TDD pattern nof. DL symbols at the beginning of the slot following full DL slots")
       ->capture_default_str()
       ->check(CLI::Range(0, 13));
-  app.add_option("--nof_ul_slots", tdd_ul_dl_params.nof_ul_slots, "TDD pattern nof. consecutive full UL slots")
+  app.add_option("--nof_ul_slots", pattern_params.nof_ul_slots, "TDD pattern nof. consecutive full UL slots")
       ->capture_default_str()
       ->check(CLI::Range(0, 80));
   app.add_option("--nof_ul_symbols",
-                 tdd_ul_dl_params.nof_ul_symbols,
+                 pattern_params.nof_ul_symbols,
                  "TDD pattern nof. UL symbols at the end of the slot preceding the first full UL slot")
       ->capture_default_str()
       ->check(CLI::Range(0, 13));
 }
 
+static void configure_cli11_tdd_ul_dl_args(CLI::App& app, tdd_ul_dl_appconfig& tdd_ul_dl_params)
+{
+  configure_cli11_tdd_ul_dl_pattern_args(app, tdd_ul_dl_params.pattern1);
+  CLI::App* pattern2_subcmd =
+      app.add_subcommand("pattern2", "TDD UL DL pattern2 configuration parameters")->configurable();
+  configure_cli11_tdd_ul_dl_pattern_args(*pattern2_subcmd, tdd_ul_dl_params.pattern2.emplace());
+  auto tdd_ul_dl_verify_callback = [&]() {
+    CLI::App* tdd_cfg = app.get_subcommand("pattern2");
+    if (tdd_cfg->count_all() == 0) {
+      tdd_ul_dl_params.pattern2.reset();
+    }
+  };
+  app.callback(tdd_ul_dl_verify_callback);
+}
+
 static void configure_cli11_paging_args(CLI::App& app, paging_appconfig& pg_params)
 {
   app.add_option("--pg_search_space_id", pg_params.paging_search_space_id, "SearchSpace to use for Paging")

apps/gnb/gnb_appconfig_translators.cpp

@@ -225,11 +225,21 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const gnb_appconfig&
       const auto& tdd_cfg = config.common_cell_cfg.tdd_ul_dl_cfg.value();
 
       out_cell.tdd_ul_dl_cfg_common.value().pattern1.dl_ul_tx_period_nof_slots = (unsigned)std::round(
-          tdd_cfg.dl_ul_tx_period * get_nof_slots_per_subframe(out_cell.tdd_ul_dl_cfg_common.value().ref_scs));
-      out_cell.tdd_ul_dl_cfg_common.value().pattern1.nof_dl_slots   = tdd_cfg.nof_dl_slots;
-      out_cell.tdd_ul_dl_cfg_common.value().pattern1.nof_dl_symbols = tdd_cfg.nof_dl_symbols;
-      out_cell.tdd_ul_dl_cfg_common.value().pattern1.nof_ul_slots   = tdd_cfg.nof_ul_slots;
-      out_cell.tdd_ul_dl_cfg_common.value().pattern1.nof_ul_symbols = tdd_cfg.nof_ul_symbols;
+          tdd_cfg.pattern1.dl_ul_tx_period * get_nof_slots_per_subframe(out_cell.tdd_ul_dl_cfg_common.value().ref_scs));
+      out_cell.tdd_ul_dl_cfg_common.value().pattern1.nof_dl_slots   = tdd_cfg.pattern1.nof_dl_slots;
+      out_cell.tdd_ul_dl_cfg_common.value().pattern1.nof_dl_symbols = tdd_cfg.pattern1.nof_dl_symbols;
+      out_cell.tdd_ul_dl_cfg_common.value().pattern1.nof_ul_slots   = tdd_cfg.pattern1.nof_ul_slots;
+      out_cell.tdd_ul_dl_cfg_common.value().pattern1.nof_ul_symbols = tdd_cfg.pattern1.nof_ul_symbols;
+
+      if (tdd_cfg.pattern2.has_value()) {
+        out_cell.tdd_ul_dl_cfg_common.value().pattern2->dl_ul_tx_period_nof_slots =
+            (unsigned)std::round(tdd_cfg.pattern2->dl_ul_tx_period *
+                                 get_nof_slots_per_subframe(out_cell.tdd_ul_dl_cfg_common.value().ref_scs));
+        out_cell.tdd_ul_dl_cfg_common.value().pattern2->nof_dl_slots   = tdd_cfg.pattern2->nof_dl_slots;
+        out_cell.tdd_ul_dl_cfg_common.value().pattern2->nof_dl_symbols = tdd_cfg.pattern2->nof_dl_symbols;
+        out_cell.tdd_ul_dl_cfg_common.value().pattern2->nof_ul_slots   = tdd_cfg.pattern2->nof_ul_slots;
+        out_cell.tdd_ul_dl_cfg_common.value().pattern2->nof_ul_symbols = tdd_cfg.pattern2->nof_ul_symbols;
+      }
     }
 
     // PCCH-Config.

apps/gnb/gnb_appconfig_validators.cpp

@@ -168,8 +168,8 @@ static bool validate_prach_cell_app_config(const prach_appconfig& config, nr_ban
   return true;
 }
 
-/// Validates the given TDD UL DL pattern application configuration. Returns true on success, otherwise false.
-static bool validate_tdd_ul_dl_appconfig(const tdd_ul_dl_appconfig& config, subcarrier_spacing common_scs)
+static bool validate_tdd_ul_dl_pattern_appconfig(const tdd_ul_dl_pattern_appconfig& config,
+                                                 subcarrier_spacing                 common_scs)
 {
   // NOTE: TDD pattern is assumed to use common SCS as reference SCS.
   if (common_scs > subcarrier_spacing::kHz60) {
@@ -184,6 +184,7 @@ static bool validate_tdd_ul_dl_appconfig(const tdd_ul_dl_appconfig& config, subc
         config.dl_ul_tx_period);
     return false;
   }
+
   // See TS 38.213, clause 11.1.
   if (config.dl_ul_tx_period == 0.625F and common_scs != subcarrier_spacing::kHz120) {
     fmt::print("Invalid reference SCS={} for TDD pattern 1. Must be 120 kHz when using "
@@ -213,6 +214,18 @@ static bool validate_tdd_ul_dl_appconfig(const tdd_ul_dl_appconfig& config, subc
   return true;
 }
 
+/// Validates the given TDD UL DL pattern application configuration. Returns true on success, otherwise false.
+static bool validate_tdd_ul_dl_appconfig(const tdd_ul_dl_appconfig& config, subcarrier_spacing common_scs)
+{
+  if (not validate_tdd_ul_dl_pattern_appconfig(config.pattern1, common_scs)) {
+    return false;
+  }
+  if (config.pattern2.has_value() and not validate_tdd_ul_dl_pattern_appconfig(config.pattern2.value(), common_scs)) {
+    return false;
+  }
+  return true;
+}
+
 static bool validate_dl_arfcn_and_band(const base_cell_appconfig& config)
 {
   nr_band band = config.band.has_value() ? config.band.value() : band_helper::get_band_from_dl_arfcn(config.dl_arfcn);