diff --git a/openair2/GNB_APP/MACRLC_nr_paramdef.h b/openair2/GNB_APP/MACRLC_nr_paramdef.h index 26e05f114b..ee06a90c09 100644 --- a/openair2/GNB_APP/MACRLC_nr_paramdef.h +++ b/openair2/GNB_APP/MACRLC_nr_paramdef.h @@ -11,6 +11,8 @@ /*----------------------------------------------------------------------------------------------------------------------------------------------------*/ +/* MACRLC configuration section names */ +#define CONFIG_STRING_MACRLC_LIST "MACRLCs" /* MACRLC configuration parameters names */ #define CONFIG_STRING_MACRLC_CC "num_cc" diff --git a/openair2/GNB_APP/gnb_paramdef.h b/openair2/GNB_APP/gnb_paramdef.h index 65f6dda1ca..8265303969 100644 --- a/openair2/GNB_APP/gnb_paramdef.h +++ b/openair2/GNB_APP/gnb_paramdef.h @@ -645,49 +645,6 @@ typedef enum { #define CONFIG_STRING_L1_LIST "L1s" -/*----------------------------------------------------------------------------------------------------------------------------------------------------*/ -/*----------------------------------------------------------------------------------------------------------------------------------------------------*/ -/* MACRLC configuration section names */ -#define CONFIG_STRING_MACRLC_LIST "MACRLCs" - - -/* MACRLC configuration parameters names */ -#define CONFIG_STRING_MACRLC_CC "num_cc" -#define CONFIG_STRING_MACRLC_TRANSPORT_N_PREFERENCE "tr_n_preference" -#define CONFIG_STRING_MACRLC_LOCAL_N_ADDRESS "local_n_address" -#define CONFIG_STRING_MACRLC_REMOTE_N_ADDRESS "remote_n_address" -#define CONFIG_STRING_MACRLC_LOCAL_N_PORTC "local_n_portc" -#define CONFIG_STRING_MACRLC_REMOTE_N_PORTC "remote_n_portc" -#define CONFIG_STRING_MACRLC_LOCAL_N_PORTD "local_n_portd" -#define CONFIG_STRING_MACRLC_REMOTE_N_PORTD "remote_n_portd" -#define CONFIG_STRING_MACRLC_TRANSPORT_S_PREFERENCE "tr_s_preference" -#define CONFIG_STRING_MACRLC_TRANSPORT_S_SHM_PREFIX "tr_s_shm_prefix" -#define CONFIG_STRING_MACRLC_TRANSPORT_S_POLL_CORE "tr_s_poll_core" -#define CONFIG_STRING_MACRLC_LOCAL_S_ADDRESS "local_s_address" -#define CONFIG_STRING_MACRLC_REMOTE_S_ADDRESS "remote_s_address" -#define CONFIG_STRING_MACRLC_LOCAL_S_PORTC "local_s_portc" -#define CONFIG_STRING_MACRLC_REMOTE_S_PORTC "remote_s_portc" -#define CONFIG_STRING_MACRLC_LOCAL_S_PORTD "local_s_portd" -#define CONFIG_STRING_MACRLC_REMOTE_S_PORTD "remote_s_portd" - - -#define MACRLC_CC_IDX 0 -#define MACRLC_TRANSPORT_N_PREFERENCE_IDX 1 -#define MACRLC_LOCAL_N_ADDRESS_IDX 2 -#define MACRLC_REMOTE_N_ADDRESS_IDX 3 -#define MACRLC_LOCAL_N_PORTC_IDX 4 -#define MACRLC_REMOTE_N_PORTC_IDX 5 -#define MACRLC_LOCAL_N_PORTD_IDX 6 -#define MACRLC_REMOTE_N_PORTD_IDX 7 -#define MACRLC_TRANSPORT_S_PREFERENCE_IDX 8 -#define MACRLC_LOCAL_S_ADDRESS_IDX 9 -#define MACRLC_REMOTE_S_ADDRESS_IDX 10 -#define MACRLC_LOCAL_S_PORTC_IDX 11 -#define MACRLC_REMOTE_S_PORTC_IDX 12 -#define MACRLC_LOCAL_S_PORTD_IDX 13 -#define MACRLC_REMOTE_S_PORTD_IDX 14 -#define MACRLC_SCHED_MODE_IDX 15 - /*----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/ /* security configuration */ /*----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/