From 5dfdec6c259d1c7cca4ba319cf7da072025bd04f Mon Sep 17 00:00:00 2001
From: Wilson Thong <wilsonthong@astri.org>
Date: Tue, 28 Mar 2017 10:11:43 +0800
Subject: [PATCH 1/3] #219 add minimum support for running and building UE and
 eNB

---
 cmake_targets/build_ue           |  5 +++++
 cmake_targets/tools/build_helper |  8 +++++++-
 cmake_targets/tools/init_nas_s1  |  8 ++++----
 cmake_targets/tools/run_ue_s1    | 33 ++++++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 cmake_targets/build_ue
 create mode 100644 cmake_targets/tools/run_ue_s1

diff --git a/cmake_targets/build_ue b/cmake_targets/build_ue
new file mode 100644
index 0000000000..76b1c96315
--- /dev/null
+++ b/cmake_targets/build_ue
@@ -0,0 +1,5 @@
+#!/bin/bash
+#sudo ./build_oai -c -C -I --install-optional-packages --install-system-files --UE -w USRP -V 
+#sudo ./build_oai -c -C -I --install-optional-packages --UE -w USRP -V 
+#sudo ./build_oai -c -C --UE -w USRP -V
+sudo ./build_oai -c -C --UE -w USRP
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index ede8ef4196..e3bd2e0782 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -164,7 +164,13 @@ compilations() {
   } > $dlog/$2.$REL.txt 2>&1
   set -e
   echo_info "Log file for compilation has been written to: $dlog/$2.$REL.txt"
-  if [ -s $3 ] ; then
+
+echo "#!/bash/bin" > domake_$2.sh
+  echo "$SUDO make -j`nproc` $2" >> domake_$2.sh
+  echo "$SUDO cp $3 $4" >> domake_$2.sh
+  chmod 775 domake_$2.sh  
+
+if [ -s $3 ] ; then
      cp $3 $4
      echo_success "$2 compiled"
      check_warnings "$dlog/$2.$REL.txt"
diff --git a/cmake_targets/tools/init_nas_s1 b/cmake_targets/tools/init_nas_s1
index 5f27c52837..003a3ae600 100644
--- a/cmake_targets/tools/init_nas_s1
+++ b/cmake_targets/tools/init_nas_s1
@@ -33,7 +33,7 @@
 #
 #######################################
 
