maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pushing changes before incorporating new merges into develop and develop-nr

Browse Source
This commit is contained in:
yilmazt
2019-05-28 21:56:41 +02:00
parent f6a4a6b99a
commit 3c1d1bffee
23 changed files with 609 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/RT/USER/nr-ru.c
+7 -3
View File
@@ -87,11 +87,15 @@
unsigned short config_frames[4] = {2,9,11,13};
#endif
/* these variables have to be defined before including ENB_APP/enb_paramdef.h */
/* these variables have to be defined before including ENB_APP/enb_paramdef.h and GNB_APP/gnb_paramdef.h */
static int DEFBANDS[] = {7};
static int DEFENBS[] = {0};
static int DEFNRBANDS[] = {7};
static int DEFGNBS[] = {0};
#include "ENB_APP/enb_paramdef.h"
#include "GNB_APP/gnb_paramdef.h"
#include "common/config/config_userapi.h"
#ifndef OPENAIR2
@@ -1792,7 +1796,7 @@ void init_RU_proc(RU_t *ru) {
}
void kill_RU_proc(int inst)
void kill_NR_RU_proc(int inst)
{
RU_t *ru = RC.ru[inst];
RU_proc_t *proc = &ru->proc;
@@ -2294,7 +2298,7 @@ void stop_RU(int nb_ru)
{
for (int inst = 0; inst < nb_ru; inst++) {
LOG_I(PHY, "Stopping RU %d processing threads\n", inst);
kill_RU_proc(inst);
kill_NR_RU_proc(inst);
}
}
targets/RT/USER/nr-softmodem.c
+2 -2
View File
@@ -833,8 +833,8 @@ int stop_L1L2(module_id_t gnb_id)
terminate_task(TASK_L2L1, gnb_id);
LOG_I(ENB_APP, "calling kill_gNB_proc() for instance %d\n", gnb_id);
kill_gNB_proc(gnb_id);
LOG_I(ENB_APP, "calling kill_RU_proc() for instance %d\n", gnb_id);
kill_RU_proc(gnb_id);
LOG_I(ENB_APP, "calling kill_NR_RU_proc() for instance %d\n", gnb_id);
kill_NR_RU_proc(gnb_id);
oai_exit = 0;
for (int cc_id = 0; cc_id < RC.nb_nr_CC[gnb_id]; cc_id++) {
//free_transport(RC.gNB[gnb_id][cc_id]);
targets/RT/USER/nr-softmodem.h
+1 -1
View File
@@ -236,7 +236,7 @@ extern void kill_gNB_proc(int inst);
extern void init_RU(const char*);
extern void init_RU_proc(RU_t *ru);
extern void stop_RU(int nb_ru);
extern void kill_RU_proc(int inst);
extern void kill_NR_RU_proc(int inst);
extern void set_function_spec_param(RU_t *ru);
extern void reset_opp_meas(void);