fix NR sched configuration of UE generated in RRC

srsenb/src/stack/gnb_stack_nr.cc

@@ -70,8 +70,6 @@ int gnb_stack_nr::init(const srsenb::stack_args_t& args_,
 
   // Init all layers
   mac_nr_args_t mac_args = {};
-  mac_args.fixed_dl_mcs  = 28;
-  mac_args.fixed_ul_mcs  = 10;
   mac_args.pcap          = args.mac_pcap;
   mac_args.pcap.filename = "/tmp/enb_mac_nr.pcap";
   if (mac.init(mac_args, phy, nullptr, &rlc, &rrc) != SRSRAN_SUCCESS) {

srsenb/src/stack/mac/nr/mac_nr.cc

@@ -139,8 +139,6 @@ uint16_t mac_nr::reserve_rnti(uint32_t enb_cc_idx)
 
   // Add new user to the scheduler so that it can RX/TX SRB0
   srsenb::sched_nr_interface::ue_cfg_t ue_cfg = srsenb::get_default_ue_cfg(1);
-  ue_cfg.fixed_dl_mcs                         = args.fixed_dl_mcs;
-  ue_cfg.fixed_ul_mcs                         = args.fixed_ul_mcs;
   sched.ue_cfg(rnti, ue_cfg);
 
   return rnti;

srsenb/src/stack/rrc/rrc_nr.cc

@@ -470,10 +470,7 @@ int rrc_nr::sgnb_reconfiguration_complete(uint16_t eutra_rnti, asn1::dyn_octstri
   Every function in UE class is called from a mutex environment thus does not
   need extra protection.
 *******************************************************************************/
-rrc_nr::ue::ue(rrc_nr* parent_, uint16_t rnti_) : parent(parent_), rnti(rnti_)
-{
-  uecfg.ue_bearers[0].direction = mac_lc_ch_cfg_t::BOTH;
-}
+rrc_nr::ue::ue(rrc_nr* parent_, uint16_t rnti_) : parent(parent_), rnti(rnti_), uecfg(srsenb::get_default_ue_cfg(1)) {}
 
 void rrc_nr::ue::send_connection_setup()
 {

srsenb/test/mac/nr/sched_nr_cfg_generators.h

@@ -90,6 +90,10 @@ inline sched_nr_interface::ue_cfg_t get_default_ue_cfg(
   uecfg.phy_cfg                 = phy_cfg;
   uecfg.ue_bearers[0].direction = mac_lc_ch_cfg_t::BOTH;
 
+  // Note: dynamic MCS not yet supported
+  uecfg.fixed_dl_mcs = 28;
+  uecfg.fixed_ul_mcs = 10;
+
   return uecfg;
 }