-LTEIF=oip0
+LTEIF=oip1
 #OPENAIR_DIR=/home/oai/svn-oai/openair4G
 
 load_module() {
@@ -48,11 +48,11 @@ load_module() {
   sudo insmod $1
 }
 
-load_module $OPENAIR_DIR/targets/bin/ue_ip.ko
+load_module ../../targets/bin/ue_ip.ko
 
 if [ "$1" = "UE" ]; then
-  echo "bring up oip0 interface for UE"
-  ifconfig oip0 up
+  echo "bring up $LTEIF interface for UE"
+  ifconfig $LTEIF up
 fi
 
 ip route flush cache
diff --git a/cmake_targets/tools/run_ue_s1 b/cmake_targets/tools/run_ue_s1
new file mode 100644
index 0000000000..56b18d72b9
--- /dev/null
+++ b/cmake_targets/tools/run_ue_s1
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Carrier frequency in Hz
+#FREQ=2660000000 #FDD
+FREQ=2350000000 #TDD
+NRB=50
+TA=0
+
+#9:trace, 8/7:debug, 6:info, 4:warn, 3:error
+LOGLEVEL=6
+
+#enable or disable soft scope
+#SCOPE=''
+SCOPE='-d'
+
+#enable or disable VCD logging
+VCD=''
+#VCD='-V'
+
+ISTDD='-T'
+#ISTDD=''
+
+#use external clock
+ECLK="--external-clock"
+#ECLK=""
+
+#UE scan carrier
+#ISSCAN="--ue-scan-carrier"
+ISSCAN=""
+
+sudo sh -c './init_nas_s1 UE'
+cd ../../targets/bin/ 
+sudo -E ./lte-softmodem.Rel10 -U -C$FREQ -r$NRB $ISSCAN --ue-txgain 70 --ue-rxgain 80 -A $TA $ECLK -W $ISTDD -g $LOGLEVEL $SCOPE 2>&1 | sudo tee /tmp/UE.log 

From e6798f5b9638c8e75e0bc426d4bceb372e49da77 Mon Sep 17 00:00:00 2001
From: Wilson Thong <wilsonthong@astri.org>
Date: Tue, 28 Mar 2017 10:11:43 +0800
Subject: [PATCH 2/3] #219 add build option for building eclipse project files

---
 cmake_targets/build_oai | 33 +++++++++++++++++++++++----------
 cmake_targets/build_ue  |  1 +
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 119c013832..4f9b154700 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -55,6 +55,8 @@ T_TRACER="False"
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE=""
 UE_AUTOTEST_TRACE="False"
+BUILD_ECLIPSE=0
+CMAKE_CMD='cmake'
 trap handle_ctrl_c INT
 
 gen_nvram_path=$OPENAIR_DIR/targets/bin
@@ -141,6 +143,8 @@ Options
    Disable HW dependency during installation
 --ue-autotest-trace
     Enable specific traces for UE autotest framework
+--build-eclipse
+   Build eclipse project files. Paths are auto corrected by fixprj.sh
 Usage (first build):
  oaisim (eNB + UE): ./build_oai -I  --oaisim -x --install-system-files
  Eurecom EXMIMO + COTS UE : ./build_oai -I  --eNB -x --install-system-files
@@ -179,6 +183,7 @@ function main() {
             GDB=1
             CMAKE_BUILD_TYPE="Debug"
             echo_info "Will Compile with gdb symbols and disable compiler optimization"
+            CMAKE_CMD="$CMAKE_CMD -DCMAKE_BUILD_TYPE=Debug"
             shift;;
        --eNB)
             eNB=1
@@ -311,6 +316,11 @@ function main() {
             UHD_IMAGES_DIR=$2
             echo_info "Downloading UHD images in the indicated location"
             shift 2;;
+       --build-eclipse)
+            BUILD_ECLIPSE=1
+            CMAKE_CMD="$CMAKE_CMD"' -DCMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT=TRUE -G"Eclipse CDT4 - Unix Makefiles"'
+            echo_info "Enabling build eclipse project support"
+            shift 1;;			
         -h | --help)
             print_help
             exit 1;;
