diff --git a/openair2/ENB_APP/enb_config.c b/openair2/ENB_APP/enb_config.c index 39c181319a60f0b00ff99b9105b2d1ddd98777fe..328b3206665fbf3ee6b5e1d6a07ecf8af061fac7 100644 --- a/openair2/ENB_APP/enb_config.c +++ b/openair2/ENB_APP/enb_config.c @@ -2485,8 +2485,8 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) { RC.config_file_name, i, ue_TransmissionMode); break; } - - setting_br13 = config_setting_get_member(setting_enb, ENB_CONFIG_STRING_BR); +#ifdef Rel14 + setting_br13 = config_setting_get_member(component_carrier, ENB_CONFIG_STRING_BR); if (setting_br13 != NULL) { int hyperSFN_r13; @@ -2704,11 +2704,13 @@ int RCconfig_RRC(MessageDef *msg_p, uint32_t i, eNB_RRC_INST *rrc) { else RRC_CONFIGURATION_REQ(msg_p).prach_ConfigCommon_v1310[j] = TRUE; } - else +#endif + else RRC_CONFIGURATION_REQ(msg_p).schedulingInfoSIB1_BR_r13[j] = 0; } } + setting_srb1 = config_setting_get_member (setting_enb, ENB_CONFIG_STRING_SRB1); if (setting_srb1 != NULL) { diff --git a/openair2/RRC/LITE/MESSAGES/asn1_msg.c b/openair2/RRC/LITE/MESSAGES/asn1_msg.c index 01c95845d6e8bf088923d85dc0a63e2d0753f781..3cc393261677cef35ba106aeb86d4f0ddb4995cb 100644 --- a/openair2/RRC/LITE/MESSAGES/asn1_msg.c +++ b/openair2/RRC/LITE/MESSAGES/asn1_msg.c @@ -540,7 +540,6 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier, sib1_br_1310->bandwidthReducedAccessRelatedInfo_r13->si_WindowLength_BR_r13 = configuration->si_WindowLength_BR_r13[CC_id]; // 0 - sib1_br_1310->bandwidthReducedAccessRelatedInfo_r13->si_RepetitionPattern_r13 = configuration->si_RepetitionPattern_r13[CC_id]; // 0 @@ -587,15 +586,14 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier, sib1_br_1310->bandwidthReducedAccessRelatedInfo_r13->startSymbolBR_r13 = configuration->startSymbolBR_r13[CC_id]; - sib1_br_1310->bandwidthReducedAccessRelatedInfo_r13->si_HoppingConfigCommon_r13 - = configuration->si_HoppingConfigCommon_r13[CC_id]; + + sib1_br_1310->bandwidthReducedAccessRelatedInfo_r13->si_HoppingConfigCommon_r13 = configuration->si_HoppingConfigCommon_r13[CC_id]; if (configuration->si_ValidityTime_r13[CC_id]) { sib1_br_1310->bandwidthReducedAccessRelatedInfo_r13->si_ValidityTime_r13 = calloc(1, sizeof(long)); memset(sib1_br_1310->bandwidthReducedAccessRelatedInfo_r13->si_ValidityTime_r13, 0, sizeof(long)); - *sib1_br_1310->bandwidthReducedAccessRelatedInfo_r13->si_ValidityTime_r13 - = *configuration->si_ValidityTime_r13[CC_id]; + *sib1_br_1310->bandwidthReducedAccessRelatedInfo_r13->si_ValidityTime_r13 = *configuration->si_ValidityTime_r13[CC_id]; } else sib1_br_1310->bandwidthReducedAccessRelatedInfo_r13->si_ValidityTime_r13 = NULL; @@ -650,6 +648,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier, { sib1_br_1320->freqHoppingParametersDL_r13->interval_DLHoppingConfigCommonModeB_r13->present = SystemInformationBlockType1_v1320_IEs__freqHoppingParametersDL_r13__interval_DLHoppingConfigCommonModeB_r13_PR_interval_FDD_r13; sib1_br_1320->freqHoppingParametersDL_r13->interval_DLHoppingConfigCommonModeB_r13->choice.interval_FDD_r13 = configuration->interval_DLHoppingConfigCommonModeB_r13_val[CC_id]; + } else { @@ -920,7 +919,8 @@ uint8_t do_SIB23(uint8_t Mod_id, if (configuration->rach_maxHARQ_Msg3Tx[CC_id]) { (*sib2_br)->radioResourceConfigCommon.rach_ConfigCommon.ext1->preambleTransMax_CE_r13 = calloc(1, sizeof(PreambleTransMax_t)); - *(*sib2_br)->radioResourceConfigCommon.rach_ConfigCommon.ext1->preambleTransMax_CE_r13 = configuration->rach_maxHARQ_Msg3Tx[CC_id]; // to be re-initialized when we find the enum + *(*sib2_br)->radioResourceConfigCommon.rach_ConfigCommon.ext1->preambleTransMax_CE_r13 = *configuration->preambleTransMax_CE_r13[CC_id]; // to be re-initialized when we find the enum + printf("[KOGO][DEBUGGING]: preamble trans max: %ld\n", *(*sib2_br)->radioResourceConfigCommon.rach_ConfigCommon.ext1->preambleTransMax_CE_r13); } else (*sib2_br)->radioResourceConfigCommon.rach_ConfigCommon.ext1->preambleTransMax_CE_r13 = NULL; @@ -1076,6 +1076,7 @@ uint8_t do_SIB23(uint8_t Mod_id, { (*sib2_br)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13->present = PRACH_ConfigSIB_v1310__mpdcch_startSF_CSS_RA_r13_PR_fdd_r13; (*sib2_br)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13->choice.fdd_r13 = configuration->mpdcch_startSF_CSS_RA_r13_val[CC_id]; + printf("[KOGO][DEBUGGING]: mpdcch start SF RA r13 val: %ld\n", (*sib2_br)->radioResourceConfigCommon.ext4->prach_ConfigCommon_v1310->mpdcch_startSF_CSS_RA_r13->choice.fdd_r13); } else {