Removed arfcn and freq, and nof_prbs from config file

srsue/hdr/stack/rrc/rrc_nr.h

@@ -40,6 +40,7 @@ struct core_less_args_t {
 
 struct rrc_nr_args_t {
   core_less_args_t      coreless;
+  std::string           supported_bands_nr_str;
   std::vector<uint32_t> supported_bands_nr;
   std::vector<uint32_t> supported_bands_eutra;
   std::string           log_level;

srsue/src/main.cc

@@ -115,10 +115,11 @@ static int parse_args(all_args_t* args, int argc, char* argv[])
     ("rat.eutra.ul_freq",      bpo::value<float>(&args->phy.ul_freq)->default_value(-1),            "Uplink Frequency (if positive overrides EARFCN)")
     ("rat.eutra.nof_carriers", bpo::value<uint32_t>(&args->phy.nof_lte_carriers)->default_value(1), "Number of carriers")
     
-    ("rat.nr.dl_arfcn",     bpo::value<string>(&args->phy.dl_nr_arfcn)->default_value("634240"),  "Downlink NR-ARFCN list")
-    ("rat.nr.dl_freq",      bpo::value<double>(&args->phy.nr_freq_hz)->default_value(3513.6e6),   "NR DL frequency")
-    ("rat.nr.nof_carriers", bpo::value<uint32_t>(&args->phy.nof_nr_carriers)->default_value(0),   "Number of NR carriers")
-    ("rat.nr.nof_prb",      bpo::value<uint32_t>(&args->phy.nr_nof_prb)->default_value(52),       "NR carrier bandwidth")
+    ("rat.nr.bands",        bpo::value<string>(&args->stack.rrc_nr.supported_bands_nr_str)->default_value("78"),  "Supported NR bands")
+    ("rat.nr.dl_arfcn",     bpo::value<string>(&args->phy.dl_nr_arfcn)->default_value("634240"),                  "Downlink NR-ARFCN list")
+    ("rat.nr.dl_freq",      bpo::value<double>(&args->phy.nr_freq_hz)->default_value(3513.6e6),                   "NR DL frequency")
+    ("rat.nr.nof_carriers", bpo::value<uint32_t>(&args->phy.nof_nr_carriers)->default_value(0),                   "Number of NR carriers")
+    ("rat.nr.nof_prb",      bpo::value<uint32_t>(&args->phy.nr_nof_prb)->default_value(52),                       "NR carrier bandwidth")
 
     ("rrc.feature_group", bpo::value<uint32_t>(&args->stack.rrc.feature_group)->default_value(0xe6041000), "Hex value of the featureGroupIndicators field in the"
                                                                                            "UECapabilityInformation message. Default 0xe6041000")

srsue/src/ue.cc

@@ -255,25 +255,12 @@ int ue::parse_args(const all_args_t& args_)
 
   // populate NR DL ARFCNs
   if (args.phy.nof_nr_carriers > 0) {
-    if (not args.phy.dl_nr_arfcn.empty()) {
-      // Parse list
-      srsran::string_parse_list(args.phy.dl_nr_arfcn, ',', args.phy.dl_nr_arfcn_list);
-
+    if (not args.stack.rrc_nr.supported_bands_nr_str.empty()) {
       // Populates supported bands
-      for (uint32_t& arfcn : args.phy.dl_nr_arfcn_list) {
-        std::vector<uint32_t> bands = bands_helper.get_bands_nr(arfcn);
-        for (const auto& band : bands) {
-          // make sure we don't add duplicates
-          if (std::find(args.stack.rrc_nr.supported_bands_nr.begin(),
-                        args.stack.rrc_nr.supported_bands_nr.end(),
-                        band) == args.stack.rrc_nr.supported_bands_nr.end()) {
-            args.stack.rrc_nr.supported_bands_nr.push_back(band);
-          }
-        }
-      }
+      srsran::string_parse_list(args.stack.rrc_nr.supported_bands_nr_str, ',', args.stack.rrc_nr.supported_bands_nr);
     } else {
-      logger.error("Error: dl_nr_arfcn list is empty");
-      srsran::console("Error: dl_nr_arfcn list is empty\n");
+      logger.error("Error: rat.nr.bands list is empty");
+      srsran::console("Error: rat.nr.bands list is empty\n");
       return SRSRAN_ERROR;
     }
   }

srsue/ue.conf.example

@@ -61,15 +61,11 @@ dl_earfcn = 3350
 # NR RAT configuration
 # 
 # Optional parameters: 
-# dl_arfcn:        Downlink NR ARFCN for EN-DC
-# dl_freq:         Override DL frequency corresponding to rat.nr.dl_arfcn
-# nof_carriers:    Number of NR carriers (must be at least 1 for DC support)
-# nof_prb:         Number of PRBs 
+# bands:           List of support NR bands seperated by a comma (default 78)
+# nof_carriers:    Number of NR carriers (must be at least 1 for NR support)
 #####################################################################
 [rat.nr]
-# dl_arfcn = 634240
-# dl_freq = 3513.6e6
-# nof_prb = 52
+# bands = 78
 # nof_carriers = 0
 
 #####################################################################