|
|
|
@ -466,18 +466,15 @@ bool phy::set_config(srslte::phy_cfg_t config_, uint32_t cc_idx)
|
|
|
|
|
|
|
|
|
|
Info("Setting configuration\n");
|
|
|
|
|
|
|
|
|
|
// The PRACH shall be re-configured only if:
|
|
|
|
|
// The PRACH configuration shall be updated only if:
|
|
|
|
|
// - The new configuration belongs to the primary cell
|
|
|
|
|
// - The PRACH configuration is present
|
|
|
|
|
// - The PRACH configuration has changed
|
|
|
|
|
bool reconfigure_prach = !cc_idx && config_.prach_cfg_present && (prach_cfg != config_.prach_cfg);
|
|
|
|
|
|
|
|
|
|
if (reconfigure_prach) {
|
|
|
|
|
prach_buffer.reset_cfg();
|
|
|
|
|
if (!cc_idx && config_.prach_cfg_present) {
|
|
|
|
|
prach_cfg = config_.prach_cfg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Apply configuration after the worker is finished to avoid race conditions
|
|
|
|
|
cmd_worker.add_cmd([this, config_, cc_idx, reconfigure_prach]() {
|
|
|
|
|
cmd_worker.add_cmd([this, config_, cc_idx]() {
|
|
|
|
|
log_h->info("Setting new PHY configuration cc_idx=%d...\n", cc_idx);
|
|
|
|
|
for (uint32_t i = 0; i < args.nof_phy_threads; i++) {
|
|
|
|
|
// set_cell is not protected so run when worker is finished
|
|
|
|
@ -488,13 +485,10 @@ bool phy::set_config(srslte::phy_cfg_t config_, uint32_t cc_idx)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
|
log_h->info("Setting new PRACH configuration...\n");
|
|
|
|
|
|
|
|
|
|
// It is up to the PRACH component to detect whether the cell or the configuration have changed to reconfigure
|
|
|
|
|
configure_prach_params();
|
|
|
|
|
log_h->info("Finished setting new PRACH configuration.\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
stack->set_config_complete(true);
|
|
|
|
|
});
|
|
|
|
|
return true;
|
|
|
|
|