@@ -321,6 +331,9 @@ function main() {
    esac
   done
   
+  CMAKE_CMD="$CMAKE_CMD .."
+  echo_info "CMAKE_CMD=$CMAKE_CMD"
+  
   #########################################################
   # check validity of HW and TP parameters for RRH and eNB
   #########################################################
@@ -495,7 +508,7 @@ function main() {
     fi
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
     cd  $DIR/$lte_build_dir/build
-    cmake ..
+    eval $CMAKE_CMD
   fi
 
   if [ "$eNB" = "1" -o "$UE" = "1" ] ; then
@@ -524,7 +537,7 @@ function main() {
 
 #    mkdir -p $DIR/at_commands/build
 #    cd $DIR/at_commands/build
-#    cmake ..
+#    eval $CMAKE_CMD
 #    compilations \
 #      at_commands at_nas_ue \
 #      at_nas_ue $dbin/at_nas_ue
@@ -533,7 +546,7 @@ function main() {
     mkdir -p $DIR/nas_sim_tools/build
     cd $DIR/nas_sim_tools/build
     
-    cmake ..
+    eval $CMAKE_CMD
     compilations \
       nas_sim_tools usim \
       usim $dbin/usim
@@ -562,7 +575,7 @@ function main() {
     mkdir -p build
     cd build
     rm -f *sim
-    cmake ..
+    eval $CMAKE_CMD
   fi
 
   if [ "$SIMUS_PHY" = "1" ] ; then
@@ -640,7 +653,7 @@ function main() {
     [ "$CLEAN" = "1" ] && rm -rf $DIR/$oaisim_build_dir/build
     mkdir -p $DIR/$oaisim_build_dir/build
     cd $DIR/$oaisim_build_dir/build
-    cmake ..
+    eval $CMAKE_CMD
     compilations \
 	  $oaisim_build_dir $oaisim_exec \
 	  $oaisim_exec $dbin/$oaisim_exec.$REL
@@ -651,7 +664,7 @@ function main() {
     	echo_info "Compiling at_nas_ue"
 	mkdir -p $DIR/at_commands/build
 	cd $DIR/at_commands/build
-	cmake ..
+	eval $CMAKE_CMD
 	compilations \
 	    at_commands at_nas_ue \
 	    at_nas_ue $dbin/at_nas_ue
@@ -665,7 +678,7 @@ function main() {
 	[ "$CLEAN" = "1" ] && rm -rf $DIR/nas_sim_tools/build
 	mkdir -p $DIR/nas_sim_tools/build
 	cd $DIR/nas_sim_tools/build
-	cmake ..
+	eval $CMAKE_CMD
 	compilations \
 	    nas_sim_tools usim \
 	    usim $dbin/usim
@@ -722,7 +735,7 @@ function main() {
     #[ "$CLEAN" = "1" ] && rm -rf $DIR/oaisim_mme_build_oai/build
     #mkdir -p $DIR/oaisim_mme_build_oai/build
     #cd $DIR/oaisim_mme_build_oai/build
-    #cmake ..
+    #eval $CMAKE_CMD
     #compilations \
 	#  oaisim_mme_build_oai oaisim_mme \
 	#  oaisim_mme $dbin/oaisim_mme.$REL
@@ -752,7 +765,7 @@ function main() {
      echo "set ( T_TRACER $T_TRACER )"            >>  $cmake_file
      echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file    
      cd $DIR/$rrh_build_dir/build
-     cmake ..
+     eval $CMAKE_CMD
      compilations \
 	 rrh_gw rrh_gw \
 	 rrh_gw $dbin/rrh_gw
@@ -847,7 +860,7 @@ fi
     [ "$CLEAN" = "1" ] && rm -rf $OPENAIR_DIR/cmake_targets/doxygen/build
     mkdir -p $OPENAIR_DIR/cmake_targets/doxygen/build
     cd $OPENAIR_DIR/cmake_targets/doxygen/build
-    cmake ..
+    eval $CMAKE_CMD
     make doc
     ) >& $doxygen_log
   fi
diff --git a/cmake_targets/build_ue b/cmake_targets/build_ue
index 76b1c96315..9d9ca839d1 100644
--- a/cmake_targets/build_ue
+++ b/cmake_targets/build_ue
@@ -3,3 +3,4 @@
 #sudo ./build_oai -c -C -I --install-optional-packages --UE -w USRP -V 
 #sudo ./build_oai -c -C --UE -w USRP -V
 sudo ./build_oai -c -C --UE -w USRP
+#sudo ./build_oai -c -C --UE -w USRP --build-eclipse

From 9a464ca077de3f8fa5033f82576f94a5e3ca1370 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Tue, 28 Mar 2017 10:13:54 +0200
Subject: [PATCH 3/3] fix: remove change in build_helper

---
 cmake_targets/tools/build_helper | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index e3bd2e0782..ede8ef4196 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -164,13 +164,7 @@ compilations() {
   } > $dlog/$2.$REL.txt 2>&1
   set -e
   echo_info "Log file for compilation has been written to: $dlog/$2.$REL.txt"
-
-echo "#!/bash/bin" > domake_$2.sh
-  echo "$SUDO make -j`nproc` $2" >> domake_$2.sh
-  echo "$SUDO cp $3 $4" >> domake_$2.sh
-  chmod 775 domake_$2.sh  
-
-if [ -s $3 ] ; then
+  if [ -s $3 ] ; then
      cp $3 $4
      echo_success "$2 compiled"
      check_warnings "$dlog/$2.$REL.txt"