diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt index 90d775bf31..2fe25a51c3 100644 --- a/cmake_targets/CMakeLists.txt +++ b/cmake_targets/CMakeLists.txt @@ -361,9 +361,9 @@ endif (${NR_RRC_ASN1_VERSION} STREQUAL "NR_Rel15") add_definitions(-DNR_RRC_VERSION=${NR_RRC_VERSION}) set (NR_RRC_FULL_DIR ${asn1_generated_dir}/${NR_RRC_ASN1_VERSION}) -message("calling ASN1C_PREFIX=NR_ asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${NR_RRC_FULL_DIR} ${NR_RRC_GRAMMAR}") +message("calling ASN1C_PREFIX=NR_ asn1c -pdu=all -fcompound-names -findirect-choice -gen-PER -no-gen-OER -no-gen-example -D ${NR_RRC_FULL_DIR} ${NR_RRC_GRAMMAR}") execute_process(COMMAND mkdir -p ${NR_RRC_FULL_DIR} - COMMAND env "ASN1C_PREFIX=NR_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${NR_RRC_FULL_DIR} ${NR_RRC_GRAMMAR} + COMMAND env "ASN1C_PREFIX=NR_" asn1c -fcompound-names -findirect-choice -gen-PER -no-gen-OER -no-gen-example -D ${NR_RRC_FULL_DIR} ${NR_RRC_GRAMMAR} RESULT_VARIABLE ret OUTPUT_QUIET ERROR_QUIET) @@ -387,7 +387,7 @@ include_directories ("${NR_RRC_FULL_DIR}") add_custom_command (OUTPUT ${NR_RRC_FULL_DIR}/NR_asn_constant.h COMMAND mkdir -p ${NR_RRC_FULL_DIR} - COMMAND env "ASN1C_PREFIX=NR_" asn1c -gen-PER -fcompound-names -findirect-choice -no-gen-OER -no-gen-example -D ${NR_RRC_FULL_DIR} ${NR_RRC_GRAMMAR} + #COMMAND env "ASN1C_PREFIX=NR_" asn1c -fcompound-names -findirect-choice -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${NR_RRC_FULL_DIR} ${NR_RRC_GRAMMAR} DEPENDS ${NR_RRC_GRAMMAR} ) diff --git a/common/utils/T/T_messages.txt b/common/utils/T/T_messages.txt index 9432155147..38966e7708 100644 --- a/common/utils/T/T_messages.txt +++ b/common/utils/T/T_messages.txt @@ -77,6 +77,10 @@ ID = ENB_PHY_INITIATE_RA_PROCEDURE DESC = eNodeB initiates a random access procedure after detecting enough energy for one of the preambles GROUP = ALL:PHY:ENB FORMAT = int,eNB_ID : int,frame : int,subframe : int,preamble : int,energy : int,delay +ID = GNB_PHY_DL_TICK + DESC = gNodeB downlink tick - one tick per ms at start of downlink processing + GROUP = ALL:PHY:GRAPHIC:GNB + FORMAT = int,gNB_ID : int,frame : int,subframe #MAC logs ID = ENB_MAC_UE_DL_SDU @@ -288,6 +292,27 @@ ID = LEGACY_MAC_TRACE GROUP = ALL:LEGACY_MAC:LEGACY_GROUP_TRACE:LEGACY FORMAT = string,log +ID = LEGACY_NR_MAC_INFO + DESC = NR_MAC legacy logs - info level + GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_INFO:LEGACY + FORMAT = string,log +ID = LEGACY_NR_MAC_ERROR + DESC = NR_MAC legacy logs - error level + GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_ERROR:LEGACY + FORMAT = string,log +ID = LEGACY_NR_MAC_WARNING + DESC = NR_MAC legacy logs - warning level + GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_WARNING:LEGACY + FORMAT = string,log +ID = LEGACY_NR_MAC_DEBUG + DESC = NR_MAC legacy logs - debug level + GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_DEBUG:LEGACY + FORMAT = string,log +ID = LEGACY_NR_MAC_TRACE + DESC = NR_MAC legacy logs - trace level + GROUP = ALL:LEGACY_NR_MAC:LEGACY_GROUP_TRACE:LEGACY + FORMAT = string,log + ID = LEGACY_PHY_INFO DESC = PHY legacy logs - info level GROUP = ALL:LEGACY_PHY:LEGACY_GROUP_INFO:LEGACY @@ -309,6 +334,27 @@ ID = LEGACY_PHY_TRACE GROUP = ALL:LEGACY_PHY:LEGACY_GROUP_TRACE:LEGACY FORMAT = string,log +ID = LEGACY_NR_PHY_INFO + DESC = NR_PHY legacy logs - info level + GROUP = ALL:LEGACY_NR_PHY:LEGACY_GROUP_INFO:LEGACY + FORMAT = string,log +ID = LEGACY_NR_PHY_ERROR + DESC = NR_PHY legacy logs - error level + GROUP = ALL:LEGACY_NR_PHY:LEGACY_GROUP_ERROR:LEGACY + FORMAT = string,log +ID = LEGACY_NR_PHY_WARNING + DESC = NR_PHY legacy logs - warning level + GROUP = ALL:LEGACY_NR_PHY:LEGACY_GROUP_WARNING:LEGACY + FORMAT = string,log +ID = LEGACY_NR_PHY_DEBUG + DESC = NR_PHY legacy logs - debug level + GROUP = ALL:LEGACY_NR_PHY:LEGACY_GROUP_DEBUG:LEGACY + FORMAT = string,log +ID = LEGACY_NR_PHY_TRACE + DESC = NR_PHY legacy logs - trace level + GROUP = ALL:LEGACY_NR_PHY:LEGACY_GROUP_TRACE:LEGACY + FORMAT = string,log + ID = LEGACY_S1AP_INFO DESC = S1AP legacy logs - info level GROUP = ALL:LEGACY_S1AP:LEGACY_GROUP_INFO:LEGACY @@ -372,6 +418,27 @@ ID = LEGACY_RRC_TRACE GROUP = ALL:LEGACY_RRC:LEGACY_GROUP_TRACE:LEGACY FORMAT = string,log +ID = LEGACY_NR_RRC_INFO + DESC = NR_RRC legacy logs - info level + GROUP = ALL:LEGACY_NR_RRC:LEGACY_GROUP_INFO:LEGACY + FORMAT = string,log +ID = LEGACY_NR_RRC_ERROR + DESC = NR_RRC legacy logs - error level + GROUP = ALL:LEGACY_NR_RRC:LEGACY_GROUP_ERROR:LEGACY + FORMAT = string,log +ID = LEGACY_NR_RRC_WARNING + DESC = NR_RRC legacy logs - warning level + GROUP = ALL:LEGACY_NR_RRC:LEGACY_GROUP_WARNING:LEGACY + FORMAT = string,log +ID = LEGACY_NR_RRC_DEBUG + DESC = NR_RRC legacy logs - debug level + GROUP = ALL:LEGACY_NR_RRC:LEGACY_GROUP_DEBUG:LEGACY + FORMAT = string,log +ID = LEGACY_NR_RRC_TRACE + DESC = NR_RRC legacy logs - trace level + GROUP = ALL:LEGACY_NR_RRC:LEGACY_GROUP_TRACE:LEGACY + FORMAT = string,log + ID = LEGACY_RLC_INFO DESC = RLC legacy logs - info level GROUP = ALL:LEGACY_RLC:LEGACY_GROUP_INFO:LEGACY @@ -435,6 +502,27 @@ ID = LEGACY_ENB_APP_TRACE GROUP = ALL:LEGACY_ENB_APP:LEGACY_GROUP_TRACE:LEGACY FORMAT = string,log +ID = LEGACY_GNB_APP_INFO + DESC = GNB_APP legacy logs - info level + GROUP = ALL:LEGACY_GNB_APP:LEGACY_GROUP_INFO:LEGACY + FORMAT = string,log +ID = LEGACY_GNB_APP_ERROR + DESC = GNB_APP legacy logs - error level + GROUP = ALL:LEGACY_GNB_APP:LEGACY_GROUP_ERROR:LEGACY + FORMAT = string,log +ID = LEGACY_GNB_APP_WARNING + DESC = GNB_APP legacy logs - warning level + GROUP = ALL:LEGACY_GNB_APP:LEGACY_GROUP_WARNING:LEGACY + FORMAT = string,log +ID = LEGACY_GNB_APP_DEBUG + DESC = GNB_APP legacy logs - debug level + GROUP = ALL:LEGACY_GNB_APP:LEGACY_GROUP_DEBUG:LEGACY + FORMAT = string,log +ID = LEGACY_GNB_APP_TRACE + DESC = GNB_APP legacy logs - trace level + GROUP = ALL:LEGACY_GNB_APP:LEGACY_GROUP_TRACE:LEGACY + FORMAT = string,log + ID = LEGACY_FLEXRAN_AGENT_INFO DESC = FLEXRAN_AGENT legacy logs - info level GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_INFO:LEGACY diff --git a/openair1/PHY/phy_extern.h b/openair1/PHY/phy_extern.h index 8bf3b49a3c..fe888c8d2e 100644 --- a/openair1/PHY/phy_extern.h +++ b/openair1/PHY/phy_extern.h @@ -68,7 +68,7 @@ extern int flagMag; extern char mode_string[4][20]; - +extern unsigned char NB_RU; #ifndef OPENAIR2 diff --git a/openair1/PHY/phy_vars.h b/openair1/PHY/phy_vars.h index edd54783ff..ebc6fc1c9f 100644 --- a/openair1/PHY/phy_vars.h +++ b/openair1/PHY/phy_vars.h @@ -66,6 +66,7 @@ char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"}; #include "SIMULATION/ETH_TRANSPORT/vars.h" +unsigned char NB_RU=0; #ifndef OPENAIR2 unsigned char NB_eNB_INST=0; diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h index cb161e3da3..1873782dc2 100644 --- a/openair2/GNB_APP/gnb_paramdef.h +++ b/openair2/GNB_APP/gnb_paramdef.h @@ -1047,5 +1047,4 @@ typedef enum { #define MACRLC_LOCAL_S_PORTC_IDX 13 #define MACRLC_REMOTE_S_PORTC_IDX 14 #define MACRLC_LOCAL_S_PORTD_IDX 15 -#define MACRLC_REMOTE_S_PORTD_IDX 16 -#define MACRLC_PHY_TEST_IDX 17 \ No newline at end of file +#define MACRLC_REMOTE_S_PORTD_IDX 16 \ No newline at end of file diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.h b/openair2/RRC/NR/MESSAGES/asn1_msg.h index 5983014ec2..6b476f8041 100644 --- a/openair2/RRC/NR/MESSAGES/asn1_msg.h +++ b/openair2/RRC/NR/MESSAGES/asn1_msg.h @@ -79,13 +79,13 @@ uint8_t do_MIB_NR(rrc_gNB_carrier_data_t *carrier, uint8_t do_SIB1_NR(rrc_gNB_carrier_data_t *carrier,int Mod_id,int CC_id, gNB_RrcConfigurationReq *configuration); -void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id, - int CC_id, - #if defined(ENABLE_ITTI) - gNB_RrcConfigurationReq *configuration, - #endif - int initial_flag - ); +void fill_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id, + int CC_id, + #if defined(ENABLE_ITTI) + gNB_RrcConfigurationReq *configuration, + #endif + int initial_flag + ); diff --git a/openair2/UTIL/LOG/log.c b/openair2/UTIL/LOG/log.c index 9863e30193..ae678e9699 100644 --- a/openair2/UTIL/LOG/log.c +++ b/openair2/UTIL/LOG/log.c @@ -384,6 +384,7 @@ int logInit (void) register_log_component("NR_PHY","log",NR_PHY); register_log_component("MAC","log",MAC); register_log_component("NR_MAC","log",NR_MAC); + register_log_component("EMU","log",EMU); register_log_component("OPT","log",OPT); register_log_component("RLC","log",RLC); register_log_component("PDCP","log",PDCP); diff --git a/openair2/UTIL/LOG/log.h b/openair2/UTIL/LOG/log.h index d90903a88c..64c5a0d5cc 100644 --- a/openair2/UTIL/LOG/log.h +++ b/openair2/UTIL/LOG/log.h @@ -151,6 +151,7 @@ typedef enum { MIN_LOG_COMPONENTS = 0, PHY = MIN_LOG_COMPONENTS, MAC, + EMU, SIM, OCG, OMG, @@ -186,13 +187,12 @@ typedef enum { LOCALIZE, RRH, X2AP, - LOADER, - MAX_LOG_PREDEF_COMPONENTS, GNB_APP, NR_RRC, NR_MAC, NR_PHY, - MAX_LOG_COMPONENTS, + LOADER, + MAX_LOG_PREDEF_COMPONENTS, } comp_name_t; diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c index a333dbb9bb..6e10eca80e 100644 --- a/targets/RT/USER/lte-enb.c +++ b/targets/RT/USER/lte-enb.c @@ -207,7 +207,7 @@ static inline int rxtx(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, char *thread_nam // **************************************** // Common RX procedures subframe n - T(T_ENB_PHY_DL_TICK, T_INT(eNB->Mod_id), T_INT(proc->frame_tx), T_INT(proc->subframe_tx)); + T(T_GNB_PHY_DL_TICK, T_INT(eNB->Mod_id), T_INT(proc->frame_tx), T_INT(proc->subframe_tx)); // if this is IF5 or 3GPP_eNB if (eNB && eNB->RU_list && eNB->RU_list[0] && eNB->RU_list[0]->function < NGFI_RAU_IF4p5) { diff --git a/targets/RT/USER/nr-gnb.c b/targets/RT/USER/nr-gnb.c index d750d0ee4f..60650604a6 100644 --- a/targets/RT/USER/nr-gnb.c +++ b/targets/RT/USER/nr-gnb.c @@ -201,7 +201,7 @@ static inline int rxtx(PHY_VARS_gNB *gNB,gNB_rxtx_proc_t *proc, char *thread_nam // **************************************** // Common RX procedures subframe n - T(T_gNB_PHY_DL_TICK, T_INT(gNB->Mod_id), T_INT(proc->frame_tx), T_INT(proc->subframe_tx)); + T(T_GNB_PHY_DL_TICK, T_INT(gNB->Mod_id), T_INT(proc->frame_tx), T_INT(proc->subframe_tx)); /* // if this is IF5 or 3GPP_gNB if (gNB && gNB->RU_list && gNB->RU_list[0] && gNB->RU_list[0]->function < NGFI_RAU_IF4p5) { diff --git a/targets/RT/USER/nr-softmodem.c b/targets/RT/USER/nr-softmodem.c index 8bace5d0a2..7135c5e34c 100644 --- a/targets/RT/USER/nr-softmodem.c +++ b/targets/RT/USER/nr-softmodem.c @@ -929,7 +929,7 @@ int main( int argc, char **argv ) #if T_TRACER - T_init(T_port, 1-T_nowait, T_dont_fork); + T_Config_Init(); #endif @@ -939,11 +939,6 @@ int main( int argc, char **argv ) printf("configuring for RAU/RRU\n"); - - if (ouput_vcd) { - VCD_SIGNAL_DUMPER_INIT("/tmp/openair_dump_gNB.vcd"); - } - if (opp_enabled ==1) { reset_opp_meas(); } @@ -953,8 +948,8 @@ int main( int argc, char **argv ) log_set_instance_type (LOG_INSTANCE_ENB); printf("ITTI init\n"); - itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, itti_dump_file); - + itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info); + // initialize mscgen log after ITTI MSC_INIT(MSC_E_UTRAN, THREAD_MAX+TASK_MAX); #endif @@ -1285,8 +1280,6 @@ int main( int argc, char **argv ) RC.ru[ru_id]->ifdevice.trx_end_func(&RC.ru[ru_id]->ifdevice); } - if (ouput_vcd) - VCD_SIGNAL_DUMPER_CLOSE(); if (opt_enabled == 1) terminate_opt(); diff --git a/targets/RT/USER/nr-softmodem.h b/targets/RT/USER/nr-softmodem.h index 13ac6dc329..e07a041c28 100644 --- a/targets/RT/USER/nr-softmodem.h +++ b/targets/RT/USER/nr-softmodem.h @@ -163,7 +163,6 @@ {"t" , CONFIG_HLP_ULMCS, 0, uptr:&target_ul_mcs, defintval:0, TYPE_UINT, 0}, \ {"W" , CONFIG_HLP_L2MONW, 0, strptr:(char **)&in_ip, defstrval:"127.0.0.1", TYPE_STRING, sizeof(in_ip)}, \ {"P" , CONFIG_HLP_L2MONP, 0, strptr:(char **)&in_path, defstrval:"/tmp/oai_opt.pcap", TYPE_STRING, sizeof(in_path)}, \ -{"V" , CONFIG_HLP_VCD, PARAMFLAG_BOOL, iptr:&ouput_vcd, defintval:0, TYPE_INT, 0}, \ {"q" , CONFIG_HLP_STMON, PARAMFLAG_BOOL, iptr:&opp_enabled, defintval:0, TYPE_INT, 0}, \ {"S" , CONFIG_HLP_MSLOTS, PARAMFLAG_BOOL, u8ptr:&exit_missed_slots, defintval:1, TYPE_UINT8, 0}, \ {"T" , CONFIG_HLP_TDD, PARAMFLAG_BOOL, iptr:&tddflag, defintval:0, TYPE_INT, 0}, \ @@ -194,16 +193,6 @@ extern int T_port; extern int T_nowait; extern int T_dont_fork; -/*------------------------------------------------------------------------------------------------------------------------------------------*/ -/* command line parameters for TTRACE utility */ -/* optname helpstr paramflags XXXptr defXXXval type numelt */ -/*------------------------------------------------------------------------------------------------------------------------------------------*/ -#define CMDLINE_TTRACEPARAMS_DESC { \ -{"T_port", CONFIG_HLP_TPORT, 0, iptr:&T_port, defintval:0, TYPE_INT, 0}, \ -{"T_nowait", CONFIG_HLP_NOTWAIT, PARAMFLAG_BOOL, iptr:&T_nowait, defintval:0, TYPE_INT, 0}, \ -{"T_dont_fork", CONFIG_HLP_TNOFORK, PARAMFLAG_BOOL, iptr:&T_dont_fork, defintval:1, TYPE_INT, 0}, \ -} - /***************************************************************************************************************************************/ /* */