fix noS1 compil problem

cmake_targets/CMakeLists.txt

@@ -614,6 +614,7 @@ add_boolean_option(NAS_NETLINK False "useless ??? Must be True to compile nasmes
 add_boolean_option(OAI_NW_DRIVER_USE_NETLINK True "????")
 
 add_boolean_option(USE_MME False "this flag is used only one time in lte-softmodem.c")
+add_list_string_option(PACKAGE_NAME "NotDefined" "As per attribute name")
 add_boolean_option(MESSAGE_CHART_GENERATOR False         "For generating sequence diagrams")
 add_boolean_option(MESSAGE_CHART_GENERATOR_RLC_MAC False "trace RLC-MAC exchanges in sequence diagrams")
 add_boolean_option(MESSAGE_CHART_GENERATOR_PHY     False "trace some PHY exchanges in sequence diagrams")
@@ -623,6 +624,11 @@ add_boolean_option(PHY_TX_THREAD            False         "enable UE_EXPANSION w
 add_boolean_option(PRE_SCD_THREAD           False         "enable UE_EXPANSION with max 256 UE")
 add_boolean_option(UESIM_EXPANSION          False         "enable UESIM_EXPANSION with max 256 UE")
 
+########################
+# Include order
+##########################
+add_boolean_option(ENB_MODE True "Swap the include directories between openair2 and openair3" )
+
 ##########################
 # SCHEDULING/REAL-TIME/PERF options
 ##########################
@@ -723,13 +729,19 @@ include_directories("${OPENAIR_BIN_DIR}")
 #include_directories("${include_dirs_all}")
 
 # Legacy exact order
-
-include_directories("${OPENAIR2_DIR}/COMMON")
-include_directories("${OPENAIR2_DIR}/UTIL")
-include_directories("${OPENAIR2_DIR}/UTIL/LOG")
-include_directories("${OPENAIR3_DIR}/COMMON")
-include_directories("${OPENAIR3_DIR}/UTILS")
-
+if(ENB_MODE)
+  include_directories("${OPENAIR2_DIR}/COMMON")
+  include_directories("${OPENAIR2_DIR}/UTIL")
+  include_directories("${OPENAIR2_DIR}/UTIL/LOG")
+  include_directories("${OPENAIR3_DIR}/COMMON")
+  include_directories("${OPENAIR3_DIR}/UTILS")
+else()
+  include_directories("${OPENAIR3_DIR}/COMMON")
+  include_directories("${OPENAIR3_DIR}/UTILS")
+  include_directories("${OPENAIR2_DIR}/COMMON")
+  include_directories("${OPENAIR2_DIR}/UTIL")
+  include_directories("${OPENAIR2_DIR}/UTIL/LOG")
+endif()
 include_directories("${NFAPI_DIR}/nfapi/public_inc")
 include_directories("${NFAPI_DIR}/common/public_inc")
 include_directories("${NFAPI_DIR}/pnf/public_inc")
@@ -1383,10 +1395,6 @@ add_library(L2_UE
   ${L2_SRC_UE}
   ${MAC_SRC_UE}
 )
-
-if (NOT ${NOS1})
-target_compile_definitions(L2_UE PUBLIC )
-endif()
 add_dependencies(L2_UE rrc_flag s1ap_flag x2_flag)
 
 include_directories(${NFAPI_USER_DIR})
@@ -1674,9 +1682,6 @@ if(NAS_UE)
     ${libnas_ue_esm_sap_OBJS}
   )
   add_dependencies(LIB_NAS_UE rrc_flag)
-  if (NOT ${NOS1})
-  target_compile_definitions(LIB_NAS_UE PUBLIC )
-  endif()
   set(NAS_UE_LIB LIB_NAS_UE)
 
   include_directories(${NAS_SRC}UE)
@@ -2048,9 +2053,6 @@ add_executable(lte-uesoftmodem
   )
 
 add_dependencies(lte-uesoftmodem rrc_flag s1ap_flag x2_flag)
-if (NOT ${NOS1})
-	target_compile_definitions(lte-uesoftmodem PRIVATE )
-endif()
 target_link_libraries (lte-uesoftmodem
   -Wl,--start-group
   RRC_LIB S1AP_LIB S1AP_ENB X2AP_LIB X2AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON PHY_UE PHY_RU LFDS L2_UE SIMU
@@ -2149,7 +2151,6 @@ foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim pr
 
   add_executable(${myExe}
     ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
-    ${OPENAIR_DIR}/common/utils/backtrace.c
     ${XFORMS_SOURCE}
     ${T_SOURCE}
     ${CONFIG_SOURCES}
@@ -2287,7 +2288,7 @@ endfunction(make_driver name dir src)
 # nashmesh module
 ################
 list(APPEND nasmesh_src device.c common.c ioctl.c classifier.c tool.c mesh.c)
-set(module_cc_opt "${module_cc_opt} -DNAS_NETLINK -DPDCP_USE_NETLINK -D${MKVER}")
+set(module_cc_opt "${module_cc_opt} -DNAS_NETLINK -DPDCP_USE_NETLINK")
 # legacy Makefile was using NAS_NETLINK flag, but other drivers the hereafter flag
 # so, this cmake use OAI_NW_DRIVER_USE_NETLINK everywhere
 if (OAI_NW_DRIVER_USE_NETLINK)

cmake_targets/build_oai

@@ -46,12 +46,13 @@ UE_EXPANSION="False"
 UESIM_EXPANSION="False"
 PRINT_STATS="False"
 VCD_TIMING="False"
-DEADLINE_SCHEDULER_FLAG_USER=""
+DEADLINE_SCHEDULER_FLAG_USER="False"
+FORCE_DEADLINE_SCHEDULER_FLAG_USER=""
 CPU_AFFINITY_FLAG_USER="False" #Only valid when lowlatecy flag is set to False
 REL="Rel14"
 HW="None"
 TP="None"
-NOS1="False"
+NOS1=0
 EPC=0
 VERBOSE_COMPILE=0
 CFLAGS_PROCESSOR_USER=""
@@ -292,7 +293,7 @@ function main() {
             echo_info "Will copy OpenAirInterface files in Linux directories"
             shift;;
        --noS1)
-                NOS1="True"
+	    NOS1=1
             echo_info "Will compile without S1 interface"
             shift;;
        --verbose-compile)
@@ -308,11 +309,11 @@ function main() {
             echo_info "Will build doxygen support"
             shift;;     
        --disable-deadline)
-                DEADLINE_SCHEDULER_FLAG_USER="False"
+            FORCE_DEADLINE_SCHEDULER_FLAG_USER="False"
             echo_info "Disabling the usage of deadline scheduler"
             shift 1;;
        --enable-deadline)
-                DEADLINE_SCHEDULER_FLAG_USER="True"
+            FORCE_DEADLINE_SCHEDULER_FLAG_USER="True"
             echo_info "Enabling the usage of deadline scheduler"
             shift 1;;
        --disable-cpu-affinity)
