Modiefied CMakeLists, Compilation Warning solved, No more modification of...

Modiefied CMakeLists, Compilation Warning solved, No more modification of CMakeCache required. New Instructions to build

CMakeLists.txt

@@ -159,9 +159,11 @@ set (OPENAIR_TARGETS ${OPENAIR_DIR}/targets)
 set (OPENAIR3_DIR    ${OPENAIR_DIR}/openair3)
 set (OPENAIR_CMAKE   ${OPENAIR_DIR}/cmake_targets)
 set (OPENAIR_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
-set (XRAN_DIR ${OPENAIR_DIR}/targets/ARCH/ORAN_FHI/lib)
-set (XRAN_LIB /usr/local/xran)
-set (ICC_LIB /usr/local/intel64)
+set (XRAN_DIR        ${OPENAIR_DIR}/targets/ARCH/ORAN_FHI/lib)
+set (XRAN_LIB_DIR /usr/local/xran)
+set (INTEL_LIB_DIR /usr/local/intel64)
+set (INTEL_LIB /usr/local/intel64)
+set (DPDK_DIR /usr/local/dpdk_19_11/include/dpdk)
 
 project (OpenAirInterface)
 
@@ -629,8 +631,8 @@ target_link_libraries(benetel_4g PRIVATE asn1_nr_rrc asn1_lte_rrc)
 ######################################################################
 
 include_directories("${XRAN_DIR}")
-include_directories ("/usr/local/dpdk_19_11")
-include_directories("${ICC_LIB}")
+include_directories("${DPDK_DIR}")
+include_directories("${INTEL_LIB}")
 
 set(ORAN_FHLIB_4G_SOURCE
     ${OPENAIR_TARGETS}/ARCH/ETHERNET/oran/4g/oran.cpp
@@ -645,8 +647,8 @@ set_target_properties(oran_fhlib_4g PROPERTIES COMPILE_FLAGS "-fvisibility=hidde
 
 SET(DPDK_LIBS "-Wl,-rpath,$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -Wl,--whole-archive -L$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -ldpdk -Wl,--no-whole-archive")
 TARGET_LINK_LIBRARIES(oran_fhlib_4g ${DPDK_LIBS})
-TARGET_LINK_LIBRARIES(oran_fhlib_4g -L${XRAN_LIB} -lxran)
-TARGET_LINK_LIBRARIES(oran_fhlib_4g -L${ICC_LIB} -lirc)
+TARGET_LINK_LIBRARIES(oran_fhlib_4g -L${XRAN_LIB_DIR} -lxran)
+TARGET_LINK_LIBRARIES(oran_fhlib_4g -L${INTEL_LIB} -lirc)
 TARGET_LINK_LIBRARIES(oran_fhlib_4g pthread dl rt m numa)
 
 # Benetel 5G library
@@ -672,8 +674,9 @@ target_link_libraries(benetel_5g PRIVATE asn1_nr_rrc asn1_lte_rrc)
 ######################################################################
 
 include_directories("${XRAN_DIR}")
-include_directories ("/usr/local/dpdk_19_11/include/dpdk")
-include_directories("${ICC_LIB}")
+include_directories("${DPDK_DIR}")
+include_directories("${INTEL_LIB_DIR}")
+include_directories("${XRAN_LIB_DIR}")
 
 set(ORAN_FHLIB_5G_SOURCE
     ${OPENAIR_TARGETS}/ARCH/ETHERNET/oran/5g/oran.cpp
@@ -682,12 +685,17 @@ set(ORAN_FHLIB_5G_SOURCE
     )
 add_library(oran_fhlib_5g MODULE ${ORAN_FHLIB_5G_SOURCE})
 
+find_library(XRANFHI xran HINTS ${XRAN_LIB_DIR})
+find_library(INTELIRC irc HINTS ${INTEL_LIB_DIR})
+
 set_target_properties(oran_fhlib_5g PROPERTIES COMPILE_FLAGS "-fvisibility=hidden -march=native -I$ENV{RTE_SDK}/$ENV{RTE_TARGET}/include")
 
 SET(DPDK_LIBS "-Wl,-rpath,$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -Wl,--whole-archive -L$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -ldpdk -Wl,--no-whole-archive")
 TARGET_LINK_LIBRARIES(oran_fhlib_5g ${DPDK_LIBS})
-TARGET_LINK_LIBRARIES(oran_fhlib_5g -L${XRAN_LIB} -lxran)
-TARGET_LINK_LIBRARIES(oran_fhlib_5g -L${ICC_LIB} -lirc)
+#TARGET_LINK_LIBRARIES(oran_fhlib_5g -L${XRAN_LIB_DIR} -lxran)
+TARGET_LINK_LIBRARIES(oran_fhlib_5g ${XRANFHI})
+#TARGET_LINK_LIBRARIES(oran_fhlib_5g -L${INTEL_LIB} -lirc)
+TARGET_LINK_LIBRARIES(oran_fhlib_5g ${INTELIRC})
 TARGET_LINK_LIBRARIES(oran_fhlib_5g pthread dl rt m numa)
 
 ##########################################################

targets/ARCH/ETHERNET/oran/5g/oran_isolate.c

@@ -291,6 +291,9 @@ void oran_fh_if4p5_south_in(RU_t *ru,
 
   int ret = xran_fh_rx_read_slot(s->oran_priv, &ru_info, *frame, *slot);  
 
+  if (ret != 0){
+     printf("ORAN: ORAN_fh_if4p5_south_in ERROR in RX function \n");
+  }
 #if 0
   for (antenna = 0; antenna < ru->nb_rx; antenna++) {
     for (symbol = 0; symbol < 14; symbol++) {
@@ -394,6 +397,9 @@ for(int hhh=0; hhh<(14); hhh++ ){
 #endif
 
   int ret = xran_fh_tx_send_slot(s->oran_priv, &ru_info, frame, slot, timestamp);
+  if (ret != 0){
+     printf("ORAN: ORAN_fh_if4p5_south_out ERROR in TX function \n");
+  }
 
 #if 0
   if(frame==0 && slot<100){

targets/ARCH/ETHERNET/oran/5g/oran_isolate.h

@@ -57,6 +57,16 @@ void* define_oran_pointer();
 #endif
 
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+void dump_oran_config( void *xranlib_ );
+#ifdef __cplusplus
+}
+#endif
+
+
 #ifdef __cplusplus
 extern "C"
 {

targets/ARCH/ETHERNET/oran/5g/xran_lib_wrap.hpp

@@ -96,16 +96,17 @@ public:
 
 
 protected:
-    char argv[25] = "unittest";
+    char argv[25] = {'u','n','i','t','t','e','s','t','\0'};
+    //char argv[25] = "unittest";
 
     std::string m_dpdk_dev_up, m_dpdk_dev_cp, m_dpdk_bbdev;
 
     void *m_xranhandle;
 
-    uint8_t m_du_mac[6] = { 0x00,0x11, 0x22, 0x33, 0x44, 0x55 }; // Sofia: this is hard coded here and then it is read from the conf file
-    uint8_t m_ru_mac[6] = { 0x00,0x11, 0x22, 0x33, 0x44, 0x66 }; // Sofia: this is hard coded here and then it is read from the conf file
+    uint8_t m_du_mac[6]; // = { 0x00,0x11, 0x22, 0x33, 0x44, 0x55 }; // Sofia: this is hard coded here and then it is read from the conf file
+    uint8_t m_ru_mac[6]; //= { 0x00,0x11, 0x22, 0x33, 0x44, 0x66 }; // Sofia: this is hard coded here and then it is read from the conf file
     bool m_bSub6;
-    uint32_t m_nSlots = 20;
+    uint32_t m_nSlots; // = 20;
 
     struct xran_fh_config   m_xranConf;
     struct xran_fh_init     m_xranInit;
@@ -232,17 +233,17 @@ public:
 
     int get_duplextype();
 
-    int get_num_cc();
+    uint32_t get_num_cc();
 
-    int get_num_eaxc();
+    uint32_t get_num_eaxc();
 
-    int get_num_eaxc_ul();
+    uint32_t get_num_eaxc_ul();
 
-    int get_num_dlrbs();
+    uint32_t get_num_dlrbs();
 
-    int get_num_ulrbs();
+    uint32_t get_num_ulrbs();
 
-    int get_num_antelmtrx();
+    uint32_t get_num_antelmtrx();
 
     bool is_cpenable();