From 9e78b40d2e9a1a367aa5098e9f39ae1d88f94f73 Mon Sep 17 00:00:00 2001
From: Wilson Thong <wilsonthong@astri.org>
Date: Tue, 28 Mar 2017 10:17:42 +0800
Subject: [PATCH] #220 fixed minor typo
---
cmake_targets/build_oai | 4 ++--
cmake_targets/tools/build_helper | 2 +-
openair1/SCHED/phy_procedures_lte_eNb.c | 2 +-
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 9c46f4b7b5f..e1361295dfd 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -761,9 +761,9 @@ function main() {
# build RF device and transport protocol libraries
#####################################
- if [ "$eNB" = "1" -o "$RRH" = "1" ] ; then
+ if [ "$eNB" = "1" -o "$UE" = "1" -o "$RRH" = "1" ] ; then
- if [ "$eNB" = "1" ] ; then
+ if [ "$eNB" = "1" -o "$UE" = "1" ] ; then
build_dir=$lte_build_dir
else
build_dir=$rrh_build_dir
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index ede8ef4196e..f0dfe6dfb02 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -127,7 +127,7 @@ clean_all_files() {
set_openair_env
dir=$OPENAIR_DIR/cmake_targets
rm -rf $dir/log $OPENAIR_DIR/targets/bin/*
- rm -rf $dir/lte_build_oai $dir/lte-simulators/build
+ rm -rf $dir/lte_build_oai/build $dir/lte-simulators/build
rm -rf $dir/oaisim_build_oai/build $dir/oaisim_build_oai/CMakeLists.txt
rm -rf $dir/autotests/bin $dir/autotests/log $dir/autotests/*/build
}
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index a9142a99189..2f2be51aaa4 100644
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -190,7 +190,7 @@ int mac_phy_remove_ue(module_id_t Mod_idP,rnti_t rntiP) {
eNB = PHY_vars_eNB_g[Mod_idP][CC_id];
for (i=0; i<NUMBER_OF_UE_MAX; i++) {
if ((eNB->dlsch[i]==NULL) || (eNB->ulsch[i]==NULL)) {
- MSC_LOG_EVENT(MSC_PHY_ENB, "0 Failed remove ue %"PRIx16" (ENOMEM)", rnti);
+ MSC_LOG_EVENT(MSC_PHY_ENB, "0 Failed remove ue %"PRIx16" (ENOMEM)", rntiP);
LOG_E(PHY,"Can't remove UE, not enough memory allocated\n");
return(-1);
} else {
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
index 873e51fbfe3..3a9172a1c42 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
@@ -91,7 +91,7 @@ rlc_am_send_sdu (
const protocol_ctxt_t* const ctxt_pP,
rlc_am_entity_t * const rlc_pP)
{
-# if TRACE_RLC_UM_PDU
+# if TRACE_RLC_AM_PDU
char message_string[7000];
size_t message_string_size = 0;
#if ENABLE_ITTI
--
GitLab