From 7843003a1e1fad2235f3f75faee7af19a6dde89f Mon Sep 17 00:00:00 2001 From: francescomani Date: Mon, 24 Mar 2025 15:41:14 +0100 Subject: [PATCH 1/4] remove unnecessary nr_rrc_config.c from NR_L2_SRC_UE --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d608d99c53..c9dbc47f64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1182,7 +1182,6 @@ set(NR_L2_SRC_UE ${NR_SDAP_SRC} ${NR_UE_RRC_DIR}/L2_interface_ue.c ${NR_UE_RRC_DIR}/main_ue.c - ${NR_RRC_DIR}/nr_rrc_config.c ${NR_UE_RRC_DIR}/rrc_UE.c ${NR_UE_RRC_DIR}/rrc_nsa.c ${NR_UE_RRC_DIR}/rrc_timers_and_constants.c From d62e202a5bc5236b7aa0e01d5485277eaab1d043 Mon Sep 17 00:00:00 2001 From: francescomani Date: Mon, 24 Mar 2025 15:43:43 +0100 Subject: [PATCH 2/4] remove unnecessary MCE_APP_SRC from L2_LTE_NR --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9dbc47f64..ac13632407 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1338,7 +1338,6 @@ add_library(L2_LTE_NR ${L2_RRC_SRC} ${MAC_SRC} ${ENB_APP_SRC} - ${MCE_APP_SRC} ) target_link_libraries(L2_LTE_NR PRIVATE f1ap s1ap nr_rrc) From 6c6fa11fd8680a5dbab1074f3730839ad81d2032 Mon Sep 17 00:00:00 2001 From: francescomani Date: Mon, 24 Mar 2025 16:53:06 +0100 Subject: [PATCH 3/4] do not compile full LTE L2 eNB in nr-softmodem (at the cost of a small dummy file) --- CMakeLists.txt | 4 +- openair2/LAYER2/MAC/dummy_functions.c | 61 +++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 openair2/LAYER2/MAC/dummy_functions.c diff --git a/CMakeLists.txt b/CMakeLists.txt index ac13632407..ad84b0ca02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1335,8 +1335,8 @@ if(E2_AGENT) endif() add_library(L2_LTE_NR - ${L2_RRC_SRC} - ${MAC_SRC} + # temporary solution until 4G/5G code completely untangled (as evidenced by deletion of the following file) + ${MAC_DIR}/dummy_functions.c ${ENB_APP_SRC} ) diff --git a/openair2/LAYER2/MAC/dummy_functions.c b/openair2/LAYER2/MAC/dummy_functions.c new file mode 100644 index 0000000000..adc73d0dfa --- /dev/null +++ b/openair2/LAYER2/MAC/dummy_functions.c @@ -0,0 +1,61 @@ +/* + * 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 + */ + +#include "openair2/LAYER2/MAC/mac_proto.h" + +// TODO temporary solution +// to be removed once separation between NR and LTE is achieved + +int sf_ahead = 4; +SCHEDULER_MODES global_scheduler_mode; + +int rrc_mac_config_req_eNB(const module_id_t Mod_idP, const rrc_mac_config_req_eNB_t *param) +{ + return 0; +} + +void mac_top_init_eNB(void) +{ +} + +uint32_t to_earfcn_UL(int eutra_bandP, long long int ul_CarrierFreq, uint32_t bw) +{ + return 0; +} + +int32_t get_uldl_offset(int nr_bandP) { + return 0; +} + +IF_Module_t *IF_Module_init(int Mod_id) +{ + return NULL; +} + +uint32_t from_earfcn(int eutra_bandP, uint32_t dl_earfcn) +{ + return 0; +} + +uint32_t to_earfcn_DL(int eutra_bandP, long long int dl_CarrierFreq, uint32_t bw) +{ + return 0; +} From 0c34562db757f0a454c8448c430c8a4bfaa2bb7b Mon Sep 17 00:00:00 2001 From: francescomani Date: Mon, 24 Mar 2025 16:58:18 +0100 Subject: [PATCH 4/4] remove unnecessary L2_UE_LTE_NR --- CMakeLists.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad84b0ca02..be4a643201 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1349,12 +1349,6 @@ add_library(L2_UE target_link_libraries(L2_UE PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs) target_link_libraries(L2_UE PRIVATE GTPV1U) -add_library(L2_UE_LTE_NR - ${L2_RRC_SRC_UE} - ${MAC_SRC_UE} -) -target_link_libraries(L2_UE_LTE_NR PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs) - target_link_libraries(L2_UE PRIVATE asn1_lte_rrc_hdrs) add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} ) @@ -1892,12 +1886,13 @@ add_executable(nr-uesoftmodem ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c + ${PHY_INTERFACE_DIR}/queue_t.c ) target_link_libraries(nr-uesoftmodem PRIVATE -Wl,--start-group nr_rrc SECURITY UTIL HASHTABLE SCHED_RU_LIB SCHED_NR_UE_LIB - PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON NFAPI_LIB NFAPI_PNF_LIB + PHY_COMMON PHY_NR_COMMON PHY_NR_UE NR_L2_UE MAC_NR_COMMON NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_NR_LIB ITTI SIMU shlib_loader -Wl,--end-group z dl) @@ -2119,7 +2114,7 @@ if (${T_TRACER}) NFAPI_LIB NFAPI_PNF_LIB NFAPI_VNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB MISC_NFAPI_NR_LIB PHY_COMMON PHY PHY_UE PHY_NR PHY_NR_COMMON PHY_NR_UE PHY_RU - L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE L2_UE_LTE_NR MAC_NR_COMMON MAC_UE_NR ngap + L2 L2_LTE L2_NR L2_LTE_NR L2_UE NR_L2_UE MAC_NR_COMMON MAC_UE_NR ngap CN_UTILS GTPV1U SCTP_CLIENT MME_APP LIB_NAS_UE NB_IoT SIMU OPENAIR0_LIB dfts config_internals nr_common crc_byte) if (TARGET ${i})