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

Fix compilation issues for:

Browse Source 
- physical simulators
 - LTE eNB
 - LTE UE
 - 5G-NR gNB

Still NR-UE does not build and eNB segs fault at start of program

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
Raphael Defosseux
2020-01-13 16:46:21 +01:00
parent 7aa35e874b
commit 2dfad4c065
17 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/defs_RU.h
+1 -1
View File
@@ -37,7 +37,7 @@
#include "common_lib.h"
#include "openairinterface5g_limits.h"
#include "PHY/TOOLS/time_meas.h"
#include "openair1/PHY/defs_common.h"
#include "defs_common.h"
#define MAX_BANDS_PER_RRU 4
openair1/PHY/defs_common.h
-3
View File
@@ -72,9 +72,6 @@
#include "types.h"
#include "nfapi_interface.h"
//#include "defs.h"
#include "defs_RU.h"
#define RX_NB_TH_MAX 2
#define RX_NB_TH 2
openair1/PHY/defs_eNB.h
+1
View File
@@ -57,6 +57,7 @@
#include "common_lib.h"
#include "msc.h"
#include "defs_common.h"
#include "defs_RU.h"
#include "impl_defs_top.h"
#include "PHY/TOOLS/time_meas.h"
//#include "PHY/CODING/coding_defs.h"
openair1/SCHED/ru_procedures.c
+4 -4
View File
@@ -80,7 +80,7 @@ void feptx0(RU_t *ru,
slot_offset = slot*(fp->samples_per_tti>>1); //slot_offset = subframe*fp->samples_per_tti + (slot*(fp->samples_per_tti>>1));
//LOG_D(PHY,"SFN/SF:RU:TX:%d/%d Generating slot %d\n",ru->proc.frame_tx, ru->proc.subframe_tx,slot);
//LOG_D(PHY,"SFN/SF:RU:TX:%d/%d Generating slot %d\n",ru->proc.frame_tx, ru->proc.tti_tx,slot);
for (aa=0; aa<ru->nb_tx; aa++) {
if (fp->Ncp == EXTENDED) {
@@ -105,7 +105,7 @@ void feptx0(RU_t *ru,
CYCLIC_PREFIX);
LOG_D(PHY,"SFN/SF:RU:TX:%d/%d Generating slot %d F(%d) t(%d) IS PMCH(%d)\n",
ru->proc.frame_tx,
ru->proc.subframe_tx,
ru->proc.tti_tx,
slot,
slot*slot_sizeF+fp->ofdm_symbol_size*2,
slot_offset+((fp->ofdm_symbol_size>>2)*2+fp->ofdm_symbol_size*2),
@@ -214,7 +214,7 @@ static void *feptx_thread(void *param)
}
/*if(opp_enabled == 1 && ru->ofdm_mod_wakeup_stats.p_time>30*3000){
print_meas_now(&ru->ofdm_mod_wakeup_stats,"fep wakeup",stderr);
printf("delay in fep wakeup in frame_tx: %d subframe_rx: %d \n",proc->frame_tx,proc->subframe_tx);
printf("delay in fep wakeup in frame_tx: %d subframe_rx: %d \n",proc->frame_tx,proc->tti_tx);
}*/
}
return(NULL);
@@ -273,7 +273,7 @@ void feptx_ofdm_2thread(RU_t *ru,
stop_meas(&ru->ofdm_mod_wait_stats);
/*if(opp_enabled == 1 && ru->ofdm_mod_wait_stats.p_time>30*3000){
print_meas_now(&ru->ofdm_mod_wait_stats,"fep wakeup",stderr);
printf("delay in feptx wait on condition in frame_rx: %d subframe_rx: %d \n", proc->frame_tx, proc->subframe_tx);
printf("delay in feptx wait on condition in frame_rx: %d subframe_rx: %d \n", proc->frame_tx, proc->tti_tx);
}*/
stop_meas(&ru->ofdm_mod_stats);