Skip to content

O
OpenXG-RAN
Commit 5c306f25 authored by Javier Morgade's avatar Javier Morgade
Browse files
Options

Remove CMake support for multiple 3GPP release for M2 and M3 interfaces 

	Clode cleanup: removed no longer needed src (commented code)

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)
Signed-off-by: default avatarJavier Morgade <javier.morgade@ieee.org>
parent 187baba6
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 157 deletions
cmake_targets/CMakeLists.txt
View file @ 5c306f25
...@@ -413,22 +413,10 @@ add_dependencies(S1AP_ENB rrc_flag s1ap_flag) ...@@ -413,22 +413,10 @@ add_dependencies(S1AP_ENB rrc_flag s1ap_flag)
add_list1_option(M2AP_RELEASE R14 "M2AP ASN.1 grammar version" R14) add_list1_option(M2AP_RELEASE R14 "M2AP ASN.1 grammar version" R14)
set(M2AP_DIR ${OPENAIR2_DIR}/M2AP) set(M2AP_DIR ${OPENAIR2_DIR}/M2AP)
if (${M2AP_RELEASE} STREQUAL "R8") if (${M2AP_RELEASE} STREQUAL "R14")
make_version(M2AP_VERSION 8 9 0)
set(M2AP_ASN_FILES m2ap-8.9.0.asn1)
elseif (${M2AP_RELEASE} STREQUAL "R11")
make_version(M2AP_VERSION 11 9 0)
set(M2AP_ASN_FILES m2ap-11.9.0.asn1)
elseif (${M2AP_RELEASE} STREQUAL "R12")
make_version(M2AP_VERSION 12 9 0)
set(M2AP_ASN_FILES m2ap-12.9.0.asn1)
elseif (${M2AP_RELEASE} STREQUAL "R14")
make_version(M2AP_VERSION 14 0 0) make_version(M2AP_VERSION 14 0 0)
set(M2AP_ASN_FILES m2ap-14.0.0.asn1) set(M2AP_ASN_FILES m2ap-14.0.0.asn1)
elseif (${M2AP_RELEASE} STREQUAL "R15") endif(${M2AP_RELEASE} STREQUAL "R14")
make_version(M2AP_VERSION 15 1 0)
set(M2AP_ASN_FILES m2ap-15.1.0.asn1)
endif(${M2AP_RELEASE} STREQUAL "R8")
add_definitions(-DM2AP_VERSION=${M2AP_VERSION}) add_definitions(-DM2AP_VERSION=${M2AP_VERSION})
set(M2AP_ASN_DIR ${M2AP_DIR}/MESSAGES/ASN1/${M2AP_RELEASE}) set(M2AP_ASN_DIR ${M2AP_DIR}/MESSAGES/ASN1/${M2AP_RELEASE})
set(M2AP_C_DIR ${asn1_generated_dir}/M2AP_${M2AP_RELEASE}) set(M2AP_C_DIR ${asn1_generated_dir}/M2AP_${M2AP_RELEASE})
...@@ -483,22 +471,10 @@ add_dependencies(M2AP_ENB rrc_flag m2_flag) ...@@ -483,22 +471,10 @@ add_dependencies(M2AP_ENB rrc_flag m2_flag)
add_list1_option(M3AP_RELEASE R14 "M3AP ASN.1 grammar version" R14) add_list1_option(M3AP_RELEASE R14 "M3AP ASN.1 grammar version" R14)
set(M3AP_DIR ${OPENAIR3_DIR}/M3AP) set(M3AP_DIR ${OPENAIR3_DIR}/M3AP)
if (${M3AP_RELEASE} STREQUAL "R8") if (${M3AP_RELEASE} STREQUAL "R14")
make_version(M3AP_VERSION 8 9 0)
set(M3AP_ASN_FILES m3ap-8.9.0.asn1)
elseif (${M3AP_RELEASE} STREQUAL "R11")
make_version(M3AP_VERSION 11 9 0)
set(M3AP_ASN_FILES m3ap-11.9.0.asn1)
elseif (${M3AP_RELEASE} STREQUAL "R12")
make_version(M3AP_VERSION 12 9 0)
set(M3AP_ASN_FILES m3ap-12.9.0.asn1)
elseif (${M3AP_RELEASE} STREQUAL "R14")
make_version(M3AP_VERSION 14 0 0) make_version(M3AP_VERSION 14 0 0)
set(M3AP_ASN_FILES m3ap-14.0.0.asn1) set(M3AP_ASN_FILES m3ap-14.0.0.asn1)
elseif (${M3AP_RELEASE} STREQUAL "R15") endif(${M3AP_RELEASE} STREQUAL "R14")
make_version(M3AP_VERSION 15 1 0)
set(M3AP_ASN_FILES m3ap-15.1.0.asn1)
endif(${M3AP_RELEASE} STREQUAL "R8")
add_definitions(-DM3AP_VERSION=${M3AP_VERSION}) add_definitions(-DM3AP_VERSION=${M3AP_VERSION})
set(M3AP_ASN_DIR ${M3AP_DIR}/MESSAGES/ASN1/${M3AP_RELEASE}) set(M3AP_ASN_DIR ${M3AP_DIR}/MESSAGES/ASN1/${M3AP_RELEASE})
set(M3AP_C_DIR ${asn1_generated_dir}/M3AP_${M3AP_RELEASE}) set(M3AP_C_DIR ${asn1_generated_dir}/M3AP_${M3AP_RELEASE})
......
openair2/COMMON/m2ap_messages_types.h
View file @ 5c306f25
...@@ -139,102 +139,6 @@ typedef struct m2ap_setup_req_s { ...@@ -139,102 +139,6 @@ typedef struct m2ap_setup_req_s {
uint16_t num_mbms_configuration_data_list; uint16_t num_mbms_configuration_data_list;
//
// /* The type of the cell */
// enum cell_type_e cell_type;
//
// /// number of DU cells available
// uint16_t num_cells_available; //0< num_cells_available <= 512;
//
// //
// uint16_t num_mbms_available;
//
// // Served Cell Information
// /* Tracking area code */
// uint16_t tac[M2AP_MAX_NB_CELLS];
//
// /* Mobile Country Codes
// * Mobile Network Codes
// */
// uint16_t mcc[M2AP_MAX_NB_CELLS];//[6];
// uint16_t mnc[M2AP_MAX_NB_CELLS];//[6];
// uint8_t mnc_digit_length[M2AP_MAX_NB_CELLS];//[6];
//
// // NR Global Cell Id
// uint64_t nr_cellid[M2AP_MAX_NB_CELLS];
// // NR Physical Cell Ids
// uint16_t nr_pci[M2AP_MAX_NB_CELLS];
// // Number of slide support items (max 16, could be increased to as much as 1024)
// uint16_t num_ssi[M2AP_MAX_NB_CELLS];//[6];
// uint8_t sst[M2AP_MAX_NB_CELLS];//[16][6];
// uint8_t sd[M2AP_MAX_NB_CELLS];//[16][6];
// // fdd_flag = 1 means FDD, 0 means TDD
// int fdd_flag;
//
// /* eCGI->eCGI.pLMN_Identity */
// uint16_t plmn_identity[M2AP_MAX_NB_CELLS];
// /* eCGI->eCGI.eUTRANcellIdentifier */
// uint16_t eutran_cell_identifier[M2AP_MAX_NB_CELLS];
//
// /* M2AP_MBSFN_SynchronisationArea_ID_t */
// long mbsfn_synchronization_area[M2AP_MAX_NB_CELLS];
//
// uint16_t service_area_id[M2AP_MAX_NB_CELLS][4];
//
// union {
// struct {
// uint32_t ul_nr_arfcn;
// uint8_t ul_scs;
// uint8_t ul_nrb;
//
// uint32_t dl_nr_arfcn;
// uint8_t dl_scs;
// uint8_t dl_nrb;
//
// uint32_t sul_active;
// uint32_t sul_nr_arfcn;
// uint8_t sul_scs;
// uint8_t sul_nrb;
//
// uint8_t ul_num_frequency_bands;
// uint16_t ul_nr_band[32];
// uint8_t ul_num_sul_frequency_bands;
// uint16_t ul_nr_sul_band[32];
//
// uint8_t dl_num_frequency_bands;
// uint16_t dl_nr_band[32];
// uint8_t dl_num_sul_frequency_bands;
// uint16_t dl_nr_sul_band[32];
// } fdd;
// struct {
//
// uint32_t nr_arfcn;
// uint8_t scs;
// uint8_t nrb;
//
// uint32_t sul_active;
// uint32_t sul_nr_arfcn;
// uint8_t sul_scs;
// uint8_t sul_nrb;
//
// uint8_t num_frequency_bands;
// uint16_t nr_band[32];
// uint8_t num_sul_frequency_bands;
// uint16_t nr_sul_band[32];
//
// } tdd;
// } nr_mode_info[M2AP_MAX_NB_CELLS];
//
// char *measurement_timing_information[M2AP_MAX_NB_CELLS];
// uint8_t ranac[M2AP_MAX_NB_CELLS];
//
// // System Information
// uint8_t *mib[M2AP_MAX_NB_CELLS];
// int mib_length[M2AP_MAX_NB_CELLS];
// uint8_t *sib1[M2AP_MAX_NB_CELLS];
// int sib1_length[M2AP_MAX_NB_CELLS];
} m2ap_setup_req_t; } m2ap_setup_req_t;
......
openair2/ENB_APP/enb_config.c
View file @ 5c306f25
...@@ -2242,20 +2242,6 @@ int RCconfig_M2(MessageDef *msg_p, uint32_t i) { ...@@ -2242,20 +2242,6 @@ int RCconfig_M2(MessageDef *msg_p, uint32_t i) {
M2AP_REGISTER_ENB_REQ (msg_p).tac = *ENBParamList.paramarray[k][ENB_TRACKING_AREA_CODE_IDX].uptr; M2AP_REGISTER_ENB_REQ (msg_p).tac = *ENBParamList.paramarray[k][ENB_TRACKING_AREA_CODE_IDX].uptr;
config_getlist(&PLMNParamList, PLMNParams, sizeof(PLMNParams)/sizeof(paramdef_t), aprefix); config_getlist(&PLMNParamList, PLMNParams, sizeof(PLMNParams)/sizeof(paramdef_t), aprefix);
// char aprefix2[MAX_OPTNAME_SIZE*80 + 8];
// sprintf(aprefix2,"%s.[%i].%s.[0]",ENB_CONFIG_STRING_ENB_LIST,k,ENB_CONFIG_STRING_MBMS_CONFIGURATION_DATA_LIST);
// config_getlist(&MBMSParamList, MBMSParams, sizeof(MBMSParams)/sizeof(paramdef_t), aprefix2);
// if (MBMSParamList.numelt < 1 || MBMSParamList.numelt > 8)
// AssertFatal(0, "The number of MBMS Areas must be in [1,8], but is %d\n",
// MBMSParamList.numelt);
// M2AP_REGISTER_ENB_REQ (msg_p).num_mbms_service_area_list = MBMSParamList.numelt;
// for(J=0; J<MBMSParamList.numelt;J++){
// M2AP_REGISTER_ENB_REQ (msg_p).mbms_service_area_list[J] = *MBMSParamList.paramarray[J][ENB_MBMS_SERVICE_AREA_IDX].uptr;
// }
//
char aprefix2[MAX_OPTNAME_SIZE*80 + 8]; char aprefix2[MAX_OPTNAME_SIZE*80 + 8];
sprintf(aprefix2,"%s.[%i]",ENB_CONFIG_STRING_ENB_LIST,k); sprintf(aprefix2,"%s.[%i]",ENB_CONFIG_STRING_ENB_LIST,k);
config_getlist(&MBMSConfigParamList, MBMSConfigParams, sizeof(MBMSConfigParams)/sizeof(paramdef_t), aprefix2); config_getlist(&MBMSConfigParamList, MBMSConfigParams, sizeof(MBMSConfigParams)/sizeof(paramdef_t), aprefix2);
...@@ -2358,25 +2344,6 @@ int RCconfig_M2(MessageDef *msg_p, uint32_t i) { ...@@ -2358,25 +2344,6 @@ int RCconfig_M2(MessageDef *msg_p, uint32_t i) {
M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6 = 1; M2AP_REGISTER_ENB_REQ (msg_p).target_mce_m2_ip_address[l].ipv6 = 1;
} }
} }
// timers
//{
// int t_reloc_prep = 0;
// int tx2_reloc_overall = 0;
// paramdef_t p[] = {
// { "t_reloc_prep", "t_reloc_prep", 0, iptr:&t_reloc_prep, defintval:0, TYPE_INT, 0 },
// { "tx2_reloc_overall", "tx2_reloc_overall", 0, iptr:&tx2_reloc_overall, defintval:0, TYPE_INT, 0 }
// };
// config_get(p, sizeof(p)/sizeof(paramdef_t), aprefix);
// if (t_reloc_prep <= 0 || t_reloc_prep > 10000 ||
// tx2_reloc_overall <= 0 || tx2_reloc_overall > 20000) {
// LOG_E(M2AP, "timers in configuration file have wrong values. We must have [0 < t_reloc_prep <= 10000] and [0 < tx2_reloc_overall <= 20000]\n");
// exit(1);
// }
// M2AP_REGISTER_ENB_REQ (msg_p).t_reloc_prep = t_reloc_prep;
// M2AP_REGISTER_ENB_REQ (msg_p).tx2_reloc_overall = tx2_reloc_overall;
//}
// SCTP SETTING // SCTP SETTING
M2AP_REGISTER_ENB_REQ (msg_p).sctp_out_streams = SCTP_OUT_STREAMS; M2AP_REGISTER_ENB_REQ (msg_p).sctp_out_streams = SCTP_OUT_STREAMS;
M2AP_REGISTER_ENB_REQ (msg_p).sctp_in_streams = SCTP_IN_STREAMS; M2AP_REGISTER_ENB_REQ (msg_p).sctp_in_streams = SCTP_IN_STREAMS;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment