From 7368e4bfc486d9a7a1ddc39cb4c0ef157d023759 Mon Sep 17 00:00:00 2001
From: laurent <laurent.thomas@open-cells.com>
Date: Thu, 2 May 2019 12:17:31 +0200
Subject: [PATCH] fix compilation tests
---
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c | 9 --------
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c | 4 ----
openair1/PHY/defs_L1_NB_IoT.h | 2 +-
openair1/PHY/defs_common.h | 2 +-
openair1/PHY/defs_eNB.h | 4 ++--
openair1/SCHED/ru_procedures.c | 25 +--------------------
openair1/SCHED_NR/nr_ru_procedures.c | 3 ---
openair2/ENB_APP/enb_app.c | 3 +--
openair2/PHY_INTERFACE/UE_MAC_interface.h | 2 +-
openair2/RRC/LTE/defs_NB_IoT.h | 2 +-
10 files changed, 8 insertions(+), 48 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
index a7e4b33c16a..85886f88b6f 100644
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
@@ -41,7 +41,6 @@
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "common/utils/LOG/log.h"
#include <syscall.h>
-#include "targets/RT/USER/rt_wrapper.h"
//#define DEBUG_DLSCH_CODING
//#define DEBUG_DLSCH_FREE 1
@@ -337,14 +336,6 @@ int dlsch_encoding_2threads0(te_params *tep) {
extern int oai_exit;
void *te_thread(void *param) {
- cpu_set_t cpuset;
- CPU_ZERO(&cpuset);
-
- thread_top_init("te_thread",1,200000,250000,500000);
- pthread_setname_np( pthread_self(),"te processing");
- LOG_I(PHY,"thread te created id=%ld\n", syscall(__NR_gettid));
-
-
te_params *tep = (te_params *)param;
//wait_sync("te_thread");
diff --git a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
index 046e456916a..6cb8c7d2122 100644
--- a/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
+++ b/openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
@@ -42,7 +42,6 @@
#include "common/utils/LOG/vcd_signal_dumper.h"
//#define DEBUG_ULSCH_DECODING
-#include "targets/RT/USER/rt_wrapper.h"
#include "transport_proto.h"
extern WORKER_CONF_t get_thread_worker_conf(void);
@@ -383,10 +382,7 @@ extern int oai_exit;
void *td_thread(void *param) {
PHY_VARS_eNB *eNB = ((td_params*)param)->eNB;
eNB_proc_t *proc = &eNB->proc;
- cpu_set_t cpuset;
- CPU_ZERO(&cpuset);
- thread_top_init("td_thread",1,200000,250000,500000);
pthread_setname_np( pthread_self(),"td processing");
LOG_I(PHY,"thread td created id=%ld\n", syscall(__NR_gettid));
//wait_sync("td_thread");
diff --git a/openair1/PHY/defs_L1_NB_IoT.h b/openair1/PHY/defs_L1_NB_IoT.h
index 8a7c853df55..bd583ee574a 100644
--- a/openair1/PHY/defs_L1_NB_IoT.h
+++ b/openair1/PHY/defs_L1_NB_IoT.h
@@ -141,7 +141,7 @@ static inline void* malloc16_clear( size_t size )
#include <pthread.h>
#include "targets/ARCH/COMMON/common_lib.h"
-#include "targets/COMMON/openairinterface5g_limits.h"
+#include "openairinterface5g_limits.h"
#define NUM_DCI_MAX_NB_IoT 32
diff --git a/openair1/PHY/defs_common.h b/openair1/PHY/defs_common.h
index f479c30b8cd..72387772bde 100644
--- a/openair1/PHY/defs_common.h
+++ b/openair1/PHY/defs_common.h
@@ -69,7 +69,7 @@
#include "TOOLS/tools_defs.h"
-#include "targets/COMMON/openairinterface5g_limits.h"
+#include "openairinterface5g_limits.h"
#include "common/utils/LOG/log.h"
#include "types.h"
diff --git a/openair1/PHY/defs_eNB.h b/openair1/PHY/defs_eNB.h
index d23586c634d..8fc8fb4fa94 100644
--- a/openair1/PHY/defs_eNB.h
+++ b/openair1/PHY/defs_eNB.h
@@ -76,8 +76,8 @@
#include <pthread.h>
-#include "targets/ARCH/COMMON/common_lib.h"
-#include "targets/COMMON/openairinterface5g_limits.h"
+#include "common_lib.h"
+#include "openairinterface5g_limits.h"
#define NUMBER_OF_SUBBANDS_MAX 13
diff --git a/openair1/SCHED/ru_procedures.c b/openair1/SCHED/ru_procedures.c
index cb892489f15..2724567f4b9 100644
--- a/openair1/SCHED/ru_procedures.c
+++ b/openair1/SCHED/ru_procedures.c
@@ -49,8 +49,6 @@
#include <time.h>
-#include "targets/RT/USER/rt_wrapper.h"
-
extern int oai_exit;
@@ -132,17 +130,8 @@ static void *feptx_thread(void *param) {
RU_t *ru = (RU_t *)param;
RU_proc_t *proc = &ru->proc;
- cpu_set_t cpuset;
- CPU_ZERO(&cpuset);
-
- thread_top_init("feptx_thread",1,85000,120000,500000);
- pthread_setname_np( pthread_self(),"feptx processing");
- LOG_I(PHY,"thread feptx created id=%ld\n", syscall(__NR_gettid));
- //CPU_SET(6, &cpuset);
- //pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
- //wait_sync("feptx_thread");
-
+ LOG_I(PHY,"thread feptx created \n");
while (!oai_exit) {
@@ -163,8 +152,6 @@ static void *feptx_thread(void *param) {
}*/
}
-
-
return(NULL);
}
@@ -439,16 +426,6 @@ static void *fep_thread(void *param) {
RU_t *ru = (RU_t *)param;
RU_proc_t *proc = &ru->proc;
- thread_top_init("fep_thread",1,100000,120000,5000000);
- pthread_setname_np( pthread_self(),"fep processing");
- LOG_I(PHY,"thread fep created id=%ld\n", syscall(__NR_gettid));
-
- cpu_set_t cpuset;
- CPU_ZERO(&cpuset);
- //CPU_SET(2, &cpuset);
- //pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset);
- //wait_sync("fep_thread");
-
while (!oai_exit) {
if (wait_on_condition(&proc->mutex_fep,&proc->cond_fep,&proc->instance_cnt_fep,"fep thread")<0) break;
diff --git a/openair1/SCHED_NR/nr_ru_procedures.c b/openair1/SCHED_NR/nr_ru_procedures.c
index d0b9d3ee480..653e9632b50 100644
--- a/openair1/SCHED_NR/nr_ru_procedures.c
+++ b/openair1/SCHED_NR/nr_ru_procedures.c
@@ -50,9 +50,6 @@
#include "msc.h"
#include <time.h>
-
-#include "targets/RT/USER/rt_wrapper.h"
-
// RU OFDM Modulator gNodeB
extern openair0_config_t openair0_cfg[MAX_CARDS];
diff --git a/openair2/ENB_APP/enb_app.c b/openair2/ENB_APP/enb_app.c
index 37bcd366533..baa1409c525 100644
--- a/openair2/ENB_APP/enb_app.c
+++ b/openair2/ENB_APP/enb_app.c
@@ -55,6 +55,7 @@
extern unsigned char NB_eNB_INST;
#endif
+#include <nr-softmodem.h>
extern RAN_CONTEXT_t RC;
#if defined(ENABLE_ITTI)
@@ -64,8 +65,6 @@ extern RAN_CONTEXT_t RC;
# define ENB_REGISTER_RETRY_DELAY 10
# endif
-#include "targets/RT/USER/lte-softmodem.h"
-
/*------------------------------------------------------------------------------*/
/*
diff --git a/openair2/PHY_INTERFACE/UE_MAC_interface.h b/openair2/PHY_INTERFACE/UE_MAC_interface.h
index d010109f998..cadaf621d6a 100644
--- a/openair2/PHY_INTERFACE/UE_MAC_interface.h
+++ b/openair2/PHY_INTERFACE/UE_MAC_interface.h
@@ -38,7 +38,7 @@
#include "nfapi_interface.h"
#include "openair1/PHY/impl_defs_lte.h"
-#include "targets/COMMON/openairinterface5g_limits.h"
+#include "openairinterface5g_limits.h"
diff --git a/openair2/RRC/LTE/defs_NB_IoT.h b/openair2/RRC/LTE/defs_NB_IoT.h
index 0cc8a37bc08..422a5dcf9c4 100644
--- a/openair2/RRC/LTE/defs_NB_IoT.h
+++ b/openair2/RRC/LTE/defs_NB_IoT.h
@@ -42,7 +42,7 @@
#include "rrc_types_NB_IoT.h"
#include "COMMON/platform_constants.h"
#include "COMMON/platform_types.h"
-#include "targets/COMMON/openairinterface5g_limits.h"
+#include "openairinterface5g_limits.h"
#include "COMMON/mac_rrc_primitives.h"
--
GitLab