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

NR UE: remove now unnecessary local variable update_ntn_system_information

Browse Source 
directly use `UE->ntn_config_message->update` instead
This commit is contained in:
Thomas Schlichter
2025-04-10 13:56:20 +00:00
parent 997790f656
commit 6e06c817f4
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-ue.c
+4 -12
View File
@@ -874,13 +874,12 @@ static inline int get_readBlockSize(uint16_t slot, NR_DL_FRAME_PARMS *fp) {
static inline void apply_ntn_config(PHY_VARS_NR_UE *UE, static inline void apply_ntn_config(PHY_VARS_NR_UE *UE,
NR_DL_FRAME_PARMS *fp, NR_DL_FRAME_PARMS *fp,
int slot_nr, int slot_nr,
bool *update_ntn_system_information,
int *duration_rx_to_tx, int *duration_rx_to_tx,
int *timing_advance, int *timing_advance,
int *ntn_koffset) int *ntn_koffset)
{ {
if (*update_ntn_system_information) { if (UE->ntn_config_message->update) {
*update_ntn_system_information = false; UE->ntn_config_message->update = false;
double total_ta_ms = UE->ntn_config_message->ntn_config_params.ntn_total_time_advance_ms; double total_ta_ms = UE->ntn_config_message->ntn_config_params.ntn_total_time_advance_ms;
UE->timing_advance = fp->samples_per_subframe * total_ta_ms; UE->timing_advance = fp->samples_per_subframe * total_ta_ms;
@@ -962,9 +961,7 @@ void *UE_thread(void *arg)
double ntn_init_time_drift = get_nrUE_params()->ntn_init_time_drift; double ntn_init_time_drift = get_nrUE_params()->ntn_init_time_drift;
int ntn_koffset = 0; int ntn_koffset = 0;
int duration_rx_to_tx = NR_UE_CAPABILITY_SLOT_RX_TO_TX; int duration_rx_to_tx = NR_UE_CAPABILITY_SLOT_RX_TO_TX;
bool update_ntn_system_information = false;
while (!oai_exit) { while (!oai_exit) {
if (syncRunning) { if (syncRunning) {
@@ -1091,11 +1088,6 @@ void *UE_thread(void *arg)
absolute_slot++; absolute_slot++;
TracyCFrameMark; TracyCFrameMark;
if (UE->ntn_config_message->update) {
UE->ntn_config_message->update = false;
update_ntn_system_information = true;
}
int slot_nr = absolute_slot % nb_slot_frame; int slot_nr = absolute_slot % nb_slot_frame;
nr_rxtx_thread_data_t curMsg = {0}; nr_rxtx_thread_data_t curMsg = {0};
curMsg.UE=UE; curMsg.UE=UE;
@@ -1185,8 +1177,8 @@ void *UE_thread(void *arg)
shiftForNextFrame = ret; shiftForNextFrame = ret;
pushNotifiedFIFO(&UE->dl_actors[curMsg.proc.nr_slot_rx % NUM_DL_ACTORS].fifo, newRx); pushNotifiedFIFO(&UE->dl_actors[curMsg.proc.nr_slot_rx % NUM_DL_ACTORS].fifo, newRx);
// apply new duration next run to avoid thread dead lock // apply new NTN timing information
apply_ntn_config(UE, fp, slot_nr, &update_ntn_system_information, &duration_rx_to_tx, &timing_advance, &ntn_koffset); apply_ntn_config(UE, fp, slot_nr, &duration_rx_to_tx, &timing_advance, &ntn_koffset);
// Start TX slot processing here. It runs in parallel with RX slot processing // Start TX slot processing here. It runs in parallel with RX slot processing
// in current code, DURATION_RX_TO_TX constant is the limit to get UL data to encode from a RX slot // in current code, DURATION_RX_TO_TX constant is the limit to get UL data to encode from a RX slot