@@ -385,6 +386,7 @@ function main() {
             break;;
    esac
   done
+  
   CMAKE_CMD="$CMAKE_CMD .."
   echo_info "CMAKE_CMD=$CMAKE_CMD"
     #########################################################
@@ -416,7 +418,6 @@ function main() {
               ;;
       esac
     fi
-    
   #Disable CPU Affinity for deadline scheduler
   if [ "$DEADLINE_SCHEDULER_FLAG_USER" = "True" ] ; then 
      CPU_AFFINITY_FLAG_USER="False"
@@ -491,13 +492,17 @@ function main() {
     echo_info "Installing optional packages"
     check_install_additional_tools
   fi
+
+  
+  
   echo_info "3. building the compilation directives ..."
+
     DIR=$OPENAIR_DIR/cmake_targets
     
     if [ "$T_TRACER" =  "False" ] ; then
         noLOGDirsuffix="_noLOG"
     fi
-    if [ "$NOS1" =  "True" ] ; then
+    if [ "$NOS1" =  "1" ] ; then
         noS1Dir="_noS1"
         bin_suffix="-nos1"
     else
@@ -506,8 +511,7 @@ function main() {
     fi
 
     lte_build_dir="lte${noS1Dir}_build_oai${noLOGDirsuffix}"
-    
-    # configuration module libraries, one currently available, using libconfig 
+# configuration module libraries, one currently available, using libconfig 
   config_libconfig_shlib=params_libconfig
   
   # first generate the CMakefile in the right directory
@@ -517,21 +521,22 @@ function main() {
     [ "$CLEAN" = "1" ] && rm -rf $DIR/$lte_build_dir/build
     mkdir -p $DIR/$lte_build_dir/build
     cmake_file=$DIR/$lte_build_dir/CMakeLists.txt
-        echo "cmake_minimum_required(VERSION 3.0)"   >  $cmake_file
-        if [ "$NOS1" = "True" ] ; then
-            cat  $DIR/$lte_build_dir/CMakeLists.template >>  $cmake_file
-        fi
+    echo "cmake_minimum_required(VERSION 2.8)"   >  $cmake_file
+#    if [ "$NOS1" = "1" ] ; then
+#	cat  $DIR/$lte_build_dir/CMakeLists.template >>  $cmake_file
+#    fi
     echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
     echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >>  $cmake_file
+    echo "set ( XFORMS $XFORMS )"                  >>  $cmake_file
     echo "set ( UE_EXPANSION $UE_EXPANSION )"      >>  $cmake_file
-	#    echo "set ( PHY_TX_THREAD $UE_EXPANSION )"     >>  $cmake_file
+#    echo "set ( PHY_TX_THREAD $UE_EXPANSION )"     >>  $cmake_file
     echo "set ( PRE_SCD_THREAD $UE_EXPANSION )"    >>  $cmake_file
     echo "set ( UESIM_EXPANSION $UESIM_EXPANSION )"      >>  $cmake_file
     echo "set ( RRC_ASN1_VERSION \"${REL}\")"      >>  $cmake_file
     echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )"     >>  $cmake_file
-	echo "set ( XFORMS $XFORMS )"                  >>  $cmake_file
     echo "set ( RF_BOARD \"${HW}\")"               >>  $cmake_file
     echo "set ( TRANSP_PRO \"${TP}\")"             >>  $cmake_file
+    echo "set(PACKAGE_NAME \"${lte_exec}\")"       >>  $cmake_file
     echo "set (DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )"    >>$cmake_file
     echo "set (CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )"      >>$cmake_file
     echo "set ( T_TRACER $T_TRACER )"              >>  $cmake_file
@@ -553,7 +558,7 @@ function main() {
 	  $lte_build_dir $lte_exec \
 	  $lte_exec $dbin/$lte_exec.$REL
 
-        # mandatory shared lib
+# mandatory shared lib
     compilations \
 	  $lte_build_dir $config_libconfig_shlib \
 	  lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
@@ -561,7 +566,7 @@ function main() {
           $lte_build_dir coding \
           libcoding.so $dbin/libcoding.so
 	  
-        if [ "$NOS1" = "True" ] ; then
+    if [ "$NOS1" = "1" ] ; then
 	compilations \
 	    $lte_build_dir nasmesh \
 	    CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
@@ -572,7 +577,7 @@ function main() {
     fi
   fi
 
-    if [ "$UE" = "1" ] ; then
+  if [ "$UE" = 1  ] ; then
         lte_exec=lte-uesoftmodem${bin_suffix}
         compilations \
             $lte_build_dir $lte_exec \
@@ -586,7 +591,7 @@ function main() {
             $lte_build_dir coding \
             libcoding.so $dbin/libcoding.so
         
-        if [ "$NOS1" = "True" ] ; then
+        if [ "$NOS1" = "0" ] ; then
             compilations \
                 $lte_build_dir nasmesh \
                 CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
@@ -597,18 +602,16 @@ function main() {
         else        
     # ue_ip driver compilation
     echo_info "Compiling UE specific part"
-            if [ "$UE_NAS_USE_TUN" = "False" ] ; then 
     compilations \
       $lte_build_dir ue_ip \
       CMakeFiles/ue_ip/ue_ip.ko $dbin/ue_ip.ko
-            fi
 
-            #    mkdir -p $DIR/at_commands/build
-            #    cd $DIR/at_commands/build
-            #    eval $CMAKE_CMD
-            #    compilations \
-                #      at_commands at_nas_ue \
-                #      at_nas_ue $dbin/at_nas_ue
+#    mkdir -p $DIR/at_commands/build
+#    cd $DIR/at_commands/build
+#    eval $CMAKE_CMD
+#    compilations \
+#      at_commands at_nas_ue \
+#      at_nas_ue $dbin/at_nas_ue
     
     [ "$CLEAN" = "1" ] && rm -rf $DIR/nas_sim_tools/build
     mkdir -p $DIR/nas_sim_tools/build
@@ -661,9 +664,9 @@ function main() {
     compilations \
           lte-simulators coding \
           libcoding.so $dbin/libcoding.so
-        #    compilations \
-            #     lte-simulators $config_libconfig_shlib \
-            #     lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
+#    compilations \
+#	  lte-simulators $config_libconfig_shlib \
+#	  lib$config_libconfig_shlib.so $dbin/lib$config_libconfig_shlib.so
   fi
 
   # Core simulators
@@ -800,8 +803,6 @@ function main() {
             librfsimulator.so $dbin/librfsimulator.so.$REL
     fi
 
-    
-    
   # Doxygen Support
   #####################
   if [ "$BUILD_DOXYGEN" = "1" ] ;then
@@ -858,7 +859,7 @@ function main() {
     # enb
 
     cmake_file=$OPENAIR_DIR/cmake_targets/basic_simulator/enb/CMakeLists.txt
-        echo "cmake_minimum_required(VERSION 3.0)"         >  $cmake_file
+    echo "cmake_minimum_required(VERSION 2.8)"         >  $cmake_file
     echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )"  >> $cmake_file
     echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >>  $cmake_file
     echo "set ( RRC_ASN1_VERSION \"${REL}\")"          >>  $cmake_file
@@ -911,7 +912,7 @@ function main() {
         conf2uedata $dbin/conf2uedata
 
     cmake_file=$OPENAIR_DIR/cmake_targets/basic_simulator/ue/CMakeLists.txt
-        echo "cmake_minimum_required(VERSION 3.0)"        >  $cmake_file
+    echo "cmake_minimum_required(VERSION 2.8)"        >  $cmake_file
     echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
     echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >>  $cmake_file
     echo "set ( RRC_ASN1_VERSION \"${REL}\")"         >>  $cmake_file
@@ -931,7 +932,7 @@ function main() {
     echo "set (LINUX True )"                          >>  $cmake_file
     echo "set (PDCP_USE_NETLINK True )"               >>  $cmake_file
     echo "set (BASIC_SIMULATOR \"True\" )"            >>  $cmake_file
-        echo "set (UE_NAS_USE_TUN \"True\" )"             >>  $cmake_file
+#    echo "set (UE_NAS_USE_TUN \"True\" )"             >>  $cmake_file
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeLists.txt)' >> $cmake_file
 
     echo_info "Build UE"

openair2/NETWORK_DRIVER/MESH/local.h

@@ -160,10 +160,8 @@ typedef struct pdcp_data_req_header_s {
   sdu_size_t          data_size;
   signed int          inst;
   ip_traffic_type_t   traffic_type;
-#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
   uint32_t sourceL2Id;
   uint32_t destinationL2Id;
-#endif
 } pdcp_data_req_header_t;
 
 typedef struct pdcp_data_ind_header_s {
@@ -171,10 +169,8 @@ typedef struct pdcp_data_ind_header_s {
   sdu_size_t          data_size;
   signed int          inst;
   ip_traffic_type_t   dummy_traffic_type;
-#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
   uint32_t sourceL2Id;
   uint32_t destinationL2Id;
-#endif
 } pdcp_data_ind_header_t;
 
 extern struct net_device *nasdev[NB_INSTANCES_MAX];