From 9470c51b004f10e4fe194a6dc89a543e1b5d71c3 Mon Sep 17 00:00:00 2001 From: francescomani Date: Mon, 15 Dec 2025 12:13:34 +0100 Subject: [PATCH] remove phy_extern_nr_ue file --- .../telnetsrv/telnetsrv_5Gue_measurements.c | 4 ++- common/utils/telnetsrv/telnetsrv_ciUE.c | 4 ++- doc/Doxyfile | 1 - executables/nr-ue.c | 1 - openair1/PHY/INIT/nr_init_ue.c | 1 - .../PHY/NR_UE_ESTIMATION/nr_adjust_gain.c | 1 - .../PHY/NR_UE_ESTIMATION/nr_ue_measurements.c | 1 - openair1/PHY/NR_UE_TRANSPORT/csi_rx.c | 1 - .../PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c | 1 - openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c | 1 - .../PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c | 3 +- openair1/PHY/phy_extern_nr_ue.h | 33 ------------------- openair1/SCHED_NR_UE/fapi_nr_ue_l1.c | 3 +- openair1/SCHED_NR_UE/phy_procedures_nr_ue.c | 1 - 14 files changed, 10 insertions(+), 46 deletions(-) delete mode 100644 openair1/PHY/phy_extern_nr_ue.h diff --git a/common/utils/telnetsrv/telnetsrv_5Gue_measurements.c b/common/utils/telnetsrv/telnetsrv_5Gue_measurements.c index 6f2d1c7516..323a4175bc 100644 --- a/common/utils/telnetsrv/telnetsrv_5Gue_measurements.c +++ b/common/utils/telnetsrv/telnetsrv_5Gue_measurements.c @@ -50,7 +50,9 @@ #include "telnetsrv_ltemeasur_def.h" #include "telnetsrv_cpumeasur_def.h" #include "openair2/LAYER2/NR_MAC_UE/mac_defs.h" -#include "openair1/PHY/phy_extern_nr_ue.h" +#include "openair1/PHY/defs_nr_UE.h" + +extern PHY_VARS_NR_UE ***PHY_vars_UE_g; void measurcmd_display_macstats(telnet_printfunc_t prnt); void measurcmd_display_macstats_ue(telnet_printfunc_t prnt); diff --git a/common/utils/telnetsrv/telnetsrv_ciUE.c b/common/utils/telnetsrv/telnetsrv_ciUE.c index 6f86f1678f..cc580b1a83 100644 --- a/common/utils/telnetsrv/telnetsrv_ciUE.c +++ b/common/utils/telnetsrv/telnetsrv_ciUE.c @@ -37,8 +37,8 @@ #include "openair2/LAYER2/NR_MAC_UE/mac_defs.h" #include "openair2/LAYER2/NR_MAC_UE/mac_proto.h" #include "openair2/RRC/NR_UE/rrc_proto.h" -#include "openair1/PHY/phy_extern_nr_ue.h" #include "openair1/PHY/defs_nr_common.h" +#include "openair1/PHY/defs_nr_UE.h" #include "openair3/NAS/NR_UE/nr_nas_msg.h" #define TELNETSERVERCODE @@ -46,6 +46,8 @@ #define ERROR_MSG_RET(mSG, aRGS...) do { prnt(mSG, ##aRGS); return 1; } while (0) +extern PHY_VARS_NR_UE ***PHY_vars_UE_g; + /* UE L2 state string */ const char* NR_UE_L2_STATE_STR[] = { #define UE_STATE(state) #state, diff --git a/doc/Doxyfile b/doc/Doxyfile index 85cb5776c0..39c7983e72 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -1924,7 +1924,6 @@ INPUT = \ @CMAKE_CURRENT_SOURCE_DIR@/../openair2/SDAP/nr_sdap/nr_sdap_entity.c \ @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/defs_gNB.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/impl_defs_top.h \ -@CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/phy_extern_nr_ue.h \ @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/lte_parms.c \ @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/nr_init_ru.c \ @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/INIT/nr_parms.c \ diff --git a/executables/nr-ue.c b/executables/nr-ue.c index f57b663f1e..bb88768029 100644 --- a/executables/nr-ue.c +++ b/executables/nr-ue.c @@ -24,7 +24,6 @@ #include #include #include "executables/nr-uesoftmodem.h" -#include "PHY/phy_extern_nr_ue.h" #include "PHY/INIT/nr_phy_init.h" #include "NR_MAC_UE/mac_proto.h" #include "RRC/NR_UE/rrc_proto.h" diff --git a/openair1/PHY/INIT/nr_init_ue.c b/openair1/PHY/INIT/nr_init_ue.c index 7ab8a8863d..ded11bc4af 100644 --- a/openair1/PHY/INIT/nr_init_ue.c +++ b/openair1/PHY/INIT/nr_init_ue.c @@ -20,7 +20,6 @@ */ #include "nr_phy_init.h" -#include "PHY/phy_extern_nr_ue.h" #include "openair1/PHY/defs_RU.h" #include "openair1/PHY/impl_defs_nr.h" #include "common/utils/LOG/vcd_signal_dumper.h" diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c b/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c index 4a884b964b..6f3466e436 100644 --- a/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c +++ b/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_gain.c @@ -21,7 +21,6 @@ #include "PHY/types.h" #include "PHY/defs_nr_UE.h" -#include "PHY/phy_extern_nr_ue.h" void phy_adjust_gain_nr (PHY_VARS_NR_UE *ue, uint32_t rx_power_fil_dB, uint8_t eNB_id) diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c b/openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c index 4c8c57d9fd..b04f595481 100644 --- a/openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c +++ b/openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c @@ -34,7 +34,6 @@ #include "executables/nr-softmodem-common.h" #include "PHY/defs_nr_UE.h" #include "PHY/INIT/nr_phy_init.h" -#include "PHY/phy_extern_nr_ue.h" #include "common/utils/LOG/log.h" #include "PHY/sse_intrin.h" #include "SCHED_NR_UE/defs.h" diff --git a/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c b/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c index 26cad50f12..b2e43b3c16 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c +++ b/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c @@ -35,7 +35,6 @@ #include "executables/nr-softmodem-common.h" #include "nr_transport_proto_ue.h" -#include "PHY/phy_extern_nr_ue.h" #include "PHY/NR_REFSIG/nr_refsig.h" #include "common/utils/nr/nr_common.h" #include "PHY/NR_UE_ESTIMATION/filt16a_32.h" diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c index e6b4503e1b..be71e435a0 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c @@ -25,7 +25,6 @@ #include "common/utils/LOG/vcd_signal_dumper.h" #include "PHY/defs_nr_UE.h" #include "SCHED_NR_UE/harq_nr.h" -#include "PHY/phy_extern_nr_ue.h" #include "PHY/CODING/coding_extern.h" #include "PHY/CODING/coding_defs.h" #include "PHY/CODING/nrLDPC_coding/nrLDPC_coding_interface.h" diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c b/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c index 00130b3642..8d3ac6db21 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c @@ -31,7 +31,6 @@ */ #include "PHY/defs_nr_UE.h" #include "PHY/CODING/coding_extern.h" -#include "PHY/phy_extern_nr_ue.h" #include "PHY/sse_intrin.h" #include "PHY/INIT/nr_phy_init.h" #include "openair1/SCHED_NR_UE/defs.h" diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c index 8199b45fc6..436ebfe5e0 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c @@ -29,10 +29,11 @@ */ #include "PHY/defs_nr_UE.h" -#include "PHY/phy_extern_nr_ue.h" #include "nr_transport_proto_ue.h" #include "executables/softmodem-common.h" +extern PHY_VARS_NR_UE ***PHY_vars_UE_g; + void nr_get_carrier_frequencies(PHY_VARS_NR_UE *ue, uint64_t *dl_carrier, uint64_t *ul_carrier){ NR_DL_FRAME_PARMS *fp = &ue->frame_parms; diff --git a/openair1/PHY/phy_extern_nr_ue.h b/openair1/PHY/phy_extern_nr_ue.h deleted file mode 100644 index 2c4679dddd..0000000000 --- a/openair1/PHY/phy_extern_nr_ue.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The OpenAirInterface Software Alliance licenses this file to You under - * the OAI Public License, Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.openairinterface.org/?page_id=698 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - *------------------------------------------------------------------------------- - * For more information about the OpenAirInterface (OAI) Software Alliance: - * contact@openairinterface.org - */ - -#ifndef __PHY_EXTERN_NR_UE__H__ -#define __PHY_EXTERN_NR_UE__H__ - -#include "PHY/defs_nr_UE.h" -extern PHY_VARS_NR_UE ***PHY_vars_UE_g; - -extern uint64_t downlink_frequency[MAX_NUM_CCs][4]; -extern int32_t uplink_frequency_offset[MAX_NUM_CCs][4]; -extern uint64_t sidelink_frequency[MAX_NUM_CCs][4]; - -#endif /*__PHY_EXTERN_H__ */ - diff --git a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c index 5c679630f4..6810f2c08d 100644 --- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c +++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c @@ -39,7 +39,8 @@ #include "PHY/impl_defs_nr.h" #include "utils.h" #include "SCHED_NR_UE/phy_sch_processing_time.h" -#include "openair1/PHY/phy_extern_nr_ue.h" + +extern PHY_VARS_NR_UE ***PHY_vars_UE_g; const char *const dl_pdu_type[] = {"DCI", "DLSCH", "RA_DLSCH", "SI_DLSCH", "P_DLSCH", "CSI_RS", "CSI_IM", "TA"}; const char *const ul_pdu_type[] = {"PRACH", "PUCCH", "PUSCH", "SRS"}; diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c index d018630357..68c0541e3a 100644 --- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c +++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c @@ -37,7 +37,6 @@ #include "defs.h" #include "PHY/defs_nr_UE.h" #include "PHY/NR_REFSIG/dmrs_nr.h" -#include "PHY/phy_extern_nr_ue.h" #include "PHY/MODULATION/modulation_UE.h" #include "PHY/INIT/nr_phy_init.h" #include "PHY/nr_phy_common/inc/nr_phy_common.h"