Merge branch 'dev' into agpl_main

Author: andrepuschmann

.clang-format

@@ -62,7 +62,7 @@ ForEachMacros:
   - BOOST_FOREACH
 IncludeBlocks:   Preserve
 IncludeCategories: #Changed
-  - Regex:           '^"(srsgnb|llvm|llvm-c|clang|clang-c)/'
+  - Regex:           '^"(srsran|llvm|llvm-c|clang|clang-c)/'
     Priority:        2
   - Regex:           '^(<|"(CLI|fmt|gtest|gmock|isl|json|variant)/)'
     Priority:        3

apps/examples/phy/radio_ssb.cpp

@@ -33,6 +33,7 @@
 #include "../radio/radio_notifier_sample.h"
 #include "lower_phy_example_factory.h"
 #include "rx_symbol_handler_example.h"
+#include "upper_phy_ssb_example.h"
 #include "srsran/phy/adapters/phy_error_adapter.h"
 #include "srsran/phy/adapters/phy_rg_gateway_adapter.h"
 #include "srsran/phy/adapters/phy_rx_symbol_adapter.h"
@@ -41,7 +42,6 @@
 #include "srsran/radio/radio_factory.h"
 #include "srsran/support/executors/task_worker.h"
 #include "srsran/support/math_utils.h"
-#include "upper_phy_ssb_example.h"
 #include <atomic>
 #include <csignal>
 #include <getopt.h>

apps/gnb/gnb.cpp

