From 5cb9fcfce7bcad3cb8a3a0d58693b2bfe14ad8b8 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Fri, 23 Feb 2018 17:18:52 +0100
Subject: [PATCH] fixed compilation error in lte-ru.c Added modifications for
oaisim from other branch.
---
cmake_targets/CMakeLists.txt | 2 +-
targets/RT/USER/lte-ru.c | 4 ++--
targets/SIMU/USER/oaisim.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index d57bbc9e85e..c01705e9e46 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -1300,7 +1300,7 @@ set(L2_SRC
)
set(L2_SRC_UE
- ${OPENAIR2_DIR}/LAYER2/openair2_proc.c
+# ${OPENAIR2_DIR}/LAYER2/openair2_proc.c
${PDCP_DIR}/pdcp.c
${PDCP_DIR}/pdcp_fifo.c
${PDCP_DIR}/pdcp_sequence_manager.c
diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c
index 8a5739d8b79..09a144768b4 100644
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -119,8 +119,8 @@ extern volatile int oai_exit;
extern void phy_init_RU(RU_t*);
extern void phy_free_RU(RU_t*);
-void init_RU(char*);
-void stop_RU(RU_t *ru);
+void init_RU(char*,clock_source_t clock_source,clock_source_t time_source);
+void stop_RU(int nb_ru);
void do_ru_sync(RU_t *ru);
void configure_ru(int idx,
diff --git a/targets/SIMU/USER/oaisim.c b/targets/SIMU/USER/oaisim.c
index 3a282e1d44e..4cc4a275b43 100644
--- a/targets/SIMU/USER/oaisim.c
+++ b/targets/SIMU/USER/oaisim.c
@@ -816,7 +816,6 @@ l2l1_task (void *args_p)
fwrite (stats_buffer, 1, len, eNB_stats[eNB_inst]);
fflush(eNB_stats[eNB_inst]);
}
- */
#ifdef OPENAIR2
if (eNB_l2_stats) {
@@ -827,6 +826,7 @@ l2l1_task (void *args_p)
}
#endif
+*/
#endif
}
}// eNB_inst loop
--
GitLab