Merge branch 'develop' into NR_RRC_PRACH_procedures

This commit is contained in:
Francesco Mani
2020-03-25 18:45:00 +01:00
153 changed files with 5833 additions and 5811 deletions
+4 -4
View File
@@ -135,6 +135,7 @@ int threequarter_fs=0;
uint64_t downlink_frequency[MAX_NUM_CCs][4];
int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
//int32_t uplink_counter = 0;
extern int16_t nr_dlsch_demod_shift;
@@ -334,8 +335,6 @@ void init_scope(void) {
}
#if defined(ENABLE_ITTI)
void *l2l1_task(void *arg) {
MessageDef *message_p = NULL;
int result;
@@ -375,7 +374,7 @@ void *l2l1_task(void *arg) {
return NULL;
}
#endif
int16_t dlsch_demod_shift;
@@ -669,7 +668,7 @@ int main( int argc, char **argv ) {
logInit();
// get options and fill parameters from configuration file
get_options (); //Command-line options, enb_properties
get_common_options();
get_common_options(SOFTMODEM_5GUE_BIT );
#if T_TRACER
T_Config_Init();
#endif
@@ -689,6 +688,7 @@ int main( int argc, char **argv ) {
itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info);
init_opt() ;
load_nrLDPClib();
if (ouput_vcd) {
vcd_signal_dumper_init("/tmp/openair_dump_nrUE.vcd");