gnb: change the TDD period from msec to slots

Author: frankist

apps/gnb/gnb_appconfig.h

@@ -53,8 +53,8 @@ struct prach_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;
+  /// Periodicity of the DL-UL pattern in slots. Values {2,...,80}.
+  unsigned dl_ul_period_slots = 10;
   /// Values: {0,...,maxNrofSlots=80}.
   unsigned nof_dl_slots = 6;
   /// Values: {0,...,maxNrofSymbols-1=13}.

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -491,9 +491,11 @@ static void configure_cli11_amplitude_control_args(CLI::App& app, amplitude_cont
 
 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", pattern_params.dl_ul_tx_period, "TDD pattern periodicity in milliseconds")
+  app.add_option("--dl_ul_tx_period",
+                 pattern_params.dl_ul_period_slots,
+                 "TDD pattern periodicity in slots. Must be 0.5, 0.625, 1, 1.25, 2, 2.5, 5 or 10 milliseconds.")
       ->capture_default_str()
-      ->check(CLI::Range(0.0, 10.0));
+      ->check(CLI::Range(2, 80));
   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));

apps/gnb/gnb_appconfig_translators.cpp

@@ -224,21 +224,18 @@ 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.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;
+      out_cell.tdd_ul_dl_cfg_common->pattern1.dl_ul_tx_period_nof_slots = tdd_cfg.pattern1.dl_ul_period_slots;
+      out_cell.tdd_ul_dl_cfg_common->pattern1.nof_dl_slots              = tdd_cfg.pattern1.nof_dl_slots;
+      out_cell.tdd_ul_dl_cfg_common->pattern1.nof_dl_symbols            = tdd_cfg.pattern1.nof_dl_symbols;
+      out_cell.tdd_ul_dl_cfg_common->pattern1.nof_ul_slots              = tdd_cfg.pattern1.nof_ul_slots;
+      out_cell.tdd_ul_dl_cfg_common->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;
+        out_cell.tdd_ul_dl_cfg_common->pattern2->dl_ul_tx_period_nof_slots = tdd_cfg.pattern2->dl_ul_period_slots;
+        out_cell.tdd_ul_dl_cfg_common->pattern2->nof_dl_slots              = tdd_cfg.pattern2->nof_dl_slots;
+        out_cell.tdd_ul_dl_cfg_common->pattern2->nof_dl_symbols            = tdd_cfg.pattern2->nof_dl_symbols;
+        out_cell.tdd_ul_dl_cfg_common->pattern2->nof_ul_slots              = tdd_cfg.pattern2->nof_ul_slots;
+        out_cell.tdd_ul_dl_cfg_common->pattern2->nof_ul_symbols            = tdd_cfg.pattern2->nof_ul_symbols;
       }
     }
 

apps/gnb/gnb_appconfig_validators.cpp

@@ -173,41 +173,17 @@ static bool validate_tdd_ul_dl_pattern_appconfig(const tdd_ul_dl_pattern_appconf
 {
   // NOTE: TDD pattern is assumed to use common SCS as reference SCS.
   if (common_scs > subcarrier_spacing::kHz60) {
-    fmt::print("Invalid TDD UL DL reference SCS={}. Must be 15, 30 or 60 kHz for FR1.\n", common_scs);
+    fmt::print("Invalid TDD UL DL reference SCS={}kHz. Must be 15, 30 or 60 kHz for FR1.\n", scs_to_khz(common_scs));
     return false;
   }
-  if (config.dl_ul_tx_period != 0.5F and config.dl_ul_tx_period != 0.625F and config.dl_ul_tx_period != 1.0F and
-      config.dl_ul_tx_period != 1.25F and config.dl_ul_tx_period != 2.0F and config.dl_ul_tx_period != 2.5F and
-      config.dl_ul_tx_period != 5.0F and config.dl_ul_tx_period != 10.0F) {
+
+  const unsigned period_msec = config.dl_ul_period_slots / get_nof_slots_per_subframe(common_scs);
+
+  if (period_msec != 0.5F and period_msec != 0.625F and period_msec != 1.0F and period_msec != 1.25F and
+      period_msec != 2.0F and period_msec != 2.5F and period_msec != 5.0F and period_msec != 10.0F) {
     fmt::print(
         "Invalid TDD pattern 1 UL DL periodicity={}ms. Must be 0.5, 0.625, 1, 1.25, 2, 2.5, 5 or 10 milliseconds.\n",
-        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 "
-               "periodicity of {} ms.\n",
-               common_scs,
-               config.dl_ul_tx_period);
-    return false;
-  }
-  if (config.dl_ul_tx_period == 1.25F and
-      (common_scs != subcarrier_spacing::kHz120 and common_scs != subcarrier_spacing::kHz60)) {
-    fmt::print("Invalid reference SCS={} for TDD pattern 1. Must be 120 or 60 kHz when using "
-               "periodicity of {} ms.\n",
-               common_scs,
-               config.dl_ul_tx_period);
-    return false;
-  }
-  if (config.dl_ul_tx_period == 2.5F and
-      (common_scs != subcarrier_spacing::kHz120 and common_scs != subcarrier_spacing::kHz60 and
-       common_scs != subcarrier_spacing::kHz30)) {
-    fmt::print("Invalid reference SCS={} for TDD pattern 1. Must be 120, 60 or 30 kHz when using "
-               "periodicity of {} ms.\n",
-               common_scs,
-               config.dl_ul_tx_period);
+        period_msec);
     return false;
   }