From fe9ab65df0ec9310a2f291d89e61d376d58e86b0 Mon Sep 17 00:00:00 2001
From: thomasl <thomasl@eurecom.fr>
Date: Fri, 10 Apr 2015 18:13:56 +0000
Subject: [PATCH] fix little bugs after merge with 0.3
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7133 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
cmake_targets/autotests/run_compilation_autotests.bash | 2 +-
targets/SIMU/USER/oaisim_functions.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake_targets/autotests/run_compilation_autotests.bash b/cmake_targets/autotests/run_compilation_autotests.bash
index 5f3dc600eb..c54ba1e778 100755
--- a/cmake_targets/autotests/run_compilation_autotests.bash
+++ b/cmake_targets/autotests/run_compilation_autotests.bash
@@ -16,7 +16,7 @@ test_compile() {
make -j4 $2
} > $tdir/log/$1.txt 2>&1
if [ -s $3 ] ; then
- cp $3 $tdir/bin/$3.$1
+ cp $3 $tdir/bin/`basename $3`.$1
echo_success "$1 test compiled"
else
echo_error "$1 test compilation failed"
diff --git a/targets/SIMU/USER/oaisim_functions.c b/targets/SIMU/USER/oaisim_functions.c
index 3e88d66ced..0bc1cab0a3 100644
--- a/targets/SIMU/USER/oaisim_functions.c
+++ b/targets/SIMU/USER/oaisim_functions.c
@@ -1275,7 +1275,7 @@ void update_otg_eNB(module_id_t enb_module_idP, unsigned int ctime)
for_times += 1;
// generate traffic if the ue is rrc reconfigured state
- if (mac_get_rrc_status(enb_module_idP, ENB_FLAG_YES, dst_id) > 2 /*RRC_CONNECTED*/ ) {
+ if (mac_eNB_get_rrc_status(enb_module_idP, dst_id) > 2 /*RRC_CONNECTED*/ ) {
if_times += 1;
for (app_id=0; app_id<MAX_NUM_APPLICATION; app_id++) {
@@ -1415,7 +1415,7 @@ void update_otg_UE(module_id_t ue_mod_idP, unsigned int ctime)
for (dst_id=0; dst_id<NB_SIG_CNX_UE; dst_id++) {
// only consider the first attached eNB
- if (mac_get_rrc_status(ue_mod_idP, 0, dst_id ) > 2 /*RRC_CONNECTED*/) {
+ if (mac_UE_get_rrc_status(ue_mod_idP, dst_id ) > 2 /*RRC_CONNECTED*/) {
Packet_otg_elt_t *otg_pkt = malloc (sizeof(Packet_otg_elt_t));
if (otg_pkt!=NULL)
--
GitLab