Merge branch 'recode_itti_from_scratch' into develop_integration_2018_w36
Note: we don't include the last commit from origin/recode_itti_from_scratch because it is just astyle formatting. As of today we don't enforce astyle and including this work would lead to future merge conflicts. A proper process to enforce astyle has to be put in place. In the meantime, no astyle allowed in commits if the changes are too big and not relevant to work done.
This commit is contained in:
@@ -33,10 +33,10 @@
|
||||
#include "PHY/defs_eNB.h"
|
||||
#include "PHY/TOOLS/alaw_lut.h"
|
||||
|
||||
#include "time_utils.h"
|
||||
|
||||
//#include "targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
|
||||
#include "targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
|
||||
#include <intertask_interface.h>
|
||||
#include "common/utils/LOG/vcd_signal_dumper.h"
|
||||
//#define DEBUG_DL_MOBIPASS
|
||||
//#define DEBUG_UL_MOBIPASS
|
||||
|
||||
@@ -33,7 +33,9 @@
|
||||
#define __PHY_DEFS_COMMON_H__
|
||||
|
||||
|
||||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
#include <sched.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -928,7 +930,6 @@ typedef enum {
|
||||
#endif
|
||||
|
||||
|
||||
void exit_fun(const char* s);
|
||||
|
||||
#include "common/utils/LOG/log_extern.h"
|
||||
extern pthread_cond_t sync_cond;
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
#include "SCHED/defs.h"
|
||||
#include "SCHED/vars.h"
|
||||
#include "LAYER2/MAC/vars.h"
|
||||
#include "intertask_interface_init.h"
|
||||
|
||||
#include "OCG_vars.h"
|
||||
#include "UTIL/LOG/log_extern.h"
|
||||
|
||||
@@ -22,7 +22,11 @@
|
||||
openair0_device openair0;
|
||||
volatile int oai_exit=0;
|
||||
|
||||
void exit_fun(const char *s) { exit(-1); }
|
||||
void exit_function(const char* file, const char* function, const int line,const char *s) {
|
||||
const char * msg= s==NULL ? "no comment": s;
|
||||
printf("Exiting at: %s:%d %s(), %s\n", file, line, function, msg);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
extern unsigned int dlsch_tbs25[27][25],TBStable[27][110];
|
||||
extern unsigned char offset_mumimo_llr_drange_fix;
|
||||
|
||||
Reference in New Issue
Block a user