maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fixes-rfsim-testing' into integration_2026_w17 (!4054)

Browse Source 
Minor fixes to gNB/UE behavior in RFsim

While testing with RFsim thw following issues where found:
- gNB config: wrong PCI was printed during F1 Setup Request preparation
- UE PHY: missing rxdata allocation was causing a crash during intra-freq
  measurements
This commit is contained in:
Jaroslava Fiedlerova
2026-04-21 18:16:42 +02:00
parent 38dc378224 32cb3401b4
commit be74bfb437
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
+1
View File
@@ -459,6 +459,7 @@ void nr_ue_meas_neighboring_cell(void *arg)
do_neighboring_cell_measurements(&args->proc, args->ue, args->rxdata, args->rxdata_size); do_neighboring_cell_measurements(&args->proc, args->ue, args->rxdata, args->rxdata_size);
args->ue->measurements.meas_request_pending = false; args->ue->measurements.meas_request_pending = false;
free(args->rxdata);
free(args); free(args);
} }
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+2 -1
View File
@@ -1196,10 +1196,11 @@ int pbch_processing(PHY_VARS_NR_UE *ue, const UE_nr_rxtx_proc_t *proc, nr_phy_da
// Copy rxdata // Copy rxdata
uint32_t rxdata_size = (2 * (fp->samples_per_frame) + fp->ofdm_symbol_size); uint32_t rxdata_size = (2 * (fp->samples_per_frame) + fp->ofdm_symbol_size);
size_t total_size = sizeof(nr_meas_task_args_t) + fp->nb_antennas_rx * rxdata_size * sizeof(c16_t); size_t total_size = sizeof(nr_meas_task_args_t) + fp->nb_antennas_rx * rxdata_size * sizeof(c16_t);
nr_meas_task_args_t *args = malloc(total_size); nr_meas_task_args_t *args = malloc_or_fail(total_size);
args->proc = *proc; args->proc = *proc;
args->ue = ue; args->ue = ue;
args->rxdata_size = rxdata_size; args->rxdata_size = rxdata_size;
args->rxdata = malloc_or_fail(fp->nb_antennas_rx * sizeof(*args->rxdata));
for (int i = 0; i < fp->nb_antennas_rx; i++) { for (int i = 0; i < fp->nb_antennas_rx; i++) {
args->rxdata[i] = &args->rxdata_ant[i * rxdata_size]; args->rxdata[i] = &args->rxdata_ant[i * rxdata_size];
openair2/GNB_APP/gnb_config.c
+1 -1
View File
@@ -1822,7 +1822,7 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg)
seq_arr_t *du_SIBs = RC.nrmac[0]->common_channels[0].du_SIBs; seq_arr_t *du_SIBs = RC.nrmac[0]->common_channels[0].du_SIBs;
f1ap_setup_req_t *req = RC_read_F1Setup(gnb_du_id, name, &info, scc, mib, sib1, du_SIBs); f1ap_setup_req_t *req = RC_read_F1Setup(gnb_du_id, name, &info, scc, mib, sib1, du_SIBs);
AssertFatal(req != NULL, "could not read F1 Setup information\n"); AssertFatal(req != NULL, "could not read F1 Setup information\n");
LOG_I(GNB_APP, "Configured DU: cell ID %lu, PCI %d\n", info.nr_cellid, info.nr_pci); LOG_I(GNB_APP, "Configured DU: cell ID %ld, PCI %d\n", req->cell[0].info.nr_cellid, req->cell[0].info.nr_pci);
RC.nrmac[0]->f1_config.setup_req = req; RC.nrmac[0]->f1_config.setup_req = req;
RC.nrmac[0]->f1_config.gnb_id = gnb_id; RC.nrmac[0]->f1_config.gnb_id = gnb_id;