From 7aa35e874b193c2d8ff143c52d24bbc4a68ddf23 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Fri, 10 Jan 2020 15:38:13 +0100 Subject: [PATCH] Removing obsolete LTE_RRC_VERSION Signed-off-by: Raphael Defosseux --- openair1/PHY/INIT/lte_init.c | 2 - openair1/PHY/LTE_TRANSPORT/dci_tools.c | 2 - openair1/PHY/LTE_TRANSPORT/transport_eNB.h | 2 - openair2/LAYER2/MAC/config.c | 2 - openair2/LAYER2/MAC/mac.h | 4 - openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c | 35 +++---- openair2/RRC/LTE/rrc_UE.c | 17 +-- openair2/RRC/LTE/rrc_eNB_M2AP.c | 114 +++------------------ 8 files changed, 28 insertions(+), 150 deletions(-) diff --git a/openair1/PHY/INIT/lte_init.c b/openair1/PHY/INIT/lte_init.c index 4736ae765e..2d65521ab3 100644 --- a/openair1/PHY/INIT/lte_init.c +++ b/openair1/PHY/INIT/lte_init.c @@ -329,9 +329,7 @@ void phy_config_update_sib13_request(PHY_Config_t *phy_config) { } lte_gold_mbsfn (fp, RC.eNB[Mod_id][CC_id]->lte_gold_mbsfn_table, fp->Nid_cell_mbsfn); -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) lte_gold_mbsfn_khz_1dot25 (fp, RC.eNB[Mod_id][CC_id]->lte_gold_mbsfn_khz_1dot25_table, fp->Nid_cell_mbsfn); -#endif } void phy_config_sib13_eNB(module_id_t Mod_id,int CC_id,int mbsfn_Area_idx, diff --git a/openair1/PHY/LTE_TRANSPORT/dci_tools.c b/openair1/PHY/LTE_TRANSPORT/dci_tools.c index 2b6d998b73..ce409de131 100644 --- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c +++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c @@ -2014,10 +2014,8 @@ void fill_ulsch(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_ulsch_pdu *ulsch_pdu ulsch->harq_processes[harq_pid]->frame = frame; ulsch->harq_processes[harq_pid]->subframe = subframe; ulsch->harq_processes[harq_pid]->handled = 0; -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) ulsch->harq_processes[harq_pid]->repetition_number = ulsch_pdu->ulsch_pdu_rel13.repetition_number ; ulsch->harq_processes[harq_pid]->total_number_of_repetitions = ulsch_pdu->ulsch_pdu_rel13.total_number_of_repetitions ; -#endif ulsch->harq_processes[harq_pid]->first_rb = ulsch_pdu->ulsch_pdu_rel8.resource_block_start; ulsch->harq_processes[harq_pid]->nb_rb = ulsch_pdu->ulsch_pdu_rel8.number_of_resource_blocks; ulsch->harq_processes[harq_pid]->dci_alloc = 1; diff --git a/openair1/PHY/LTE_TRANSPORT/transport_eNB.h b/openair1/PHY/LTE_TRANSPORT/transport_eNB.h index a80023c744..7b9004ba80 100644 --- a/openair1/PHY/LTE_TRANSPORT/transport_eNB.h +++ b/openair1/PHY/LTE_TRANSPORT/transport_eNB.h @@ -314,12 +314,10 @@ typedef struct { // int calibration_flag; /// delta_TF for power control int32_t delta_TF; -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) // PUSCH Repetition Number for the current SF uint32_t repetition_number ; // PUSCH Total number of repetitions uint32_t total_number_of_repetitions; -#endif } LTE_UL_eNB_HARQ_t; typedef struct { diff --git a/openair2/LAYER2/MAC/config.c b/openair2/LAYER2/MAC/config.c index 7eb323abab..76c8e33b16 100644 --- a/openair2/LAYER2/MAC/config.c +++ b/openair2/LAYER2/MAC/config.c @@ -703,9 +703,7 @@ config_sib13( int Mod_id, // } // lte_gold_mbsfn (fp, RC.eNB[Mod_id][CC_id]->lte_gold_mbsfn_table, fp->Nid_cell_mbsfn); // -//#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) // lte_gold_mbsfn_khz_1dot25 (fp, RC.eNB[Mod_id][CC_id]->lte_gold_mbsfn_khz_1dot25_table, fp->Nid_cell_mbsfn); -//#endif // PHY_Config_t phycfg; phycfg.Mod_id = Mod_id; diff --git a/openair2/LAYER2/MAC/mac.h b/openair2/LAYER2/MAC/mac.h index d81010c267..ac9819cfe2 100644 --- a/openair2/LAYER2/MAC/mac.h +++ b/openair2/LAYER2/MAC/mac.h @@ -906,10 +906,8 @@ typedef struct { uint16_t mpdcch_repetition_cnt; frame_t Msg2_frame; sub_frame_t Msg2_subframe; -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) /// Repetition column in pusch_repetition Table 8.2.b in TS36.213 uint8_t pusch_repetition_levels; -#endif LTE_PhysicalConfigDedicated_t *physicalConfigDedicated; } UE_TEMPLATE; @@ -1117,10 +1115,8 @@ typedef struct { uint8_t msg2_narrowband; uint8_t msg34_narrowband; int msg4_rrc_sdu_length; -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) /// Repetition column in pusch_repetition Table 8.2.b in TS36.213 uint8_t pusch_repetition_levels; -#endif int32_t crnti_rrc_mui; int8_t crnti_harq_pid; } RA_t; diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c index 8ee8cdc1c0..c3d872d493 100644 --- a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c +++ b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c @@ -92,11 +92,9 @@ tbs_size_t mac_rlc_data_req( const MBMS_flag_t MBMS_flagP, const logical_chan_id_t channel_idP, const tb_size_t tb_sizeP, - char *buffer_pP -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) - ,const uint32_t sourceL2Id - ,const uint32_t destinationL2Id -#endif + char *buffer_pP, + const uint32_t sourceL2Id, + const uint32_t destinationL2Id ) { int ret; @@ -147,11 +145,9 @@ mac_rlc_status_resp_t mac_rlc_status_ind( const eNB_flag_t enb_flagP, const MBMS_flag_t MBMS_flagP, const logical_chan_id_t channel_idP, - const tb_size_t tb_sizeP -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) - ,const uint32_t sourceL2Id - ,const uint32_t destinationL2Id -#endif + const tb_size_t tb_sizeP, + const uint32_t sourceL2Id, + const uint32_t destinationL2Id ) { nr_rlc_ue_t *ue; @@ -210,11 +206,9 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP, const mui_t muiP, confirm_t confirmP, sdu_size_t sdu_sizeP, - mem_block_t *sdu_pP -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) - ,const uint32_t *const sourceL2Id - ,const uint32_t *const destinationL2Id -#endif + mem_block_t *sdu_pP, + const uint32_t *const sourceL2Id, + const uint32_t *const destinationL2Id ) { int rnti = ctxt_pP->rnti; @@ -754,13 +748,10 @@ static void add_drb(int rnti, struct LTE_DRB_ToAddMod *s) rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP, const LTE_SRB_ToAddModList_t * const srb2add_listP, const LTE_DRB_ToAddModList_t * const drb2add_listP, - const LTE_DRB_ToReleaseList_t * const drb2release_listP -#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0)) - ,const LTE_PMCH_InfoList_r9_t * const pmch_InfoList_r9_pP - ,const uint32_t sourceL2Id - ,const uint32_t destinationL2Id -#endif - ) + const LTE_DRB_ToReleaseList_t * const drb2release_listP, + const LTE_PMCH_InfoList_r9_t * const pmch_InfoList_r9_pP, + const uint32_t sourceL2Id, + const uint32_t destinationL2Id) { int rnti = ctxt_pP->rnti; int i; diff --git a/openair2/RRC/LTE/rrc_UE.c b/openair2/RRC/LTE/rrc_UE.c index 9383a726fb..e2030e9da3 100644 --- a/openair2/RRC/LTE/rrc_UE.c +++ b/openair2/RRC/LTE/rrc_UE.c @@ -3624,9 +3624,7 @@ int decode_SI( const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index ) { rrc_mac_config_req_ue(ctxt_pP->module_id, 0, eNB_index, (LTE_RadioResourceConfigCommonSIB_t *)NULL, (struct LTE_PhysicalConfigDedicated *)NULL, -#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0)) (LTE_SCellToAddMod_r10_t *)NULL, -#endif (LTE_MeasObjectToAddMod_t **)NULL, (LTE_MAC_MainConfig_t *)NULL, 0, @@ -3640,27 +3638,18 @@ int decode_SI( const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index ) { NULL, NULL, UE_rrc_inst[ctxt_pP->module_id].sib2[eNB_index]->mbsfn_SubframeConfigList -#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0)) ,0, (LTE_MBSFN_AreaInfoList_r9_t *)NULL, - (LTE_PMCH_InfoList_r9_t *)NULL -#endif + (LTE_PMCH_InfoList_r9_t *)NULL, #ifdef CBA - ,0, - 0 + 0,0, #endif -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) - , 0, NULL, - NULL -#endif -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) - , + NULL, 0, (struct LTE_NonMBSFN_SubframeConfig_r14 *)NULL, (LTE_MBSFN_AreaInfoList_r9_t *)NULL -#endif ); } diff --git a/openair2/RRC/LTE/rrc_eNB_M2AP.c b/openair2/RRC/LTE/rrc_eNB_M2AP.c index ac68bbcbcd..5ef4e6e249 100644 --- a/openair2/RRC/LTE/rrc_eNB_M2AP.c +++ b/openair2/RRC/LTE/rrc_eNB_M2AP.c @@ -52,7 +52,6 @@ rrc_M2AP_openair_rrc_top_init_MBMS(int eMBMS_active){ LOG_D(RRC, "[OPENAIR][INIT] Init function start: NB_eNB_INST=%d\n", RC.nb_inst); if (RC.nb_inst > 0) { -#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0)) LOG_I(RRC,"[eNB] eMBMS active state is %d \n", eMBMS_active); for (module_id=0; module_idcarrier[CC_id].MBMS_flag = (uint8_t)eMBMS_active; } } - -#endif } } @@ -222,9 +219,7 @@ static void rrc_M2AP_init_MBMS( NULL, // LTE_DRB_ToAddModList NULL, // DRB_ToReleaseList &(RC.rrc[enb_mod_idP]->carrier[CC_id].mcch_message->pmch_InfoList_r9) -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) ,0, 0 -#endif ); } //rrc_mac_config_req(); @@ -280,15 +275,11 @@ static void rrc_M2AP_init_MCCH( if (NODE_IS_MONOLITHIC(rrc->node_type)) { rrc_mac_config_req_eNB(enb_mod_idP, CC_id, 0,0,0,0,0, -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) 0, -#endif 0,//rnti (LTE_BCCH_BCH_Message_t *)NULL, (LTE_RadioResourceConfigCommonSIB_t *) NULL, -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) (LTE_RadioResourceConfigCommonSIB_t *) NULL, -#endif (struct LTE_PhysicalConfigDedicated *)NULL, (LTE_SCellToAddMod_r10_t *)NULL, //(struct LTE_PhysicalConfigDedicatedSCell_r10 *)NULL, @@ -304,20 +295,14 @@ static void rrc_M2AP_init_MCCH( , 0, (LTE_MBSFN_AreaInfoList_r9_t *) NULL, - (LTE_PMCH_InfoList_r9_t *) & (RC.rrc[enb_mod_idP]->carrier[CC_id].mcch_message->pmch_InfoList_r9) -#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0)) - , - (LTE_SystemInformationBlockType1_v1310_IEs_t *)NULL -#endif -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) - , + (LTE_PMCH_InfoList_r9_t *) & (RC.rrc[enb_mod_idP]->carrier[CC_id].mcch_message->pmch_InfoList_r9), + (LTE_SystemInformationBlockType1_v1310_IEs_t *)NULL, 0, (LTE_BCCH_DL_SCH_Message_MBMS_t *) NULL, (LTE_SchedulingInfo_MBMS_r14_t *) NULL, (struct LTE_NonMBSFN_SubframeConfig_r14 *) NULL, (LTE_SystemInformationBlockType1_MBMS_r14_t *) NULL, (LTE_MBSFN_AreaInfoList_r9_t *) NULL -#endif ); } @@ -343,14 +328,12 @@ static void rrc_M2AP_init_MCCH( // // LTE_BCCH_DL_SCH_Message_t *bcch_message = &RC.rrc[Mod_id]->carrier[CC_id].systemInformation; // -//#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) // if (ctxt_pP->brOption) { // buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB1_BR; // bcch_message = &RC.rrc[Mod_id]->carrier[CC_id].siblock1_BR; // sib1 = &RC.rrc[Mod_id]->carrier[CC_id].sib1_BR; // } // else -//#endif // { // buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB1; // bcch_message = &RC.rrc[Mod_id]->carrier[CC_id].siblock1; @@ -409,11 +392,9 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2( rrc_eNB_carrier_data_t *carrier=&rrc->carrier[CC_id]; -#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0)) //struct LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member *sib13_part=NULL; LTE_MBSFN_SubframeConfigList_t *MBSFNSubframeConfigList/*,*MBSFNSubframeConfigList_copy*/; //LTE_MBSFN_AreaInfoList_r9_t *MBSFNArea_list/*,*MBSFNArea_list_copy*/; -#endif asn_enc_rval_t enc_rval; @@ -422,15 +403,12 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2( LTE_SystemInformationBlockType2_t **sib2; -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) if(ctxt_pP->brOption){ buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB23_BR; sib2 = &RC.rrc[Mod_id]->carrier[CC_id].sib2_BR; LOG_I(RRC,"Running SIB2/3 Encoding for eMTC\n"); - }else -#endif - { + } else { buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB23; sib2 = &RC.rrc[Mod_id]->carrier[CC_id].sib2; } @@ -568,15 +546,11 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2( if (NODE_IS_MONOLITHIC(rrc->node_type)) { rrc_mac_config_req_eNB(ctxt_pP->module_id, CC_id, 0,0,0,0,0, -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) 0, -#endif 0,//rnti (LTE_BCCH_BCH_Message_t *)NULL, (LTE_RadioResourceConfigCommonSIB_t *) NULL, -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) (LTE_RadioResourceConfigCommonSIB_t *) NULL, -#endif (struct LTE_PhysicalConfigDedicated *)NULL, (LTE_SCellToAddMod_r10_t *)NULL, //(struct LTE_PhysicalConfigDedicatedSCell_r10 *)NULL, @@ -593,20 +567,14 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2( (LTE_MBSFN_SubframeConfigList_t *) carrier->sib2->mbsfn_SubframeConfigList, carrier->MBMS_flag, (LTE_MBSFN_AreaInfoList_r9_t *) NULL, - (LTE_PMCH_InfoList_r9_t *) NULL -#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0)) - , - (LTE_SystemInformationBlockType1_v1310_IEs_t *)NULL -#endif -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) - , + (LTE_PMCH_InfoList_r9_t *) NULL, + (LTE_SystemInformationBlockType1_v1310_IEs_t *)NULL, 0, (LTE_BCCH_DL_SCH_Message_MBMS_t *) NULL, (LTE_SchedulingInfo_MBMS_r14_t *) NULL, (struct LTE_NonMBSFN_SubframeConfig_r14 *) NULL, (LTE_SystemInformationBlockType1_MBMS_r14_t *) NULL, (LTE_MBSFN_AreaInfoList_r9_t *) NULL -#endif ); } @@ -627,11 +595,9 @@ static uint8_t rrc_M2AP_do_SIB23_SIB13( rrc_eNB_carrier_data_t *carrier=&rrc->carrier[CC_id]; -#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0)) struct LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member *sib13_part=NULL; //LTE_MBSFN_SubframeConfigList_t *MBSFNSubframeConfigList; LTE_MBSFN_AreaInfoList_r9_t *MBSFNArea_list; -#endif asn_enc_rval_t enc_rval; @@ -640,21 +606,15 @@ static uint8_t rrc_M2AP_do_SIB23_SIB13( LTE_SystemInformationBlockType2_t **sib2; -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) if(ctxt_pP->brOption){ buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB23_BR; sib2 = &RC.rrc[Mod_id]->carrier[CC_id].sib2_BR; - LOG_I(RRC,"Running SIB2/3 Encoding for eMTC\n"); - - }else -#endif - { + LOG_I(RRC,"Running SIB2/3 Encoding for eMTC\n"); + } else { buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB23; sib2 = &RC.rrc[Mod_id]->carrier[CC_id].sib2; } - - if (bcch_message) { //memset(bcch_message,0,sizeof(LTE_BCCH_DL_SCH_Message_t)); } else { @@ -701,20 +661,15 @@ static uint8_t rrc_M2AP_do_SIB23_SIB13( }*/ -#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0)) LTE_SystemInformationBlockType13_r9_t **sib13 = &RC.rrc[Mod_id]->carrier[CC_id].sib13; -#endif struct LTE_MBSFN_AreaInfo_r9 *MBSFN_Area1/*, *MBSFN_Area2*/; -#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0)) sib13_part = CALLOC(1,sizeof(struct LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member)); memset(sib13_part,0,sizeof(struct LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member)); sib13_part->present = LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib13_v920; *sib13 = &sib13_part->choice.sib13_v920; -#endif -#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0)) (*sib13)->notificationConfig_r9.notificationRepetitionCoeff_r9=LTE_MBMS_NotificationConfig_r9__notificationRepetitionCoeff_r9_n2; (*sib13)->notificationConfig_r9.notificationOffset_r9=0; (*sib13)->notificationConfig_r9.notificationSF_Index_r9=1; @@ -741,11 +696,8 @@ for( i=0; i < m2ap_setup_resp->num_mcch_config_per_mbsfn; i++){ MBSFN_Area1->mcch_Config_r9.signallingMCS_r9= m2ap_setup_resp->mcch_config_per_mbsfn[i].mcs; ASN_SEQUENCE_ADD(&MBSFNArea_list->list,MBSFN_Area1); } -#endif -#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0)) ASN_SEQUENCE_ADD(&bcch_message->message.choice.c1.choice.systemInformation.criticalExtensions.choice.systemInformation_r8.sib_TypeAndInfo.list, sib13_part); -#endif //xer_fprint(stdout, &asn_DEF_LTE_BCCH_DL_SCH_Message, (void *)bcch_message); @@ -767,15 +719,11 @@ for( i=0; i < m2ap_setup_resp->num_mcch_config_per_mbsfn; i++){ if (NODE_IS_MONOLITHIC(rrc->node_type)) { rrc_mac_config_req_eNB(ctxt_pP->module_id, CC_id, 0,0,0,0,0, -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) 0, -#endif 0,//rnti (LTE_BCCH_BCH_Message_t *)NULL, (LTE_RadioResourceConfigCommonSIB_t *) NULL, -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) (LTE_RadioResourceConfigCommonSIB_t *) NULL, -#endif (struct LTE_PhysicalConfigDedicated *)NULL, (LTE_SCellToAddMod_r10_t *)NULL, //(struct LTE_PhysicalConfigDedicatedSCell_r10 *)NULL, @@ -791,20 +739,14 @@ for( i=0; i < m2ap_setup_resp->num_mcch_config_per_mbsfn; i++){ , 0, (LTE_MBSFN_AreaInfoList_r9_t *) & carrier->sib13->mbsfn_AreaInfoList_r9, - (LTE_PMCH_InfoList_r9_t *) NULL -#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0)) - , - (LTE_SystemInformationBlockType1_v1310_IEs_t *)NULL -#endif -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) - , + (LTE_PMCH_InfoList_r9_t *) NULL, + (LTE_SystemInformationBlockType1_v1310_IEs_t *)NULL, 0, (LTE_BCCH_DL_SCH_Message_MBMS_t *) NULL, (LTE_SchedulingInfo_MBMS_r14_t *) NULL, (struct LTE_NonMBSFN_SubframeConfig_r14 *) NULL, (LTE_SystemInformationBlockType1_MBMS_r14_t *) NULL, (LTE_MBSFN_AreaInfoList_r9_t *) NULL -#endif ); } @@ -829,10 +771,8 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2_SIB13( rrc_eNB_carrier_data_t *carrier=&rrc->carrier[CC_id]; -#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0)) struct LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member *sib13_part=NULL; LTE_MBSFN_SubframeConfigList_t *MBSFNSubframeConfigList/*,*MBSFNSubframeConfigList_copy*/; -#endif asn_enc_rval_t enc_rval; @@ -840,29 +780,20 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2_SIB13( uint8_t *buffer; LTE_SystemInformationBlockType2_t **sib2; -#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0)) LTE_MBSFN_AreaInfoList_r9_t *MBSFNArea_list/*,*MBSFNArea_list_copy*/; LTE_SystemInformationBlockType13_r9_t **sib13 = &RC.rrc[Mod_id]->carrier[CC_id].sib13; struct LTE_MBSFN_AreaInfo_r9 *MBSFN_Area1; -#endif - - -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) if(ctxt_pP->brOption){ buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB23_BR; sib2 = &RC.rrc[Mod_id]->carrier[CC_id].sib2_BR; LOG_I(RRC,"Running SIB2/3 Encoding for eMTC\n"); - }else -#endif - { + } else { buffer = RC.rrc[Mod_id]->carrier[CC_id].SIB23; sib2 = &RC.rrc[Mod_id]->carrier[CC_id].sib2; } - - if (bcch_message) { //memset(bcch_message,0,sizeof(LTE_BCCH_DL_SCH_Message_t)); } else { @@ -912,7 +843,6 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2_SIB13( break; case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib13_v920: *sib13=&typeandinfo->choice.sib13_v920; -#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0)) (*sib13)->notificationConfig_r9.notificationRepetitionCoeff_r9=LTE_MBMS_NotificationConfig_r9__notificationRepetitionCoeff_r9_n2; (*sib13)->notificationConfig_r9.notificationOffset_r9=0; (*sib13)->notificationConfig_r9.notificationSF_Index_r9=1; @@ -938,7 +868,6 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2_SIB13( MBSFN_Area1->mcch_Config_r9.signallingMCS_r9= m2ap_setup_resp->mcch_config_per_mbsfn[j].mcs; ASN_SEQUENCE_ADD(&MBSFNArea_list->list,MBSFN_Area1); } -#endif break; case LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib14_v1130: break; @@ -1004,15 +933,10 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2_SIB13( } if(*sib13==NULL){ -#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0)) sib13_part = CALLOC(1,sizeof(struct LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member)); memset(sib13_part,0,sizeof(struct LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member)); sib13_part->present = LTE_SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR_sib13_v920; - *sib13 = &sib13_part->choice.sib13_v920; -#endif - -#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0)) (*sib13)->notificationConfig_r9.notificationRepetitionCoeff_r9=LTE_MBMS_NotificationConfig_r9__notificationRepetitionCoeff_r9_n2; (*sib13)->notificationConfig_r9.notificationOffset_r9=0; (*sib13)->notificationConfig_r9.notificationSF_Index_r9=1; @@ -1039,12 +963,8 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2_SIB13( MBSFN_Area1->mcch_Config_r9.signallingMCS_r9= m2ap_setup_resp->mcch_config_per_mbsfn[i].mcs; ASN_SEQUENCE_ADD(&MBSFNArea_list->list,MBSFN_Area1); } -#endif -#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0)) ASN_SEQUENCE_ADD(&bcch_message->message.choice.c1.choice.systemInformation.criticalExtensions.choice.systemInformation_r8.sib_TypeAndInfo.list, sib13_part); -#endif - } @@ -1070,15 +990,11 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2_SIB13( if (NODE_IS_MONOLITHIC(rrc->node_type)) { rrc_mac_config_req_eNB(ctxt_pP->module_id, CC_id, 0,0,0,0,0, -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) 0, -#endif 0,//rnti (LTE_BCCH_BCH_Message_t *)NULL, (LTE_RadioResourceConfigCommonSIB_t *) NULL, -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) (LTE_RadioResourceConfigCommonSIB_t *) NULL, -#endif (struct LTE_PhysicalConfigDedicated *)NULL, (LTE_SCellToAddMod_r10_t *)NULL, //(struct LTE_PhysicalConfigDedicatedSCell_r10 *)NULL, @@ -1095,20 +1011,14 @@ static uint8_t rrc_M2AP_do_SIB23_SIB2_SIB13( (LTE_MBSFN_SubframeConfigList_t *) carrier->sib2->mbsfn_SubframeConfigList, carrier->MBMS_flag, (LTE_MBSFN_AreaInfoList_r9_t *) & carrier->sib13->mbsfn_AreaInfoList_r9, - (LTE_PMCH_InfoList_r9_t *) NULL -#if (LTE_RRC_VERSION >= MAKE_VERSION(13, 0, 0)) - , - (LTE_SystemInformationBlockType1_v1310_IEs_t *)NULL -#endif -#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) - , + (LTE_PMCH_InfoList_r9_t *) NULL, + (LTE_SystemInformationBlockType1_v1310_IEs_t *)NULL, 0, (LTE_BCCH_DL_SCH_Message_MBMS_t *) NULL, (LTE_SchedulingInfo_MBMS_r14_t *) NULL, (struct LTE_NonMBSFN_SubframeConfig_r14 *) NULL, (LTE_SystemInformationBlockType1_MBMS_r14_t *) NULL, (LTE_MBSFN_AreaInfoList_r9_t *) NULL -#endif ); }