Commit 01b2c455 authored by Vaibhav Shrivastava's avatar Vaibhav Shrivastava

Fix for eNB Compilation issue

parent c1f3e1ad
...@@ -775,6 +775,7 @@ add_library(UTIL ...@@ -775,6 +775,7 @@ add_library(UTIL
${OPENAIR_DIR}/common/utils/time_meas.c ${OPENAIR_DIR}/common/utils/time_meas.c
${OPENAIR_DIR}/common/utils/time_stat.c ${OPENAIR_DIR}/common/utils/time_stat.c
) )
target_link_libraries(UTIL PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
set(SECU_OSA_SRC set(SECU_OSA_SRC
${OPENAIR2_DIR}/UTIL/OSA/osa_key_deriver.c ${OPENAIR2_DIR}/UTIL/OSA/osa_key_deriver.c
...@@ -813,7 +814,7 @@ set(SCHED_SRC ...@@ -813,7 +814,7 @@ set(SCHED_SRC
${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c ${OPENAIR1_DIR}/SCHED/phy_procedures_lte_common.c
) )
add_library(SCHED_LIB ${SCHED_SRC}) add_library(SCHED_LIB ${SCHED_SRC})
target_link_libraries(SCHED_LIB PRIVATE asn1_lte_rrc_hdrs) target_link_libraries(SCHED_LIB PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
set(SCHED_NR_SRC set(SCHED_NR_SRC
${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c ${OPENAIR1_DIR}/SCHED_NR/fapi_nr_l1.c
...@@ -830,7 +831,7 @@ set(SCHED_SRC_RU ...@@ -830,7 +831,7 @@ set(SCHED_SRC_RU
${OPENAIR1_DIR}/SCHED/prach_procedures.c ${OPENAIR1_DIR}/SCHED/prach_procedures.c
) )
add_library(SCHED_RU_LIB ${SCHED_SRC_RU}) add_library(SCHED_RU_LIB ${SCHED_SRC_RU})
target_link_libraries(SCHED_RU_LIB PRIVATE asn1_lte_rrc_hdrs) target_link_libraries(SCHED_RU_LIB PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
set(SCHED_SRC_UE set(SCHED_SRC_UE
${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c ${OPENAIR1_DIR}/SCHED_UE/phy_procedures_lte_ue.c
...@@ -1021,6 +1022,7 @@ add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} ) ...@@ -1021,6 +1022,7 @@ add_library(ldpc MODULE ${PHY_LDPC_OPTIM8SEGMULTI_SRC} )
target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS) target_link_libraries(ldpc PRIVATE ldpc_gen_HEADERS)
add_library(coding MODULE ${PHY_TURBOSRC} ) add_library(coding MODULE ${PHY_TURBOSRC} )
target_link_libraries(coding PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c ) add_library(dfts MODULE ${OPENAIR1_DIR}/PHY/TOOLS/oai_dfts.c )
...@@ -1277,8 +1279,9 @@ set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_comp ...@@ -1277,8 +1279,9 @@ set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_comp
set(PHY_NR_UE_SRC ${PHY_NR_UE_SRC} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c) set(PHY_NR_UE_SRC ${PHY_NR_UE_SRC} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
add_library(PHY_COMMON ${PHY_SRC_COMMON}) add_library(PHY_COMMON ${PHY_SRC_COMMON})
add_dependencies(PHY_COMMON dfts)
target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs) target_link_libraries(PHY_COMMON PRIVATE asn1_lte_rrc_hdrs)
add_dependencies(PHY_COMMON dfts)
target_link_libraries(PHY_COMMON PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
add_library(PHY ${PHY_SRC}) add_library(PHY ${PHY_SRC})
target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs) target_link_libraries(PHY PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
...@@ -2068,6 +2071,7 @@ set (SIMUSRC ...@@ -2068,6 +2071,7 @@ set (SIMUSRC
) )
add_library(SIMU STATIC ${SIMUSRC} ) add_library(SIMU STATIC ${SIMUSRC} )
target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF) target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAIR1_DIR}/SIMULATION/RF)
target_link_libraries(SIMU PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
# Qt-based scope # Qt-based scope
add_boolean_option(ENABLE_NRQTSCOPE OFF "Build the Qt-Scope" OFF) add_boolean_option(ENABLE_NRQTSCOPE OFF "Build the Qt-Scope" OFF)
...@@ -2105,6 +2109,7 @@ add_library(rfsimulator MODULE ...@@ -2105,6 +2109,7 @@ add_library(rfsimulator MODULE
${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c ${OPENAIR1_DIR}/PHY/TOOLS/signal_energy.c
) )
target_link_libraries(rfsimulator PRIVATE SIMU ${ATLAS_LIBRARIES}) target_link_libraries(rfsimulator PRIVATE SIMU ${ATLAS_LIBRARIES})
target_link_libraries(rfsimulator PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
add_library(oai_iqplayer MODULE add_library(oai_iqplayer MODULE
${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c ${OPENAIR_DIR}/radio/iqplayer/iqplayer_lib.c
......
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
#include "udp_eNB_task.h" #include "udp_eNB_task.h"
#include "ss_eNB_proxy_iface.h" #include "ss_eNB_proxy_iface.h"
#include "common/utils/LOG/ss-log.h" #include "common/utils/LOG/ss-log.h"
#include "msc.h"
extern RAN_CONTEXT_t RC; extern RAN_CONTEXT_t RC;
extern uint32_t from_earfcn(int eutra_bandP, uint32_t dl_earfcn); extern uint32_t from_earfcn(int eutra_bandP, uint32_t dl_earfcn);
...@@ -248,11 +247,6 @@ static int sys_send_init_udp(const udpSockReq_t *req) ...@@ -248,11 +247,6 @@ static int sys_send_init_udp(const udpSockReq_t *req)
//addr.s_addr = req->ss_ip_addr; //addr.s_addr = req->ss_ip_addr;
UDP_INIT(message_p).address = req->address; //inet_ntoa(addr); UDP_INIT(message_p).address = req->address; //inet_ntoa(addr);
LOG_A(ENB_SS, "Tx UDP_INIT IP addr %s (%x)\n", UDP_INIT(message_p).address, UDP_INIT(message_p).port); LOG_A(ENB_SS, "Tx UDP_INIT IP addr %s (%x)\n", UDP_INIT(message_p).address, UDP_INIT(message_p).port);
MSC_LOG_EVENT(
MSC_GTPU_ENB,
"0 UDP bind %s:%u",
UDP_INIT(message_p).address,
UDP_INIT(message_p).port);
return itti_send_msg_to_task(TASK_UDP, 0, message_p); return itti_send_msg_to_task(TASK_UDP, 0, message_p);
} }
......
...@@ -30,8 +30,7 @@ ...@@ -30,8 +30,7 @@
#include "ss_eNB_multicell_helper.h" #include "ss_eNB_multicell_helper.h"
#include "SIDL_VIRTUAL_TIME_PORT.h" #include "SIDL_VIRTUAL_TIME_PORT.h"
#include "acpSysVT.h" #include "acpSysVT.h"
#define MSC_INTERFACE #include "enb_config.h"
#include "msc.h"
extern SSConfigContext_t SS_context; extern SSConfigContext_t SS_context;
extern RAN_CONTEXT_t RC; extern RAN_CONTEXT_t RC;
...@@ -66,11 +65,6 @@ static int vtp_send_init_udp(const vtp_udpSockReq_t *req) ...@@ -66,11 +65,6 @@ static int vtp_send_init_udp(const vtp_udpSockReq_t *req)
//addr.s_addr = req->ss_ip_addr; //addr.s_addr = req->ss_ip_addr;
UDP_INIT(message_p).address = req->address; //inet_ntoa(addr); UDP_INIT(message_p).address = req->address; //inet_ntoa(addr);
LOG_A(ENB_APP, "Tx UDP_INIT IP addr %s (%x)\n", UDP_INIT(message_p).address, UDP_INIT(message_p).port); LOG_A(ENB_APP, "Tx UDP_INIT IP addr %s (%x)\n", UDP_INIT(message_p).address, UDP_INIT(message_p).port);
MSC_LOG_EVENT(
MSC_GTPU_ENB,
"0 UDP bind %s:%u",
UDP_INIT(message_p).address,
UDP_INIT(message_p).port);
return itti_send_msg_to_task(TASK_UDP, 0, message_p); return itti_send_msg_to_task(TASK_UDP, 0, message_p);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
......
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
#include "ss_gNB_context.h" #include "ss_gNB_context.h"
#include "common/utils/LOG/ss-log.h" #include "common/utils/LOG/ss-log.h"
#define MSC_INTERFACE
#include "msc.h"
extern RAN_CONTEXT_t RC; extern RAN_CONTEXT_t RC;
extern SSConfigContext_t SS_context; extern SSConfigContext_t SS_context;
...@@ -1352,11 +1350,6 @@ static int sys_5G_send_init_udp(const udpSockReq_t *req) ...@@ -1352,11 +1350,6 @@ static int sys_5G_send_init_udp(const udpSockReq_t *req)
//addr.s_addr = req->ss_ip_addr; //addr.s_addr = req->ss_ip_addr;
UDP_INIT(message_p).address = req->address; //inet_ntoa(addr); UDP_INIT(message_p).address = req->address; //inet_ntoa(addr);
LOG_A(ENB_SS, "Tx UDP_INIT IP addr %s (%x)\n", UDP_INIT(message_p).address, UDP_INIT(message_p).port); LOG_A(ENB_SS, "Tx UDP_INIT IP addr %s (%x)\n", UDP_INIT(message_p).address, UDP_INIT(message_p).port);
MSC_LOG_EVENT(
MSC_GTPU_ENB,
"0 UDP bind %s:%u",
UDP_INIT(message_p).address,
UDP_INIT(message_p).port);
return itti_send_msg_to_task(TASK_UDP, 0, message_p); return itti_send_msg_to_task(TASK_UDP, 0, message_p);
} }
......
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
#include "ss_gNB_proxy_iface.h" #include "ss_gNB_proxy_iface.h"
#include "SIDL_VIRTUAL_TIME_PORT.h" #include "SIDL_VIRTUAL_TIME_PORT.h"
#include "acpSysVT.h" #include "acpSysVT.h"
#define MSC_INTERFACE
#include "msc.h"
extern SSConfigContext_t SS_context; extern SSConfigContext_t SS_context;
extern RAN_CONTEXT_t RC; extern RAN_CONTEXT_t RC;
...@@ -115,11 +113,6 @@ static int vtp_send_init_udp(const vtp_udpSockReq_t *req) ...@@ -115,11 +113,6 @@ static int vtp_send_init_udp(const vtp_udpSockReq_t *req)
//addr.s_addr = req->ss_ip_addr; //addr.s_addr = req->ss_ip_addr;
UDP_INIT(message_p).address = req->address; //inet_ntoa(addr); UDP_INIT(message_p).address = req->address; //inet_ntoa(addr);
LOG_A(GNB_APP, "Tx UDP_INIT IP addr %s (%x)\n", UDP_INIT(message_p).address, UDP_INIT(message_p).port); LOG_A(GNB_APP, "Tx UDP_INIT IP addr %s (%x)\n", UDP_INIT(message_p).address, UDP_INIT(message_p).port);
MSC_LOG_EVENT(
MSC_GTPU_ENB,
"0 UDP bind %s:%u",
UDP_INIT(message_p).address,
UDP_INIT(message_p).port);
return itti_send_msg_to_task(TASK_UDP, 0, message_p); return itti_send_msg_to_task(TASK_UDP, 0, message_p);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
......
...@@ -44,9 +44,6 @@ ...@@ -44,9 +44,6 @@
#include "common/utils/LOG/log.h" #include "common/utils/LOG/log.h"
#include "common/utils/LOG/vcd_signal_dumper.h" #include "common/utils/LOG/vcd_signal_dumper.h"
#define MSC_INTERFACE
#include "msc.h"
#define IPV4_ADDR "%u.%u.%u.%u" #define IPV4_ADDR "%u.%u.%u.%u"
#define IPV4_ADDR_FORMAT(aDDRESS) \ #define IPV4_ADDR_FORMAT(aDDRESS) \
...@@ -307,7 +304,6 @@ void *udp_eNB_task(void *args_p) ...@@ -307,7 +304,6 @@ void *udp_eNB_task(void *args_p)
udp_enb_init(); udp_enb_init();
itti_mark_task_ready(TASK_UDP); itti_mark_task_ready(TASK_UDP);
MSC_START_USE();
LOG_I(UDP_, " Entry in %s\n", __FUNCTION__); LOG_I(UDP_, " Entry in %s\n", __FUNCTION__);
while(1) { while(1) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment