oaisim_build_oai is for playing with MME/S-GW as far as I understood,

So i built oaisim_noS1_build_oai  for not playing with MME/S-GW

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7142 818b1a75-f10b-46b9-bf7c-635c3b92a50f

cmake_targets/CMakeLists.txt

@@ -1589,17 +1589,25 @@ target_link_libraries (oai_sgw
 
 # USIM process
 #################
-add_executable(usim
+#add_executable(usim
-  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/tools/usim_data.c
+#  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/tools/usim_data.c
-  )
+#  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/src/api/usim/usim_api.c
-target_link_libraries (usim ${NAS_LIB} UTIL ${ITTI_LIB} LFDS pthread rt nettle crypto m)
+#  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/src/api/usim/aka_functions.c
+#  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/src/util/memory.c
+#  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/src/util/nas_log.c
+#  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/src/util/OctetString.c
+#  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/src/util/TLVEncoder.c
+#  )
+#target_link_libraries (usim ${NAS_LIB} UTIL ${ITTI_LIB} LFDS pthread rt nettle crypto m)
 
 # ???
 #####################
-add_executable(nvram 
+#add_executable(nvram
-  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/tools/ue_data.c
+#  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/tools/ue_data.c
-  )
+#  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/src/util/memory.c
-target_link_libraries (nvram ${NAS_LIB} UTIL ${ITTI_LIB} LFDS pthread rt nettle crypto m)
+#  ${OPENAIRCN_DIR}/NAS/EURECOM-NAS/src/util/nas_log.c
+#  )
+#target_link_libraries (nvram ${NAS_LIB} UTIL ${ITTI_LIB} LFDS pthread rt nettle crypto m)
 
 ###################################"
 # Addexecutables for tests
@@ -1638,6 +1646,40 @@ target_link_libraries (oaisim pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LI
 #Force link with forms, regardless XFORMS option
 target_link_libraries (oaisim forms)
 
+
+# A all in one network simulator
+################
+add_executable(oaisim_nos1
+  ${rrc_h}
+  ${s1ap_h}
+  ${OPENAIR_BIN_DIR}/messages_xml.h
+  ${OPENAIR_TARGETS}/SIMU/USER/channel_sim.c
+  ${OPENAIR_TARGETS}/SIMU/USER/init_lte.c
+  ${OPENAIR_TARGETS}/SIMU/USER/oaisim_config.c
+  ${OPENAIR_TARGETS}/SIMU/USER/sinr_sim.c
+  ${OPENAIR_TARGETS}/SIMU/USER/cor_SF_sim.c
+  ${OPENAIR_TARGETS}/SIMU/USER/oaisim_functions.c
+  ${OPENAIR_TARGETS}/SIMU/USER/event_handler.c
+  ${OPENAIR_TARGETS}/SIMU/USER/oaisim.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
+  ${OPENAIR2_DIR}/UTIL/OMG/sumo.c
+  ${OPENAIR_TARGETS}/COMMON/create_tasks.c
+  ${HW_SOURCE}
+  ${XFORMS_SOURCE}
+)
+target_include_directories(oaisim_nos1 PUBLIC  ${OPENAIR_TARGETS}/SIMU/USER)
+target_link_libraries (oaisim_nos1
+  -Wl,--start-group
+  RRC_LIB    SECU_CN UTIL HASHTABLE  UDP SCHED_LIB PHY LFDS L2 MSC ${RAL_LIB} ${NAS_LIB} SIMU SIMU_ETH SECU_OSA ${ITTI_LIB}  ${MIH_LIB}
+  -Wl,--end-group )
+target_link_libraries (oaisim_nos1 ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
+target_link_libraries (oaisim_nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES}  ${NETTLE_LIBRARIES}  ${option_HW_lib}
+  ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${OPENPGM_LIBRARIES})
+#Force link with forms, regardless XFORMS option
+target_link_libraries (oaisim_nos1 forms)
+
+
 # Unitary tests for each piece of L1: example, mbmssim is MBMS L1 simulator
 #####################################
 

cmake_targets/build_oai

@@ -263,12 +263,23 @@ function main() {
     compilations \
 	  lte_build_oai ue_ip \
 	  CMakeFiles/ue_ip/ue_ip.ko $dbin/ue_ip.ko
+
+    mkdir -p $DIR/nas_sim_tools/build
+    cd $DIR/nas_sim_tools/build
+    cmake ..
     compilations \
-	  lte_build_oai usim \
+      nas_sim_tools usim \
-	  usim $dbin/usim
+      usim $dbin/usim
     compilations \
-	  lte_build_oai nvram \
+      nas_sim_tools nvram \
-	  nvram $dbin/nvram
+      nvram $dbin/nvram
+
+    # generate USIM data
+    if [ -f $dbin/nvram ]; then
+      install_nas_tools $dbin $dconf
+    else
+      echo_warning "not generated UE NAS files: binaries not found"
+    fi
   fi
 
   if [ "$SIMUS_PHY" = "1" -o "$SIMUS_CORE" = "1" ] ; then
@@ -317,6 +328,8 @@ function main() {
   fi
 
   if [ "$oaisim" = "1" ] ; then
+    dconf=$OPENAIR_DIR/targets/bin
+
     echo_info "Compiling oaisim"
     cmake_file=$DIR/oaisim_build_oai/CMakeLists.txt
     cp $DIR/oaisim_build_oai/CMakeLists.template $cmake_file
@@ -328,17 +341,55 @@ function main() {
     cd $DIR/oaisim_build_oai/build
     cmake ..
     compilations \
-	oaisim_build_oai oaisim \
+	  oaisim_build_oai oaisim \
-	oaisim $dbin/oaisim.$REL
+	  oaisim $dbin/oaisim.$REL
+
+    # ue_ip driver compilation
+    echo_info "Compiling UE specific part (ue_ip driver and usim tools)"
+    compilations \
+	  oaisim_build_oai ue_ip \
+	  CMakeFiles/ue_ip/ue_ip.ko $dbin/ue_ip.ko
+
+    mkdir -p $DIR/nas_sim_tools/build
+    cd $DIR/nas_sim_tools/build
+    cmake ..
+    compilations \
+	  nas_sim_tools usim \
+	  usim $dbin/usim
+    compilations \
+	  nas_sim_tools nvram \
+	  nvram $dbin/nvram
+
+    # generate USIM data
+    if [ -f $dbin/nvram ]; then
+      install_nas_tools $dbin $dconf
+    else
+      echo_warning "not generated UE NAS files: binaries not found"
+    fi
+
+    echo_info "Compiling oaisim_nos1"
+    cmake_file=$DIR/oaisim_noS1_build_oai/CMakeLists.txt
+    cp $DIR/oaisim_noS1_build_oai/CMakeLists.template $cmake_file
+    echo "set(XFORMS $XFORMS )" >>  $cmake_file
+    echo "set(RRC_ASN1_VERSION \"${REL}\")" >>  $cmake_file
+    echo "set(ENABLE_VCD_FIFO $VCD_TIMING )" >>  $cmake_file
+    echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
+    mkdir -p $DIR/oaisim_noS1_build_oai/build
+    cd $DIR/oaisim_noS1_build_oai/build
+    cmake ..
+    compilations \
+	  oaisim_noS1_build_oai oaisim_nos1 \
+	  oaisim_nos1 $dbin/oaisim_nos1.$REL
 
     # nasmesh driver compilation
     compilations \
-	oaisim_build_oai nasmesh \
+	  oaisim_noS1_build_oai nasmesh \
-	CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
+	  CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
     #oai_nw_drv
     compilations \
-	oaisim_build_oai oai_nw_drv \
+	  oaisim_noS1_build_oai oai_nw_drv \
-	CMakeFiles/oai_nw_drv/oai_nw_drv.ko $dbin/oai_nw_drv.ko
+	  CMakeFiles/oai_nw_drv/oai_nw_drv.ko $dbin/oai_nw_drv.ko
+
     cmake_file=$DIR/oaisim_mme_build_oai/CMakeLists.txt
     cp $DIR/oaisim_mme_build_oai/CMakeLists.template $cmake_file
     echo "set(XFORMS $XFORMS )" >>  $cmake_file
@@ -349,8 +400,8 @@ function main() {
     cd $DIR/oaisim_mme_build_oai/build
     cmake ..
     compilations \
-	oaisim_mme_build_oai oaisim_mme \
+	  oaisim_mme_build_oai oaisim_mme \
-	oaisim_mme $dbin/oaisim_mme.$REL
+	  oaisim_mme $dbin/oaisim_mme.$REL
   fi
 
   # EPC compilation
@@ -405,18 +456,10 @@ function main() {
       echo_warning "not installed GTP-U iptables: binaries not found"
     fi
 
-    dconf=$OPENAIR_TARGETS/bin
+    dconf=$OPENAIR_DIR/targets/bin
     mkdir -p $dconf
     #cp $ORIGIN_PATH/$CONFIG_FILE $dconf || echo_error "config file $ORIGIN_PATH/$CONFIG_FILE not found"
 
-    # generate USIM data
-    if [ -f $dbin/nvram ]; then
-      install_nas_tools $dbin $dconf
-    else
-      echo_warning "not generated UE NAS files: binaries not found"
-    fi
-
-
     # Do EPC
     if [ -f $DIR/epc_build_oai/build/mme_fd.conf ] ; then
       cp $DIR/epc_build_oai/build/epc.*.conf $dconf

cmake_targets/oaisim_build_oai/CMakeLists.template

@@ -9,7 +9,7 @@ set (  DRIVER2013 True )
 set (  EMOS False )
 set (  ENABLE_FXP True )
 set (  ENABLE_ITTI True )
-set (  ENABLE_NAS_UE_LOGGING False )
+set (  ENABLE_NAS_UE_LOGGING True )
 set (  ENABLE_NEW_MULTICAST True )
 set (  ENABLE_PDCP_NETLINK_FIFO False )
 set (  ENABLE_PGM_TRANSPORT True )
@@ -17,7 +17,7 @@ set (  ENABLE_RAL False )
 set (  ENABLE_SECURITY True )
 set (  ENABLE_STANDALONE_EPC False)
 set (  ENABLE_USE_CPU_EXECUTION_TIME True )
-set (  ENABLE_USE_MME False )
+set (  ENABLE_USE_MME True )
 set (  ENABLE_USE_RAW_SOCKET_FOR_SGI True)
 set (  ENABLE_VCD_FIFO True )
 set (  ENB_MODE True )
@@ -25,7 +25,7 @@ set (  EXMIMO_IOT True )
 set (  HARD_RT False )
 set (  JUMBO_FRAME True )
 set (  LARGE_SCALE False )
-set (  LINK_ENB_PDCP_TO_GTPV1U False)
+set (  LINK_ENB_PDCP_TO_GTPV1U True)
 set (  LINUX_LIST False )
 set (  LINUX True )
 set (  LOCALIZATION False )
@@ -37,9 +37,9 @@ set (  MIH_C_MEDIEVAL_EXTENSIONS False )
 set (  MSG_PRINT False )
 set (  MU_RECEIVER False )
 set (  NAS_ADDRESS_FIX False )
-set (  NAS_BUILT_IN_UE False)
+set (  NAS_BUILT_IN_UE True)
 set (  NAS_MME False )
-set (  NAS_UE False )
+set (  NAS_UE True )
 set (  NB_ANTENNAS_RX "2" )
 set (  NB_ANTENNAS_TX "2" )
 set (  NB_ANTENNAS_TXRX "2" )
@@ -47,7 +47,7 @@ set (  NEW_FFT True )
 set (  NO_RRM True )
 set (  OAI_EMU True )
 set (  OAISIM True )
-set (  OAI_NW_DRIVER_TYPE_ETHERNET True )
+set (  OAI_NW_DRIVER_TYPE_ETHERNET False )
 set (  OAI_NW_DRIVER_USE_NETLINK True )
 set (  OPENAIR1 True )
 set (  OPENAIR2 True )