yigid/openairinterface5g
1
0
Fork 0
mirror of https://gitlab.eurecom.fr/oai/openairinterface5g.git synced 2026-07-13 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

xran: derive TTI from configured numerology instead of hardcoded 20 slots/frame

Browse Source 
The TTI computation in xran_fh_tx_send_slot() assumed 20 slots per
frame (30 kHz SCS only). Compute slots_per_frame as 10 << mu from the
fronthaul configuration instead, so the TTI is correct for any numerology.

Signed-off-by: Karim Boutiba <karim.boutiba@openairinterface.org>
This commit is contained in:
Karim Boutiba
2026-07-06 12:06:16 +02:00
committed by YOUR NAME
parent 0dab3bb6a1
commit e6dd656e52
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
radio/fhi_72/oaioran.c
View File

@@ -766,9 +766,6 @@ int xran_fh_rx_read_slot(ru_info_t *ru, int *frame, int *slot)
* before writing. */ * before writing. */
int xran_fh_tx_send_slot(ru_info_t *ru, int frame, int slot, uint64_t timestamp) int xran_fh_tx_send_slot(ru_info_t *ru, int frame, int slot, uint64_t timestamp)
{ {
int tti = /*frame*SUBFRAMES_PER_SYSTEMFRAME*SLOTNUM_PER_SUBFRAME+*/ 20 * frame
+ slot; // commented out temporarily to check that compilation of oran 5g is working.
void *ptr = NULL; void *ptr = NULL;
int32_t *pos = NULL; int32_t *pos = NULL;
int idx = 0; int idx = 0;
@@ -778,9 +775,12 @@ int xran_fh_tx_send_slot(ru_info_t *ru, int frame, int slot, uint64_t timestamp)
#if defined K_RELEASE #if defined K_RELEASE
uint8_t mu_number = fh_cfg->mu_number[0]; uint8_t mu_number = fh_cfg->mu_number[0];
int fftsize = 1 << fh_cfg->perMu[mu_number].nDLFftSize; int fftsize = 1 << fh_cfg->perMu[mu_number].nDLFftSize;
int slots_per_frame = 10 << mu_number;
#elif defined F_RELEASE #elif defined F_RELEASE
int fftsize = 1 << fh_cfg->nDLFftSize; int fftsize = 1 << fh_cfg->nDLFftSize;
int slots_per_frame = 10 << fh_cfg->frame_conf.nNumerology;
#endif #endif
int tti = slots_per_frame * frame + slot;
int nb_tx_per_ru = ru->nb_tx / fh_init->xran_ports; int nb_tx_per_ru = ru->nb_tx / fh_init->xran_ports;
int nb_rx_per_ru = ru->nb_rx / fh_init->xran_ports; int nb_rx_per_ru = ru->nb_rx / fh_init->xran_ports;