From 22866c3c1e32087e438310f8e85ae8e3ffefc500 Mon Sep 17 00:00:00 2001 From: Thomas Schlichter Date: Thu, 24 Apr 2025 09:51:05 +0000 Subject: [PATCH] NR UE: for consistency, rename ntn_ta_commondrift to N_common_ta_drift --- openair2/LAYER2/NR_MAC_UE/config_ue.c | 8 ++++---- openair2/LAYER2/NR_MAC_UE/mac_defs.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_UE/config_ue.c b/openair2/LAYER2/NR_MAC_UE/config_ue.c index 2381bdb3e3..921e3da6d1 100644 --- a/openair2/LAYER2/NR_MAC_UE/config_ue.c +++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c @@ -336,12 +336,12 @@ static void configure_ntn_ta(module_id_t module_id, ntn_ta->N_common_ta_adj = ntn_Config_r17->ta_Info_r17->ta_Common_r17 * 4.072e-6; // ta_CommonDrift_r17 (is in units of 0.2e-3 µs/s) if (ntn_Config_r17->ta_Info_r17->ta_CommonDrift_r17) - ntn_ta->ntn_ta_commondrift = *ntn_Config_r17->ta_Info_r17->ta_CommonDrift_r17 * 0.2e-3; + ntn_ta->N_common_ta_drift = *ntn_Config_r17->ta_Info_r17->ta_CommonDrift_r17 * 0.2e-3; else // Need R - Release if not present - ntn_ta->ntn_ta_commondrift = 0; + ntn_ta->N_common_ta_drift = 0; } else { // Need R - Release if not present ntn_ta->N_common_ta_adj = 0; - ntn_ta->ntn_ta_commondrift = 0; + ntn_ta->N_common_ta_drift = 0; } ntn_ta->ntn_params_changed = true; @@ -352,7 +352,7 @@ static void configure_ntn_ta(module_id_t module_id, ntn_ta->epoch_subframe, ntn_ta->cell_specific_k_offset, ntn_ta->N_common_ta_adj, - ntn_ta->ntn_ta_commondrift, + ntn_ta->N_common_ta_drift, ntn_ta->N_UE_TA_adj, ntn_ta->N_UE_TA_drift); } diff --git a/openair2/LAYER2/NR_MAC_UE/mac_defs.h b/openair2/LAYER2/NR_MAC_UE/mac_defs.h index 13f42ca9e3..aeecf2ecaf 100644 --- a/openair2/LAYER2/NR_MAC_UE/mac_defs.h +++ b/openair2/LAYER2/NR_MAC_UE/mac_defs.h @@ -532,7 +532,7 @@ typedef struct ntn_timing_advance_components { // N_common_ta_adj represents common round-trip-time between gNB and SAT received in SIB19 (ms) double N_common_ta_adj; // drift rate of common ta in µs/s - double ntn_ta_commondrift; + double N_common_ta_drift; // N_UE_TA_adj calculated round-trip-time between UE and SAT (ms) double N_UE_TA_adj; // drift rate of N_UE_TA in µs/s @@ -667,7 +667,7 @@ static inline double get_total_TA_ms(const ntn_timing_advance_componets_t *ntn_t static inline double get_total_TA_drift(const ntn_timing_advance_componets_t *ntn_ta) { - return ntn_ta->ntn_ta_commondrift + ntn_ta->N_UE_TA_drift; + return ntn_ta->N_common_ta_drift + ntn_ta->N_UE_TA_drift; } /*@}*/