From 777005d213f1412da288880233eaac8aa7b88344 Mon Sep 17 00:00:00 2001
From: Navid Nikaein <navid.nikaein@eurecom.fr>
Date: Fri, 26 Sep 2014 12:47:39 +0000
Subject: [PATCH] few adjustments when RTAI=0
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5807 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
targets/Makedirectives | 1 +
targets/RT/USER/lte-softmodem.c | 2 ++
targets/build_helper.bash | 4 ++--
targets/build_oai.bash | 6 +++++-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/targets/Makedirectives b/targets/Makedirectives
index bb6f0508697..47aa113d2bb 100644
--- a/targets/Makedirectives
+++ b/targets/Makedirectives
@@ -4,6 +4,7 @@ USE_MME=R10
DISABLE_XER_PRINT=1
LINK_PDCP_TO_GTPV1U=1
SECU=1
+PHY_ABSTRACTION=0
endif
ifndef OPENAIR2
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 51c87cd852c..2c39ce3d4bd 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -1659,8 +1659,10 @@ static void *UE_thread_synch(void *arg) {
for (i=0; i<openair0_cfg[card].rx_num_channels; i++) {
openair0_cfg[card].rx_freq[i] = downlink_frequency[card][i]+openair_daq_vars.freq_offset;
openair0_cfg[card].tx_freq[i] = downlink_frequency[card][i]+uplink_frequency_offset[card][i]+openair_daq_vars.freq_offset;
+#ifdef USRP
#ifndef USRP_DEBUG
openair0_set_frequencies(&openair0,&openair0_cfg[0]);
+#endif
#endif
}
}
diff --git a/targets/build_helper.bash b/targets/build_helper.bash
index c3b84f632e0..470982381fa 100755
--- a/targets/build_helper.bash
+++ b/targets/build_helper.bash
@@ -127,7 +127,7 @@ make_certs(){
echo "creating the certificate"
user=$(whoami)
- HOSTNAME=$(hostname -f)
+ HOSTNAME=$(hostname)
echo "Creating certificate for user '$HOSTNAME'"
@@ -673,7 +673,7 @@ install_ltesoftmodem() {
for i in `seq 0 64`; do
have_rtfX=`ls /dev/ |grep -c rtf$i`;
if [ "$have_rtfX" -eq 0 ] ; then
- $SUDO$ mknod -m 666 /dev/rtf$i c 150 $i;
+ $SUDO mknod -m 666 /dev/rtf$i c 150 $i;
fi;
done
echo_info " 8.3 [EXMIMO] Build lte-softmodemdrivers"
diff --git a/targets/build_oai.bash b/targets/build_oai.bash
index 8cdf8020fac..836d7cb8cca 100755
--- a/targets/build_oai.bash
+++ b/targets/build_oai.bash
@@ -215,6 +215,10 @@ if [ $RT = "RTAI" ]; then
else
SOFTMODEM_DIRECTIVES="$SOFTMODEM_DIRECTIVES HARD_RT=1 "
fi
+else
+ if [ $RT = "RT_PREEMPT" ]; then
+ SOFTMODEM_DIRECTIVES="$SOFTMODEM_DIRECTIVES RTAI=0 "
+ fi
fi
if [ $TARGET != "ALL" ]; then
@@ -363,4 +367,4 @@ if [ $OAI_TEST = 1 ]; then
else
echo_info "9. Bypassing the Tests ..."
fi
-
\ No newline at end of file
+
--
GitLab