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

NR UE: correctly compute the writeBlockSize in readFrame() and the writeTimestamp in syncInFrame()

Browse Source
This commit is contained in:
Thomas Schlichter
2026-02-20 09:59:54 +01:00
parent 09b3fc03c7
commit ba0ead6809
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-ue.c
+13 -12
View File
@@ -654,21 +654,23 @@ void readFrame(PHY_VARS_NR_UE *UE, openair0_timestamp_t *timestamp, int duration
} }
for (int x = 0; x < num_frames * NR_NUMBER_OF_SUBFRAMES_PER_FRAME; x++) { // two frames for initial sync for (int x = 0; x < num_frames * NR_NUMBER_OF_SUBFRAMES_PER_FRAME; x++) { // two frames for initial sync
for (int slot = 0; slot < fp->slots_per_subframe; slot++) { for (int slot_rx = 0; slot_rx < fp->slots_per_subframe; slot_rx++) {
if (!toTrash) if (!toTrash)
for (int i = 0; i < fp->nb_antennas_rx; i++) for (int i = 0; i < fp->nb_antennas_rx; i++)
rxp[i] = &UE->common_vars.rxdata[i][x * fp->samples_per_subframe + get_samples_slot_timestamp(fp, slot)]; rxp[i] = &UE->common_vars.rxdata[i][x * fp->samples_per_subframe + get_samples_slot_timestamp(fp, slot_rx)];
int read_block_size = get_samples_per_slot(slot, fp); int readBlockSize = get_samples_per_slot(slot_rx, fp);
int tmp = nrue_ru_read(UE, timestamp, (void **)rxp, read_block_size, fp->nb_antennas_rx); int tmp = nrue_ru_read(UE, timestamp, (void **)rxp, readBlockSize, fp->nb_antennas_rx);
UEscopeCopy(UE, ueTimeDomainSamplesBeforeSync, rxp[0], sizeof(c16_t), 1, read_block_size, 0); UEscopeCopy(UE, ueTimeDomainSamplesBeforeSync, rxp[0], sizeof(c16_t), 1, readBlockSize, 0);
AssertFatal(read_block_size == tmp, ""); AssertFatal(readBlockSize == tmp, "");
if (IS_SOFTMODEM_RFSIM) { if (IS_SOFTMODEM_RFSIM) {
int slot_tx = (slot_rx + duration_rx_to_tx) % fp->slots_per_frame;
int writeBlockSize = get_samples_per_slot(slot_tx, fp);
int ta = UE->timing_advance + UE->timing_advance_ntn; int ta = UE->timing_advance + UE->timing_advance_ntn;
const openair0_timestamp_t writeTimestamp = const openair0_timestamp_t writeTimestamp =
*timestamp + get_samples_slot_duration(fp, slot, duration_rx_to_tx) - UE->N_TA_offset - ta; *timestamp + get_samples_slot_duration(fp, slot_rx, duration_rx_to_tx) - UE->N_TA_offset - ta;
dummyWrite(UE, writeTimestamp, get_samples_per_slot(slot, fp)); dummyWrite(UE, writeTimestamp, writeBlockSize);
} }
} }
} }
@@ -685,19 +687,18 @@ static void syncInFrame(PHY_VARS_NR_UE *UE, openair0_timestamp_t *timestamp, int
LOG_I(PHY, "Resynchronizing RX by %ld samples\n", rx_offset); LOG_I(PHY, "Resynchronizing RX by %ld samples\n", rx_offset);
int slot = 0;
int size = rx_offset; int size = rx_offset;
while (size > 0) { while (size > 0) {
const int unitTransfer = min(get_samples_per_slot(slot, fp), size); // Set a maximum transfer size. As we usually read/write single slots, we use the size of slot 0 as maximum here.
const int unitTransfer = min(get_samples_per_slot(0, fp), size);
const int res = nrue_ru_read(UE, timestamp, (void **)UE->common_vars.rxdata, unitTransfer, fp->nb_antennas_rx); const int res = nrue_ru_read(UE, timestamp, (void **)UE->common_vars.rxdata, unitTransfer, fp->nb_antennas_rx);
DevAssert(unitTransfer == res); DevAssert(unitTransfer == res);
if (IS_SOFTMODEM_RFSIM) { if (IS_SOFTMODEM_RFSIM) {
int ta = UE->timing_advance + UE->timing_advance_ntn; int ta = UE->timing_advance + UE->timing_advance_ntn;
const openair0_timestamp_t writeTimestamp = const openair0_timestamp_t writeTimestamp =
*timestamp + get_samples_slot_duration(fp, slot, duration_rx_to_tx) - UE->N_TA_offset - ta; *timestamp + get_samples_slot_duration(fp, 0, duration_rx_to_tx) - UE->N_TA_offset - ta;
dummyWrite(UE, writeTimestamp, unitTransfer); dummyWrite(UE, writeTimestamp, unitTransfer);
} }
slot = (slot + 1) % fp->slots_per_subframe;
size -= unitTransfer; size -= unitTransfer;
} }
} }