Skip to content

O
OpenXG-RAN
Commit 06e9aacc authored by mohamed.said's avatar mohamed.said
Browse files
Options

fixed some br parameters in the macro definition

parent 40cbafa7
Show whitespace changes
Inline Side-by-side
Showing with 1224 additions and 1165 deletions
openair2/ENB_APP/enb_config.c
View file @ 06e9aacc
...@@ -352,102 +352,119 @@ void RCconfig_macrlc() { ...@@ -352,102 +352,119 @@ void RCconfig_macrlc() {
} }
} }
#include <stdio.h>
int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
{ {
int num_enbs = 0; int num_enbs = 0;
int num_component_carriers = 0; int num_component_carriers = 0;
int j,k = 0; int k = 0;
int32_t enb_id = 0; int32_t enb_id = 0;
int nb_cc = 0; int nb_cc = 0;
char* frame_type = NULL; int parse_errors = 0;
int32_t tdd_config = 0;
int32_t tdd_config_s = 0; int num_mme_address = 0;
int num_otg_elements = 0;
int j = 0;
int sched_info_idx = 0;
int sys_info_idx = 0;
char* prefix_type = NULL; char* if_name_s = NULL;
char* pbch_repetition = NULL; char* ipv4_s = NULL;
char* ipv4_s_remote = NULL;
int32_t eutra_band = 0; char* tr_s_preference = NULL;
int local_s_portc = 0;
int remote_s_portc = 0;
int local_s_portd = 0;
int remote_s_portd = 0;
const char* cell_type = NULL;
const char* tac = 0;
const char* enb_name = NULL;
const char* mcc = 0;
const char* mnc = 0;
char* frame_type = NULL;
int tdd_config = 0;
int tdd_config_s = 0;
const char* prefix_type = NULL;
const char* pbch_repetition = NULL;
int eutra_band = 0;
long long int downlink_frequency = 0; long long int downlink_frequency = 0;
int32_t uplink_frequency_offset = 0; int uplink_frequency_offset = 0;
int32_t Nid_cell = 0; int Nid_cell = 0;
int32_t Nid_cell_mbsfn = 0; int Nid_cell_mbsfn = 0;
int32_t N_RB_DL = 0; int N_RB_DL = 0;
int32_t nb_antenna_ports = 0; int nb_antenna_ports = 0;
int nb_antennas_tx = 0;
int32_t prach_root = 0; int nb_antennas_rx = 0;
int32_t prach_config_index = 0; int tx_gain = 0;
char* prach_high_speed = NULL; int rx_gain = 0;
int32_t prach_zero_correlation = 0; int prach_root = 0;
int32_t prach_freq_offset = 0; int prach_config_index = 0;
int32_t pucch_delta_shift = 0; const char* prach_high_speed = NULL;
int32_t pucch_nRB_CQI = 0; int prach_zero_correlation = 0;
int32_t pucch_nCS_AN = 0; int prach_freq_offset = 0;
//#if !defined(Rel10) && !defined(Rel14) int pucch_delta_shift = 0;
int32_t pucch_n1_AN = 0; int pucch_nRB_CQI = 0;
//#endif int pucch_nCS_AN = 0;
int32_t pdsch_referenceSignalPower = 0;
int32_t pdsch_p_b = 0; int pucch_n1_AN = 0;
int32_t pusch_n_SB = 0;
char * pusch_hoppingMode = NULL; int pdsch_referenceSignalPower = 0;
int32_t pusch_hoppingOffset = 0; int pdsch_p_b = 0;
char* pusch_enable64QAM = NULL; int pusch_n_SB = 0;
char* pusch_groupHoppingEnabled = NULL; const char * pusch_hoppingMode = NULL;
int32_t pusch_groupAssignment = 0; int pusch_hoppingOffset = 0;
char* pusch_sequenceHoppingEnabled = NULL; const char* pusch_enable64QAM = NULL;
int32_t pusch_nDMRS1 = 0; const char* pusch_groupHoppingEnabled = NULL;
char* phich_duration = NULL; int pusch_groupAssignment = 0;
char* phich_resource = NULL; const char* pusch_sequenceHoppingEnabled = NULL;
char* srs_enable = NULL; int pusch_nDMRS1 = 0;
int32_t srs_BandwidthConfig = 0; const char* phich_duration = NULL;
int32_t srs_SubframeConfig = 0; const char* phich_resource = NULL;
char* srs_ackNackST = NULL; const char* srs_enable = NULL;
char* srs_MaxUpPts = NULL; int srs_BandwidthConfig = 0;
int32_t pusch_p0_Nominal = 0; int srs_SubframeConfig = 0;
char* pusch_alpha = NULL; const char* srs_ackNackST = NULL;
int32_t pucch_p0_Nominal = 0; const char* srs_MaxUpPts = NULL;
int32_t msg3_delta_Preamble = 0; int pusch_p0_Nominal = 0;
//int32_t ul_CyclicPrefixLength = 0; const char* pusch_alpha = NULL;
char* pucch_deltaF_Format1 = NULL; int pucch_p0_Nominal = 0;
int msg3_delta_Preamble = 0;
//int ul_CyclicPrefixLength = 0;
const char* pucch_deltaF_Format1 = NULL;
//const char* pucch_deltaF_Format1a = NULL; //const char* pucch_deltaF_Format1a = NULL;
char* pucch_deltaF_Format1b = NULL; const char* pucch_deltaF_Format1b = NULL;
char* pucch_deltaF_Format2 = NULL; const char* pucch_deltaF_Format2 = NULL;
char* pucch_deltaF_Format2a = NULL; const char* pucch_deltaF_Format2a = NULL;
char* pucch_deltaF_Format2b = NULL; const char* pucch_deltaF_Format2b = NULL;
int32_t rach_numberOfRA_Preambles = 0; const char* rach_numberOfRA_Preambles = NULL;
char* rach_preamblesGroupAConfig = NULL; const char* rach_preamblesGroupAConfig = NULL;
int32_t rach_sizeOfRA_PreamblesGroupA = 0; int rach_sizeOfRA_PreamblesGroupA = 0;
int32_t rach_messageSizeGroupA = 0; int rach_messageSizeGroupA = 0;
char* rach_messagePowerOffsetGroupB = NULL; const char* rach_messagePowerOffsetGroupB = NULL;
int32_t rach_powerRampingStep = 0; int rach_powerRampingStep = 0;
int32_t rach_preambleInitialReceivedTargetPower = 0; int rach_preambleInitialReceivedTargetPower = 0;
int32_t rach_preambleTransMax = 0; int rach_preambleTransMax = 0;
int32_t rach_raResponseWindowSize = 0; int rach_raResponseWindowSize = 0;
int32_t rach_macContentionResolutionTimer = 0; int rach_macContentionResolutionTimer = 0;
int32_t rach_maxHARQ_Msg3Tx = 0; int rach_maxHARQ_Msg3Tx = 0;
int32_t pcch_defaultPagingCycle = 0; const char* pcch_defaultPagingCycle = 0;
char* pcch_nB = NULL;
int32_t bcch_modificationPeriodCoeff = 0; const char* pcch_nB = NULL;
int32_t ue_TimersAndConstants_t300 = 0; int bcch_modificationPeriodCoeff = 0;
int32_t ue_TimersAndConstants_t301 = 0;
int32_t ue_TimersAndConstants_t310 = 0; const char* ue_TimersAndConstants_t300 = NULL;
int32_t ue_TimersAndConstants_t311 = 0; const char* ue_TimersAndConstants_t301 = NULL;
int32_t ue_TimersAndConstants_n310 = 0; const char* ue_TimersAndConstants_t310 = NULL;
int32_t ue_TimersAndConstants_n311 = 0; const char* ue_TimersAndConstants_t311 = NULL;
int32_t ue_TransmissionMode = 0; const char* ue_TimersAndConstants_n310 = NULL;
const char* ue_TimersAndConstants_n311 = NULL;
const char* ue_TransmissionMode = NULL;
int32_t srb1_timer_poll_retransmit = 0;
int32_t srb1_timer_reordering = 0;
int32_t srb1_timer_status_prohibit = 0;
int32_t srb1_poll_pdu = 0;
int32_t srb1_poll_byte = 0;
int32_t srb1_max_retx_threshold = 0;
int32_t my_int;
int si_Narrowband_r13 = 0; int si_Narrowband_r13 = 0;
int si_TBS_r13 = 0; int si_TBS_r13 = 0;
...@@ -490,7 +507,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -490,7 +507,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
const char* sib2_interval_ULHoppingConfigCommonModeA_r13_val = NULL; const char* sib2_interval_ULHoppingConfigCommonModeA_r13_val = NULL;
const char* sib2_interval_ULHoppingConfigCommonModeB_r13 = NULL; const char* sib2_interval_ULHoppingConfigCommonModeB_r13 = NULL;
const char* sib2_interval_ULHoppingConfigCommonModeB_r13_val = NULL; const char* sib2_interval_ULHoppingConfigCommonModeB_r13_val = NULL;
libconfig_int sib2_mpdcch_pdsch_hoppingOffset_r13 = 0; int sib2_mpdcch_pdsch_hoppingOffset_r13 = 0;
const char* pdsch_maxNumRepetitionCEmodeA_r13 = NULL; const char* pdsch_maxNumRepetitionCEmodeA_r13 = NULL;
const char* pdsch_maxNumRepetitionCEmodeB_r13 = NULL; const char* pdsch_maxNumRepetitionCEmodeB_r13 = NULL;
...@@ -529,11 +546,53 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -529,11 +546,53 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
char* prach_ConfigCommon_v1310 = NULL; char* prach_ConfigCommon_v1310 = NULL;
char* mpdcch_startSF_CSS_RA_r13 = NULL; char* mpdcch_startSF_CSS_RA_r13 = NULL;
printf("[KOGO][TESTING] Start of RCConfig_RCC");
getchar();
int srb1_timer_poll_retransmit = 0;
int srb1_timer_reordering = 0;
int srb1_timer_status_prohibit = 0;
int srb1_poll_pdu = 0;
int srb1_poll_byte = 0;
int srb1_max_retx_threshold = 0;
int my_int;
const char* active_enb[MAX_ENB];
char* enb_interface_name_for_S1U = NULL;
char* enb_ipv4_address_for_S1U = NULL;
int enb_port_for_S1U = 0;
char* enb_interface_name_for_S1_MME = NULL;
char* enb_ipv4_address_for_S1_MME = NULL;
char *address = NULL;
char *cidr = NULL;
char *astring = NULL;
char* flexran_agent_interface_name = NULL;
char* flexran_agent_ipv4_address = NULL;
int flexran_agent_port = 0;
char* flexran_agent_cache = NULL;
int otg_ue_id = 0;
char* otg_app_type = NULL;
char* otg_bg_traffic = NULL;
char* glog_level = NULL;
char* glog_verbosity = NULL;
char* hw_log_level = NULL;
char* hw_log_verbosity = NULL;
char* phy_log_level = NULL;
char* phy_log_verbosity = NULL;
char* mac_log_level = NULL;
char* mac_log_verbosity = NULL;
char* rlc_log_level = NULL;
char* rlc_log_verbosity = NULL;
char* pdcp_log_level = NULL;
char* pdcp_log_verbosity = NULL;
char* rrc_log_level = NULL;
char* rrc_log_verbosity = NULL;
char* udp_log_verbosity = NULL;
char* osa_log_level = NULL;
char* osa_log_verbosity = NULL;
printf("[KOGO][TESTING] Start of RCConfig_RCC");
// for no gcc warnings // for no gcc warnings
(void)my_int; (void)my_int;
paramdef_t ENBSParams[] = ENBSPARAMS_DESC; paramdef_t ENBSParams[] = ENBSPARAMS_DESC;
...@@ -673,11 +732,10 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -673,11 +732,10 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
// Parse optional physical parameters // Parse optional physical parameters
sprintf(enbpath,"%s.[%i]",ENB_CONFIG_STRING_ENB_LIST,k), sprintf(enbpath,"%s.[%i]",ENB_CONFIG_STRING_ENB_LIST,k);
config_getlist( &CCsParamList,NULL,0,enbpath); config_getlist( &CCsParamList, NULL, 0, enbpath);
printf("[KOGO][TESTING]: CC List count: %d \n", CCsParamList.numelt); printf("[KOGO][TESTING]: CC List count: %d \n", CCsParamList.numelt);
getchar();
LOG_I(RRC,"num component carriers %d \n", num_component_carriers); LOG_I(RRC,"num component carriers %d \n", num_component_carriers);
if ( CCsParamList.numelt> 0) { if ( CCsParamList.numelt> 0) {
...@@ -699,7 +757,6 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -699,7 +757,6 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
//printf("Component carrier %d\n",component_carrier); //printf("Component carrier %d\n",component_carrier);
printf("[KOGO][TESTING]: tdd_config: %d \n",tdd_config); printf("[KOGO][TESTING]: tdd_config: %d \n",tdd_config);
getchar();
nb_cc++; nb_cc++;
RRC_CONFIGURATION_REQ (msg_p).tdd_config[j] = tdd_config; RRC_CONFIGURATION_REQ (msg_p).tdd_config[j] = tdd_config;
...@@ -728,7 +785,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -728,7 +785,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
"Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prefix_type choice: NORMAL or EXTENDED !\n", "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for prefix_type choice: NORMAL or EXTENDED !\n",
RC.config_file_name, i, prefix_type); RC.config_file_name, i, prefix_type);
} }
#ifdef Rel14 #ifdef Rel14
if (!pbch_repetition) if (!pbch_repetition)
AssertFatal(0, AssertFatal(0,
"Failed to parse eNB configuration file %s, enb %d define %s: TRUE,FALSE!\n", "Failed to parse eNB configuration file %s, enb %d define %s: TRUE,FALSE!\n",
...@@ -744,7 +801,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -744,7 +801,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
"Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pbch_repetition choice: TRUE or FALSE !\n", "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pbch_repetition choice: TRUE or FALSE !\n",
RC.config_file_name, i, pbch_repetition); RC.config_file_name, i, pbch_repetition);
} }
#endif #endif
RRC_CONFIGURATION_REQ (msg_p).eutra_band[j] = eutra_band; RRC_CONFIGURATION_REQ (msg_p).eutra_band[j] = eutra_band;
RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j] = (uint32_t) downlink_frequency; RRC_CONFIGURATION_REQ (msg_p).downlink_frequency[j] = (uint32_t) downlink_frequency;
...@@ -765,6 +822,8 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -765,6 +822,8 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
RC.config_file_name, i, N_RB_DL); RC.config_file_name, i, N_RB_DL);
} }
printf("[KOGO][DBUGGING] frame type = %s \n", frame_type);
if (strcmp(frame_type, "FDD") == 0) { if (strcmp(frame_type, "FDD") == 0) {
RRC_CONFIGURATION_REQ(msg_p).frame_type[j] = FDD; RRC_CONFIGURATION_REQ(msg_p).frame_type[j] = FDD;
} }
...@@ -902,7 +961,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -902,7 +961,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
"Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nCS_AN choice: 0..7!\n", "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_nCS_AN choice: 0..7!\n",
RC.config_file_name, i, pucch_nCS_AN); RC.config_file_name, i, pucch_nCS_AN);
#if !defined(Rel10) && !defined(Rel14) #if !defined(Rel10) && !defined(Rel14)
RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_n1_AN = pucch_n1_AN; RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pucch_n1_AN = pucch_n1_AN;
if ((pucch_n1_AN <0) || (pucch_n1_AN > 2047)) if ((pucch_n1_AN <0) || (pucch_n1_AN > 2047))
...@@ -910,7 +969,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -910,7 +969,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
"Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_n1_AN choice: 0..2047!\n", "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pucch_n1_AN choice: 0..2047!\n",
RC.config_file_name, i, pucch_n1_AN); RC.config_file_name, i, pucch_n1_AN);
#endif #endif
RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pdsch_referenceSignalPower = pdsch_referenceSignalPower; RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].pdsch_referenceSignalPower = pdsch_referenceSignalPower;
if ((pdsch_referenceSignalPower <-60) || (pdsch_referenceSignalPower > 50)) if ((pdsch_referenceSignalPower <-60) || (pdsch_referenceSignalPower > 50))
...@@ -1102,7 +1161,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -1102,7 +1161,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
"Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_p0_Nominal choice: -126..24 !\n", "Failed to parse eNB configuration file %s, enb %d unknown value \"%d\" for pusch_p0_Nominal choice: -126..24 !\n",
RC.config_file_name, i, pusch_p0_Nominal); RC.config_file_name, i, pusch_p0_Nominal);
#ifndef Rel14 #ifndef Rel14
if (strcmp(pusch_alpha, "AL0") == 0) { if (strcmp(pusch_alpha, "AL0") == 0) {
RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al0; RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al0;
} }
...@@ -1127,7 +1186,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -1127,7 +1186,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
else if (strcmp(pusch_alpha, "AL1") == 0) { else if (strcmp(pusch_alpha, "AL1") == 0) {
RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al1; RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = UplinkPowerControlCommon__alpha_al1;
} }
#else #else
if (strcmp(pusch_alpha, "AL0") == 0) { if (strcmp(pusch_alpha, "AL0") == 0) {
RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al0; RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al0;
} }
...@@ -1152,7 +1211,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -1152,7 +1211,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
else if (strcmp(pusch_alpha, "AL1") == 0) { else if (strcmp(pusch_alpha, "AL1") == 0) {
RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al1; RRC_CONFIGURATION_REQ(msg_p).radioresourceconfig[j].pusch_alpha = Alpha_r12_al1;
} }
#endif #endif
else else
AssertFatal(0, AssertFatal(0,
"Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_Alpha choice: AL0,AL04,AL05,AL06,AL07,AL08,AL09,AL1!\n", "Failed to parse eNB configuration file %s, enb %d unknown value \"%s\" for pucch_Alpha choice: AL0,AL04,AL05,AL06,AL07,AL08,AL09,AL1!\n",
...@@ -1402,8 +1461,8 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -1402,8 +1461,8 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
switch (rach_preambleTransMax) { switch (rach_preambleTransMax) {
#ifndef Rel14 #ifndef Rel14
_ case 3: case 3:
RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax= RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n3; RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax= RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n3;
break; break;
...@@ -1447,7 +1506,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -1447,7 +1506,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax= RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n200; RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax= RACH_ConfigCommon__ra_SupervisionInfo__preambleTransMax_n200;
break; break;
#else #else
case 3: case 3:
RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax= PreambleTransMax_n3; RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax= PreambleTransMax_n3;
...@@ -1492,7 +1551,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -1492,7 +1551,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
case 200: case 200:
RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax= PreambleTransMax_n200; RRC_CONFIGURATION_REQ (msg_p).radioresourceconfig[j].rach_preambleTransMax= PreambleTransMax_n200;
break; break;
#endif #endif
default: default:
AssertFatal (0, AssertFatal (0,
...@@ -1764,7 +1823,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -1764,7 +1823,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
#ifdef Rel14 //#ifdef Rel14
char brparamspath[MAX_OPTNAME_SIZE*2 + 16]; char brparamspath[MAX_OPTNAME_SIZE*2 + 16];
sprintf(brparamspath,"%s.%s",ccspath,ENB_CONFIG_STRING_COMPONENT_BR_PARAMETERS); sprintf(brparamspath,"%s.%s",ccspath,ENB_CONFIG_STRING_COMPONENT_BR_PARAMETERS);
config_get( brParams,sizeof(brParams)/sizeof(paramdef_t),brparamspath); config_get( brParams,sizeof(brParams)/sizeof(paramdef_t),brparamspath);
...@@ -3846,7 +3905,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) ...@@ -3846,7 +3905,7 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc)
}*/ }*/
#endif //#endif
//sprintf(brpath,"%s.%s.[%i].%s",enbpath,ENB_CONFIG_STRING_COMPONENT_CARRIERS,ENB_CONFIG_STRING_BR_PARAMETERS,j); //sprintf(brpath,"%s.%s.[%i].%s",enbpath,ENB_CONFIG_STRING_COMPONENT_CARRIERS,ENB_CONFIG_STRING_BR_PARAMETERS,j);
//config_get( CCsParams,sizeof(CCsParams)/sizeof(paramdef_t),ccspath); //config_get( CCsParams,sizeof(CCsParams)/sizeof(paramdef_t),ccspath);
......
openair2/ENB_APP/enb_paramdef.h
View file @ 06e9aacc
...@@ -464,7 +464,7 @@ static int DEFENBS[] = {0}; ...@@ -464,7 +464,7 @@ static int DEFENBS[] = {0};
{ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, NULL, 0, strptr:&pucch_deltaF_Format2, defstrval:"deltaF0", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, NULL, 0, strptr:&pucch_deltaF_Format2, defstrval:"deltaF0", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, NULL, 0, strptr:&pucch_deltaF_Format2a, defstrval:"deltaF0", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, NULL, 0, strptr:&pucch_deltaF_Format2a, defstrval:"deltaF0", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, NULL, 0, strptr:&pucch_deltaF_Format2b, defstrval:"deltaF0", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, NULL, 0, strptr:&pucch_deltaF_Format2b, defstrval:"deltaF0", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, NULL, 0, iptr:&rach_numberOfRA_Preambles, defintval:4, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, NULL, 0, strptr:&rach_numberOfRA_Preambles, defstrval:"n64", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, NULL, 0, strptr:&rach_preamblesGroupAConfig, defstrval:"DISABLE", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, NULL, 0, strptr:&rach_preamblesGroupAConfig, defstrval:"DISABLE", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, NULL, 0, iptr:&rach_sizeOfRA_PreamblesGroupA, defintval:0, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, NULL, 0, iptr:&rach_sizeOfRA_PreamblesGroupA, defintval:0, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, NULL, 0, iptr:&rach_messageSizeGroupA, defintval:56, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, NULL, 0, iptr:&rach_messageSizeGroupA, defintval:56, TYPE_UINT, 0}, \
...@@ -475,16 +475,16 @@ static int DEFENBS[] = {0}; ...@@ -475,16 +475,16 @@ static int DEFENBS[] = {0};
{ENB_CONFIG_STRING_RACH_RARESPONSEWINDOWSIZE, NULL, 0, iptr:&rach_raResponseWindowSize, defintval:10, TYPE_INT, 0}, \ {ENB_CONFIG_STRING_RACH_RARESPONSEWINDOWSIZE, NULL, 0, iptr:&rach_raResponseWindowSize, defintval:10, TYPE_INT, 0}, \
{ENB_CONFIG_STRING_RACH_MACCONTENTIONRESOLUTIONTIMER, NULL, 0, iptr:&rach_macContentionResolutionTimer, defintval:48, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_RACH_MACCONTENTIONRESOLUTIONTIMER, NULL, 0, iptr:&rach_macContentionResolutionTimer, defintval:48, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, NULL, 0, iptr:&rach_maxHARQ_Msg3Tx, defintval:4, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_RACH_MAXHARQMSG3TX, NULL, 0, iptr:&rach_maxHARQ_Msg3Tx, defintval:4, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_PCCH_DEFAULT_PAGING_CYCLE, NULL, 0, iptr:&pcch_defaultPagingCycle, defintval:128, TYPE_INT, 0}, \ {ENB_CONFIG_STRING_PCCH_DEFAULT_PAGING_CYCLE, NULL, 0, strptr:&pcch_defaultPagingCycle, defstrval:"rf128", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PCCH_NB, NULL, 0, strptr:&pcch_nB, defstrval:"oneT", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_PCCH_NB, NULL, 0, strptr:&pcch_nB, defstrval:"oneT", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_BCCH_MODIFICATIONPERIODCOEFF, NULL, 0, iptr:&bcch_modificationPeriodCoeff, defintval:2, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_BCCH_MODIFICATIONPERIODCOEFF, NULL, 0, iptr:&bcch_modificationPeriodCoeff, defintval:2, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_UETIMERS_T300, NULL, 0, iptr:&ue_TimersAndConstants_t300, defintval:1000, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_T300, NULL, 0, strptr:&ue_TimersAndConstants_t300, defintval:"ms1000", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UETIMERS_T301, NULL, 0, iptr:&ue_TimersAndConstants_t301, defintval:1000, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_T301, NULL, 0, strptr:&ue_TimersAndConstants_t301, defintval:"ms1000", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UETIMERS_T310, NULL, 0, iptr:&ue_TimersAndConstants_t310, defintval:1000, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_T310, NULL, 0, strptr:&ue_TimersAndConstants_t310, defintval:"ms1000", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UETIMERS_T311, NULL, 0, iptr:&ue_TimersAndConstants_t311, defintval:10000, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_T311, NULL, 0, strptr:&ue_TimersAndConstants_t311, defintval:"ms10000", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UETIMERS_N310, NULL, 0, iptr:&ue_TimersAndConstants_n310, defintval:20, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_N310, NULL, 0, strptr:&ue_TimersAndConstants_n310, defintval:"n20", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UETIMERS_N311, NULL, 0, iptr:&ue_TimersAndConstants_n311, defintval:1, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_N311, NULL, 0, strptr:&ue_TimersAndConstants_n311, defintval:"n1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UE_TRANSMISSION_MODE, NULL, 0, iptr:&ue_TransmissionMode, defintval:1, TYPE_UINT, 0} \ {ENB_CONFIG_STRING_UE_TRANSMISSION_MODE, NULL, 0, strptr:&ue_TransmissionMode, defintval:"tm1", TYPE_STRING, 0} \
} }
...@@ -580,7 +580,7 @@ static int DEFENBS[] = {0}; ...@@ -580,7 +580,7 @@ static int DEFENBS[] = {0};
{ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, NULL, 0, strptr:&pucch_deltaF_Format2, defstrval:"deltaF0", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2, NULL, 0, strptr:&pucch_deltaF_Format2, defstrval:"deltaF0", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, NULL, 0, strptr:&pucch_deltaF_Format2a, defstrval:"deltaF0", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2A, NULL, 0, strptr:&pucch_deltaF_Format2a, defstrval:"deltaF0", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, NULL, 0, strptr:&pucch_deltaF_Format2b, defstrval:"deltaF0", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_PUCCH_DELTAF_FORMAT2B, NULL, 0, strptr:&pucch_deltaF_Format2b, defstrval:"deltaF0", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, NULL, 0, iptr:&rach_numberOfRA_Preambles, defintval:4, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_RACH_NUM_RA_PREAMBLES, NULL, 0, iptr:&rach_numberOfRA_Preambles, defstrval:"n4", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, NULL, 0, strptr:&rach_preamblesGroupAConfig, defstrval:"DISABLE", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_RACH_PREAMBLESGROUPACONFIG, NULL, 0, strptr:&rach_preamblesGroupAConfig, defstrval:"DISABLE", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, NULL, 0, iptr:&rach_sizeOfRA_PreamblesGroupA, defintval:0, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_RACH_SIZEOFRA_PREAMBLESGROUPA, NULL, 0, iptr:&rach_sizeOfRA_PreamblesGroupA, defintval:0, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, NULL, 0, iptr:&rach_messageSizeGroupA, defintval:56, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_RACH_MESSAGESIZEGROUPA, NULL, 0, iptr:&rach_messageSizeGroupA, defintval:56, TYPE_UINT, 0}, \
...@@ -594,13 +594,13 @@ static int DEFENBS[] = {0}; ...@@ -594,13 +594,13 @@ static int DEFENBS[] = {0};
{ENB_CONFIG_STRING_PCCH_DEFAULT_PAGING_CYCLE, NULL, 0, iptr:&pcch_defaultPagingCycle, defintval:128, TYPE_INT, 0}, \ {ENB_CONFIG_STRING_PCCH_DEFAULT_PAGING_CYCLE, NULL, 0, iptr:&pcch_defaultPagingCycle, defintval:128, TYPE_INT, 0}, \
{ENB_CONFIG_STRING_PCCH_NB, NULL, 0, strptr:&pcch_nB, defstrval:"oneT", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_PCCH_NB, NULL, 0, strptr:&pcch_nB, defstrval:"oneT", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_BCCH_MODIFICATIONPERIODCOEFF, NULL, 0, iptr:&bcch_modificationPeriodCoeff, defintval:2, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_BCCH_MODIFICATIONPERIODCOEFF, NULL, 0, iptr:&bcch_modificationPeriodCoeff, defintval:2, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_UETIMERS_T300, NULL, 0, iptr:&ue_TimersAndConstants_t300, defintval:1000, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_T300, NULL, 0, strptr:&ue_TimersAndConstants_t300, defstrval:"ms1000", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UETIMERS_T301, NULL, 0, iptr:&ue_TimersAndConstants_t301, defintval:1000, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_T301, NULL, 0, strptr:&ue_TimersAndConstants_t301, defstrval:"ms1000", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UETIMERS_T310, NULL, 0, iptr:&ue_TimersAndConstants_t310, defintval:1000, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_T310, NULL, 0, strptr:&ue_TimersAndConstants_t310, defstrval:"ms1000", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UETIMERS_T311, NULL, 0, iptr:&ue_TimersAndConstants_t311, defintval:10000, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_T311, NULL, 0, strptr:&ue_TimersAndConstants_t311, defstrval:"ms10000", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UETIMERS_N310, NULL, 0, iptr:&ue_TimersAndConstants_n310, defintval:20, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_N310, NULL, 0, strptr:&ue_TimersAndConstants_n310, defstrval:"n20", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UETIMERS_N311, NULL, 0, iptr:&ue_TimersAndConstants_n311, defintval:1, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UETIMERS_N311, NULL, 0, strptr:&ue_TimersAndConstants_n311, defstrval:"n1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_UE_TRANSMISSION_MODE, NULL, 0, iptr:&ue_TransmissionMode, defintval:1, TYPE_UINT, 0}, \ {ENB_CONFIG_STRING_UE_TRANSMISSION_MODE, NULL, 0, strptr:&ue_TransmissionMode, defstrval:"tm1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_NUM_REPETITION_CE_MSG4_LEVEL0, NULL, 0, strptr:&pucch_NumRepetitionCE_Msg4_Level0_r13, defstrval:"n1", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_PUCCH_NUM_REPETITION_CE_MSG4_LEVEL0, NULL, 0, strptr:&pucch_NumRepetitionCE_Msg4_Level0_r13, defstrval:"n1", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_NUM_REPETITION_CE_MSG4_LEVEL1, NULL, 0, strptr:&pucch_NumRepetitionCE_Msg4_Level1_r13, defstrval:"", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_PUCCH_NUM_REPETITION_CE_MSG4_LEVEL1, NULL, 0, strptr:&pucch_NumRepetitionCE_Msg4_Level1_r13, defstrval:"", TYPE_STRING, 0}, \
{ENB_CONFIG_STRING_PUCCH_NUM_REPETITION_CE_MSG4_LEVEL2, NULL, 0, strptr:&pucch_NumRepetitionCE_Msg4_Level2_r13, defstrval:"", TYPE_STRING, 0}, \ {ENB_CONFIG_STRING_PUCCH_NUM_REPETITION_CE_MSG4_LEVEL2, NULL, 0, strptr:&pucch_NumRepetitionCE_Msg4_Level2_r13, defstrval:"", TYPE_STRING, 0}, \
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.emtc.conf
View file @ 06e9aacc
...@@ -364,9 +364,9 @@ eNBs = ...@@ -364,9 +364,9 @@ eNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0:S1-C-eNB"; ENB_INTERFACE_NAME_FOR_S1_MME = "enp0s31f6:S1-C";
ENB_IPV4_ADDRESS_FOR_S1_MME = "172.17.0.21/24"; ENB_IPV4_ADDRESS_FOR_S1_MME = "172.17.0.21/24";
ENB_INTERFACE_NAME_FOR_S1U = "eth0:S1-U-eNB"; ENB_INTERFACE_NAME_FOR_S1U = "enp0s31f6:S1-U";
ENB_IPV4_ADDRESS_FOR_S1U = "172.16.0.21/24"; ENB_IPV4_ADDRESS_FOR_S1U = "172.16.0.21/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_PORT_FOR_S1U = 2152; # Spec 2152
}; };
......
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