Appy phy configuration to current_phy_cfg before sending to PHY after HO

srsue/src/phy/phy.cc

@@ -473,7 +473,7 @@ bool phy::set_config(srslte::phy_cfg_t config_, uint32_t cc_idx)
 
   // Apply configuration after the worker is finished to avoid race conditions
   cmd_worker.add_cmd([this, config_, cc_idx, reconfigure_prach]() {
-    log_h->info("Setting new PHY configuration...\n");
+    log_h->info("Setting new PHY configuration cc_idx=%d...\n", cc_idx);
     for (uint32_t i = 0; i < nof_workers; i++) {
       // set_cell is not protected so run when worker is finished
       sf_worker* w = (sf_worker*)workers_pool.wait_worker_id(i);
@@ -482,7 +482,7 @@ bool phy::set_config(srslte::phy_cfg_t config_, uint32_t cc_idx)
         w->release();
       }
     }
-    log_h->info("Finished setting new PHY configuration.\n");
+    log_h->info("Finished setting new PHY configuration cc_idx=%d\n", cc_idx);
     if (reconfigure_prach) {
       // Reconfigure PRACH parameters only if configuration is different
       prach_cfg = config_.prach_cfg;

srsue/src/stack/rrc/rrc.cc

@@ -2244,15 +2244,7 @@ bool rrc::apply_rr_config_dedicated_on_ho_complete(const rr_cfg_ded_s& cnfg)
 
   // Apply SR+CQI configuration to PHY
   if (cnfg.phys_cfg_ded_present) {
-    current_phy_cfg.ul_cfg.pucch.sr_configured = cnfg.phys_cfg_ded.sched_request_cfg_present;
-    if (cnfg.phys_cfg_ded.cqi_report_cfg_present) {
-      current_phy_cfg.dl_cfg.cqi_report.periodic_configured =
-          cnfg.phys_cfg_ded.cqi_report_cfg.cqi_report_periodic_present and
-          cnfg.phys_cfg_ded.cqi_report_cfg.cqi_report_periodic.type().value == setup_opts::setup;
-      current_phy_cfg.dl_cfg.cqi_report.aperiodic_configured =
-          cnfg.phys_cfg_ded.cqi_report_cfg.cqi_report_mode_aperiodic_present;
-    }
-    phy->set_config(current_phy_cfg);
+    apply_phy_config_dedicated(cnfg.phys_cfg_ded, false);
   }
 
   // Apply SR configuration to MAC