@@ -325,7 +325,9 @@ static std::unique_ptr<radio_session>
 build_radio(task_executor& executor, radio_notification_handler& radio_handler, const gnb_appconfig& config)
 {
   std::unique_ptr<radio_factory> factory = create_radio_factory(config.rf_driver_cfg.device_driver);
-  report_fatal_error_if_not(factory, "Invalid radio factory.");
+  if (!factory) {
+    return nullptr;
+  }
 
   // Create radio configuration. Assume 1 sector per stream.
   radio_configuration::radio radio_config = generate_radio_config(config, factory->get_configuration_validator());

apps/gnb/gnb_appconfig.h

@@ -104,6 +104,8 @@ struct amplitude_control_appconfig {
 
 /// Base cell configuration.
 struct base_cell_appconfig {
+  /// Physical cell identifier.
+  pci_t pci = 1;
   /// Downlink arfcn.
   unsigned dl_arfcn = 536020;
   /// NR band.
@@ -132,8 +134,6 @@ struct base_cell_appconfig {
 
 /// Cell configuration
 struct cell_appconfig {
-  /// Physical cell identifier.
-  pci_t pci = 1;
   /// Cell configuration.
   base_cell_appconfig cell;
 };

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -233,6 +233,7 @@ static void configure_cli11_amplitude_control_args(CLI::App& app, amplitude_cont
 
 static void configure_cli11_common_cell_args(CLI::App& app, base_cell_appconfig& cell_params)
 {
+  app.add_option("--pci", cell_params.pci, "PCI")->capture_default_str()->check(CLI::Range(0, 1007));
   app.add_option("--dl_arfcn", cell_params.dl_arfcn, "Donwlink ARFCN")->capture_default_str();
   add_auto_enum_option(app, "--band", cell_params.band, "NR band");
   app.add_option("--common_scs", cell_params.common_scs, "Cell common subcarrier spacing")
@@ -306,7 +307,6 @@ static void configure_cli11_common_cell_args(CLI::App& app, base_cell_appconfig&
 
 static void configure_cli11_cells_args(CLI::App& app, cell_appconfig& cell_params)
 {
-  app.add_option("--pci", cell_params.pci, "PCI")->capture_default_str()->check(CLI::Range(0, 1007));
   configure_cli11_common_cell_args(app, cell_params.cell);
 }
 

apps/gnb/gnb_appconfig_translators.cpp

@@ -33,7 +33,7 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const gnb_appconfig&
   for (const auto& cell : config.cells_cfg) {
     cell_config_builder_params param;
     const base_cell_appconfig& base_cell = cell.cell;
-    param.pci                            = cell.pci;
+    param.pci                            = base_cell.pci;
     param.scs_common                     = base_cell.common_scs;
     param.channel_bw_mhz                 = base_cell.channel_bw_mhz;
     param.dl_arfcn                       = base_cell.dl_arfcn;
@@ -49,7 +49,7 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const gnb_appconfig&
         base_cell.dl_arfcn, *param.band, nof_crbs, base_cell.common_scs, base_cell.common_scs, ss0_idx);
 
     if (!ssb_freq_loc.has_value()) {
-      report_error("Unable to derive a valid SSB pointA and k_SSB for cell id ({}).\n", cell.pci);
+      report_error("Unable to derive a valid SSB pointA and k_SSB for cell id ({}).\n", base_cell.pci);
     }
 
     srslog::basic_logger& logger = srslog::fetch_basic_logger("GNB", false);
@@ -65,7 +65,7 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const gnb_appconfig&
     logger.info(
         "SSB derived parameters for cell: {}, band: {}, dl_arfcn:{}, crbs: {} scs:{}, ssb_scs:{}:\n\t - SSB offset "
         "pointA:{} \n\t - k_SSB:{} \n\t - SSB arfcn:{} \n\t - Coreset index:{} \n\t - Searchspace index:{}",
-        cell.pci,
+        base_cell.pci,
         base_cell.band,
         base_cell.dl_arfcn,
         nof_crbs,

apps/gnb/gnb_appconfig_validators.cpp

@@ -104,6 +104,10 @@ static bool validate_dl_arfcn_and_band(const base_cell_appconfig& config)
 /// Validates the given cell application configuration. Returns true on success, otherwise false.
 static bool validate_base_cell_appconfig(const base_cell_appconfig& config)
 {
+  if (config.pci > 1007) {
+    fmt::print("Invalid PCI (i.e. {}). PCI ranges from 0 to {}.\n", config.pci, MAX_PCI);
+    return false;
+  }
   if (config.nof_antennas_dl == 0) {
     fmt::print("The number of DL antennas cannot be zero.");
     return false;
@@ -156,11 +160,6 @@ static bool validate_base_cell_appconfig(const base_cell_appconfig& config)
 
 static bool validate_cells_appconfig(const cell_appconfig& config)
 {
-  if (config.pci > 1007) {
-    fmt::print("Invalid PCI (i.e. {}). PCI ranges from 0 to {}.\n", config.pci, MAX_PCI);
-    return false;
-  }
-
   return validate_base_cell_appconfig(config.cell);
 }
 

apps/gnb/helpers/gnb_console_helper.cpp

@@ -21,11 +21,11 @@
  */
 
 #include "gnb_console_helper.h"
+#include "string_helpers.h"
 #include "srsran/radio/radio_factory.h"
 #include "srsran/ran/band_helper.h"
 #include "srsran/ran/bs_channel_bandwidth.h"
 #include "srsran/support/build_info/build_info.h"
-#include "string_helpers.h"
 #include <fcntl.h>
 #include <list>
 #include <signal.h>

include/srsran/adt/slotted_array.h

@@ -23,8 +23,8 @@
 #pragma once
 
 #include "span.h"
-#include "srsran/support/srsran_assert.h"
 #include "tiny_optional.h"
+#include "srsran/support/srsran_assert.h"
 #include <array>
 
 /// \file Definitions of slotted_array<T, N>, slotted_vector<T> used to manage containers with optional elements. All

include/srsran/adt/unique_function.h

@@ -68,7 +68,7 @@ class empty_table_t final : public oper_table_t<R, Args...>
   constexpr empty_table_t() = default;
   R call(void* src, Args... args) const override
   {
-    srsgnb_terminate("bad function call (cause: function ptr is empty)");
+    srsran_terminate("bad function call (cause: function ptr is empty)");
   }
   void move(void* src, void* dest) const override {}
   void dtor(void* src) const override {}