diff --git a/executables/nr-ue.c b/executables/nr-ue.c
index 7bb508cfba027ece0a1faecda3f813064725324b..41032a3d42c131042b3a55881f5c61e9b989ec50 100644
--- a/executables/nr-ue.c
+++ b/executables/nr-ue.c
@@ -147,6 +147,24 @@ static void *nrL1_UE_stats_thread(void *param)
return NULL;
}
+static int determine_N_TA_offset(PHY_VARS_NR_UE *ue) {
+ if (ue->sl_mode == 2)
+ return 0;
+ else {
+ int N_TA_offset = ue->nrUE_config.cell_config.N_TA_offset;
+ if (N_TA_offset == -1) {
+ return set_default_nta_offset(ue->frame_parms.freq_range, ue->frame_parms.samples_per_subframe);
+ } else {
+ // Return N_TA_offet in samples, as described in 38.211 4.1 and 4.3.1
+ // T_c[s] = 1/(Δf_max x N_f) = 1 / (480 * 1000 * 4096)
+ // N_TA_offset[s] = N_TA_offset x T_c
+ // N_TA_offset[samples] = samples_per_second x N_TA_offset[s]
+ // N_TA_offset[samples] = N_TA_offset x samples_per_subframe x 1000 x T_c
+ return (N_TA_offset * ue->frame_parms.samples_per_subframe) / (4096 * 480);
+ }
+ }
+}
+
void init_nr_ue_vars(PHY_VARS_NR_UE *ue, uint8_t UE_id)
{
int nb_connected_gNB = 1;
@@ -165,8 +183,8 @@ void init_nr_ue_vars(PHY_VARS_NR_UE *ue, uint8_t UE_id)
// intialize transport
init_nr_ue_transport(ue);
- // init N_TA offset
- init_N_TA_offset(ue);
+ ue->ta_frame = -1;
+ ue->ta_slot = -1;
}
void init_nrUE_standalone_thread(int ue_idx)
@@ -870,6 +888,7 @@ void *UE_thread(void *arg)
initNotifiedFIFO_nothreadSafe(&freeBlocks);
int timing_advance = UE->timing_advance;
+ UE->N_TA_offset = determine_N_TA_offset(UE);
NR_UE_MAC_INST_t *mac = get_mac_inst(UE->Mod_id);
bool syncRunning = false;
@@ -1098,9 +1117,16 @@ void *UE_thread(void *arg)
// but use current UE->timing_advance value to compute writeBlockSize
int writeBlockSize = fp->get_samples_per_slot((slot_nr + duration_rx_to_tx) % nb_slot_frame, fp) - iq_shift_to_apply;
- if (UE->timing_advance != timing_advance) {
- writeBlockSize -= UE->timing_advance - timing_advance;
- timing_advance = UE->timing_advance;
+ int new_timing_advance = UE->timing_advance;
+ if (new_timing_advance != timing_advance) {
+ writeBlockSize -= new_timing_advance- timing_advance;
+ timing_advance = new_timing_advance;
+ }
+ int new_N_TA_offset = determine_N_TA_offset(UE);
+ if (new_N_TA_offset != UE->N_TA_offset) {
+ LOG_I(PHY, "N_TA_offset changed from %d to %d\n", UE->N_TA_offset, new_N_TA_offset);
+ writeBlockSize -= new_N_TA_offset - UE->N_TA_offset;
+ UE->N_TA_offset = new_N_TA_offset;
}
if (curMsg.proc.nr_slot_tx == 0)
diff --git a/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h b/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
index 881d7fad8e0c60ad347915408cd0393bea71bc92..a5d6087856c2ac916c2f47410abe01d8d4e59ca5 100644
--- a/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
+++ b/nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
@@ -551,7 +551,6 @@ typedef struct {
int ta_frame;
int ta_slot;
int ta_command;
- int ta_offset;
bool is_rar;
} fapi_nr_ta_command_pdu;
@@ -616,7 +615,7 @@ typedef struct
{
uint8_t phy_cell_id;//Physical Cell ID, ð‘_{ð¼ð·}^{ð‘ð‘’ð‘™ð‘™} [38.211, sec 7.4.2.1] Value: 0 ->1007
uint8_t frame_duplex_type;//Frame duplex type Value: 0 = FDD 1 = TDD
-
+ uint32_t N_TA_offset;
} fapi_nr_cell_config_t;
typedef struct
diff --git a/openair1/PHY/INIT/nr_init_ue.c b/openair1/PHY/INIT/nr_init_ue.c
index 019e386fd0944dc230f3dd97eb5eb402b308930e..19816e215fda7a5d337cc758ff42ad0592068077 100644
--- a/openair1/PHY/INIT/nr_init_ue.c
+++ b/openair1/PHY/INIT/nr_init_ue.c
@@ -492,24 +492,6 @@ void clean_UE_harq(PHY_VARS_NR_UE *UE)
}
}
-
-void init_N_TA_offset(PHY_VARS_NR_UE *ue)
-{
- NR_DL_FRAME_PARMS *fp = &ue->frame_parms;
-
- // No timing offset for Sidelink, refer to 3GPP 38.211 Section 8.5
- if (ue->sl_mode == 2)
- ue->N_TA_offset = 0;
- else
- ue->N_TA_offset = set_default_nta_offset(fp->freq_range, fp->samples_per_subframe);
- ue->ta_frame = -1;
- ue->ta_slot = -1;
-
- LOG_I(PHY,
- "UE %d Setting N_TA_offset to %d samples (UL Freq %lu, N_RB %d, mu %d)\n",
- ue->Mod_id, ue->N_TA_offset, fp->ul_CarrierFreq, fp->N_RB_DL, fp->numerology_index);
-}
-
void phy_init_nr_top(PHY_VARS_NR_UE *ue) {
NR_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
init_delay_table(frame_parms->ofdm_symbol_size, MAX_DELAY_COMP, NR_MAX_OFDM_SYMBOL_SIZE, frame_parms->delay_table);
diff --git a/openair1/PHY/INIT/nr_phy_init.h b/openair1/PHY/INIT/nr_phy_init.h
index d2c65e939f20836f49bb08009919a011b04dd783..1b1a0fa1b084c7502bccb3beb946cb0ac0088640 100644
--- a/openair1/PHY/INIT/nr_phy_init.h
+++ b/openair1/PHY/INIT/nr_phy_init.h
@@ -36,7 +36,6 @@ int nr_init_frame_parms_ue_sl(NR_DL_FRAME_PARMS *fp,
int init_nr_ue_signal(PHY_VARS_NR_UE *ue,int nb_connected_eNB);
void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB);
void init_nr_ue_transport(PHY_VARS_NR_UE *ue);
-void init_N_TA_offset(PHY_VARS_NR_UE *ue);
void nr_dump_frame_parms(NR_DL_FRAME_PARMS *frame_parms);
void phy_init_nr_gNB(PHY_VARS_gNB *gNB);
int init_codebook_gNB(PHY_VARS_gNB *gNB);
diff --git a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
index fbfc9d838903df9cba79f588373964663a6a5347..ba4ad4a0f7b0d9d7700b94a12d222106b4b78b18 100644
--- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
@@ -419,15 +419,6 @@ static void configure_ta_command(PHY_VARS_NR_UE *ue, fapi_nr_ta_command_pdu *ta_
LOG_D(PHY,
"TA command received in %d.%d Starting UL time alignment procedures. TA update will be applied at frame %d slot %d\n",
ta_command_pdu->ta_frame, ta_command_pdu->ta_slot, ue->ta_frame, ue->ta_slot);
-
- if (ta_command_pdu->ta_offset != -1) {
- // ta_offset_samples : ta_offset = samples_per_subframe : (Δf_max x N_f / 1000)
- // As described in Section 4.3.1 in 38.211
- int ta_offset_samples = (ta_command_pdu->ta_offset * samples_per_subframe) / (4096 * 480);
- ue->N_TA_offset = ta_offset_samples;
- LOG_D(PHY, "Received N_TA offset %d from upper layers. Corresponds to %d samples.\n",
- ta_command_pdu->ta_offset, ta_offset_samples);
- }
}
static void nr_ue_scheduled_response_dl(NR_UE_MAC_INST_t *mac,
diff --git a/openair2/LAYER2/NR_MAC_UE/config_ue.c b/openair2/LAYER2/NR_MAC_UE/config_ue.c
index 9cafa8f57977693d779475e374c781e7fcec4b10..8c905a8f588ca7d86dede52898fe44eacc17f5a2 100644
--- a/openair2/LAYER2/NR_MAC_UE/config_ue.c
+++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c
@@ -64,6 +64,24 @@ static void build_ssb_list(NR_UE_MAC_INST_t *mac)
}
}
+static int get_ta_offset(long *n_TimingAdvanceOffset)
+{
+ if (!n_TimingAdvanceOffset)
+ return -1;
+
+ switch (*n_TimingAdvanceOffset) {
+ case NR_ServingCellConfigCommonSIB__n_TimingAdvanceOffset_n0 :
+ return 0;
+ case NR_ServingCellConfigCommonSIB__n_TimingAdvanceOffset_n25600 :
+ return 25600;
+ case NR_ServingCellConfigCommonSIB__n_TimingAdvanceOffset_n39936 :
+ return 39936;
+ default :
+ AssertFatal(false, "Invalid n-TimingAdvanceOffset\n");
+ }
+ return -1;
+}
+
static void set_tdd_config_nr_ue(fapi_nr_tdd_table_t *tdd_table, const frame_structure_t *fs)
{
tdd_table->tdd_period_in_slots = fs->numb_slots_period;
@@ -162,6 +180,7 @@ static void config_common_ue_sa(NR_UE_MAC_INST_t *mac, NR_ServingCellConfigCommo
// cell config
cfg->cell_config.phy_cell_id = mac->physCellId;
cfg->cell_config.frame_duplex_type = frame_type;
+ cfg->cell_config.N_TA_offset = get_ta_offset(scc->n_TimingAdvanceOffset);
// SSB config
cfg->ssb_config.ss_pbch_power = scc->ss_PBCH_BlockPower;
@@ -363,6 +382,7 @@ static void config_common_ue(NR_UE_MAC_INST_t *mac, NR_ServingCellConfigCommon_t
// cell config
cfg->cell_config.phy_cell_id = *scc->physCellId;
cfg->cell_config.frame_duplex_type = frame_type;
+ cfg->cell_config.N_TA_offset = get_ta_offset(scc->n_TimingAdvanceOffset);
// SSB config
cfg->ssb_config.ss_pbch_power = scc->ss_PBCH_BlockPower;
@@ -1702,24 +1722,6 @@ void nr_rrc_mac_config_req_reset(module_id_t module_id, NR_UE_MAC_reset_cause_t
AssertFatal(!ret, "mutex failed %d\n", ret);
}
-static int get_ta_offset(long *n_TimingAdvanceOffset)
-{
- if (!n_TimingAdvanceOffset)
- return -1;
-
- switch (*n_TimingAdvanceOffset) {
- case NR_ServingCellConfigCommonSIB__n_TimingAdvanceOffset_n0 :
- return 0;
- case NR_ServingCellConfigCommonSIB__n_TimingAdvanceOffset_n25600 :
- return 25600;
- case NR_ServingCellConfigCommonSIB__n_TimingAdvanceOffset_n39936 :
- return 39936;
- default :
- AssertFatal(false, "Invalid n-TimingAdvanceOffset\n");
- }
- return -1;
-}
-
static void configure_si_schedulingInfo(NR_UE_MAC_INST_t *mac,
NR_SI_SchedulingInfo_t *si_SchedulingInfo,
NR_SI_SchedulingInfo_v1700_t *si_SchedulingInfo_v1700)
@@ -1761,7 +1763,6 @@ void nr_rrc_mac_config_req_sib1(module_id_t module_id, int cc_idP, NR_SIB1_t *si
AssertFatal(scc, "SIB1 SCC should not be NULL\n");
UPDATE_IE(mac->tdd_UL_DL_ConfigurationCommon, scc->tdd_UL_DL_ConfigurationCommon, NR_TDD_UL_DL_ConfigCommon_t);
configure_si_schedulingInfo(mac, si_SchedulingInfo, si_SchedulingInfo_v1700);
- mac->n_ta_offset = get_ta_offset(scc->n_TimingAdvanceOffset);
config_common_ue_sa(mac, scc, cc_idP);
@@ -1829,7 +1830,6 @@ static void handle_reconfiguration_with_sync(NR_UE_MAC_INST_t *mac,
if (reconfWithSync->spCellConfigCommon) {
NR_ServingCellConfigCommon_t *scc = reconfWithSync->spCellConfigCommon;
- mac->n_ta_offset = get_ta_offset(scc->n_TimingAdvanceOffset);
if (scc->physCellId)
mac->physCellId = *scc->physCellId;
mac->dmrs_TypeA_Position = scc->dmrs_TypeA_Position;
diff --git a/openair2/LAYER2/NR_MAC_UE/mac_defs.h b/openair2/LAYER2/NR_MAC_UE/mac_defs.h
index 9cb15c0283d3fc5ec8d947abe3bc0f5908ed2eeb..cfa3952759ed227fa31299d09f8c1dfd55d35e26 100644
--- a/openair2/LAYER2/NR_MAC_UE/mac_defs.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_defs.h
@@ -597,7 +597,6 @@ typedef struct NR_UE_MAC_INST_s {
int dmrs_TypeA_Position;
int p_Max;
int p_Max_alt;
- int n_ta_offset; // -1 not present, otherwise value to be applied
ntn_timing_advance_componets_t ntn_ta;
diff --git a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
index 305f6d404d820dcadb369c0cdbf7bc031f9f8a73..8df19c7139f1d217a5ded8bacf15cde194cd8807 100644
--- a/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
+++ b/openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
@@ -68,7 +68,6 @@ void nr_ue_init_mac(NR_UE_MAC_INST_t *mac)
mac->uecap_maxMIMO_PUSCH_layers_nocb = 0;
mac->p_Max = INT_MIN;
mac->p_Max_alt = INT_MIN;
- mac->n_ta_offset = -1;
mac->msg3_C_RNTI = false;
mac->ntn_ta.ntn_params_changed = false;
reset_mac_inst(mac);
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
index 159f6299a138413efb60dbd2d61c52e5582790e1..edd3bc1db72a56418fe9d3057ac3c86ab48997e4 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
@@ -2847,7 +2847,6 @@ static void schedule_ta_command(fapi_nr_dl_config_request_t *dl_config, NR_UE_MA
fapi_nr_ta_command_pdu *ta = &dl_config->dl_config_list[dl_config->number_pdus].ta_command_pdu;
ta->ta_frame = ul_time_alignment->frame;
ta->ta_slot = ul_time_alignment->slot;
- ta->ta_offset = mac->n_ta_offset;
ta->is_rar = ul_time_alignment->ta_apply == rar_ta;
ta->ta_command = ul_time_alignment->ta_command;
dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_CONFIG_TA_COMMAND;