Commit 7aa35e87 authored by Raphael Defosseux's avatar Raphael Defosseux

Removing obsolete LTE_RRC_VERSION

Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent e7aa071e
...@@ -329,9 +329,7 @@ void phy_config_update_sib13_request(PHY_Config_t *phy_config) { ...@@ -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); 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); 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, void phy_config_sib13_eNB(module_id_t Mod_id,int CC_id,int mbsfn_Area_idx,
......
...@@ -2014,10 +2014,8 @@ void fill_ulsch(PHY_VARS_eNB *eNB,int UE_id,nfapi_ul_config_ulsch_pdu *ulsch_pdu ...@@ -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]->frame = frame;
ulsch->harq_processes[harq_pid]->subframe = subframe; ulsch->harq_processes[harq_pid]->subframe = subframe;
ulsch->harq_processes[harq_pid]->handled = 0; 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]->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 ; 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]->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]->nb_rb = ulsch_pdu->ulsch_pdu_rel8.number_of_resource_blocks;
ulsch->harq_processes[harq_pid]->dci_alloc = 1; ulsch->harq_processes[harq_pid]->dci_alloc = 1;
......
...@@ -314,12 +314,10 @@ typedef struct { ...@@ -314,12 +314,10 @@ typedef struct {
// int calibration_flag; // int calibration_flag;
/// delta_TF for power control /// delta_TF for power control
int32_t delta_TF; int32_t delta_TF;
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
// PUSCH Repetition Number for the current SF // PUSCH Repetition Number for the current SF
uint32_t repetition_number ; uint32_t repetition_number ;
// PUSCH Total number of repetitions // PUSCH Total number of repetitions
uint32_t total_number_of_repetitions; uint32_t total_number_of_repetitions;
#endif
} LTE_UL_eNB_HARQ_t; } LTE_UL_eNB_HARQ_t;
typedef struct { typedef struct {
......
...@@ -703,9 +703,7 @@ config_sib13( int Mod_id, ...@@ -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); // 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); // 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; PHY_Config_t phycfg;
phycfg.Mod_id = Mod_id; phycfg.Mod_id = Mod_id;
......
...@@ -906,10 +906,8 @@ typedef struct { ...@@ -906,10 +906,8 @@ typedef struct {
uint16_t mpdcch_repetition_cnt; uint16_t mpdcch_repetition_cnt;
frame_t Msg2_frame; frame_t Msg2_frame;
sub_frame_t Msg2_subframe; 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 /// Repetition column in pusch_repetition Table 8.2.b in TS36.213
uint8_t pusch_repetition_levels; uint8_t pusch_repetition_levels;
#endif
LTE_PhysicalConfigDedicated_t *physicalConfigDedicated; LTE_PhysicalConfigDedicated_t *physicalConfigDedicated;
} UE_TEMPLATE; } UE_TEMPLATE;
...@@ -1117,10 +1115,8 @@ typedef struct { ...@@ -1117,10 +1115,8 @@ typedef struct {
uint8_t msg2_narrowband; uint8_t msg2_narrowband;
uint8_t msg34_narrowband; uint8_t msg34_narrowband;
int msg4_rrc_sdu_length; 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 /// Repetition column in pusch_repetition Table 8.2.b in TS36.213
uint8_t pusch_repetition_levels; uint8_t pusch_repetition_levels;
#endif
int32_t crnti_rrc_mui; int32_t crnti_rrc_mui;
int8_t crnti_harq_pid; int8_t crnti_harq_pid;
} RA_t; } RA_t;
......
...@@ -92,11 +92,9 @@ tbs_size_t mac_rlc_data_req( ...@@ -92,11 +92,9 @@ tbs_size_t mac_rlc_data_req(
const MBMS_flag_t MBMS_flagP, const MBMS_flag_t MBMS_flagP,
const logical_chan_id_t channel_idP, const logical_chan_id_t channel_idP,
const tb_size_t tb_sizeP, const tb_size_t tb_sizeP,
char *buffer_pP char *buffer_pP,
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) const uint32_t sourceL2Id,
,const uint32_t sourceL2Id const uint32_t destinationL2Id
,const uint32_t destinationL2Id
#endif
) )
{ {
int ret; int ret;
...@@ -147,11 +145,9 @@ mac_rlc_status_resp_t mac_rlc_status_ind( ...@@ -147,11 +145,9 @@ mac_rlc_status_resp_t mac_rlc_status_ind(
const eNB_flag_t enb_flagP, const eNB_flag_t enb_flagP,
const MBMS_flag_t MBMS_flagP, const MBMS_flag_t MBMS_flagP,
const logical_chan_id_t channel_idP, const logical_chan_id_t channel_idP,
const tb_size_t tb_sizeP const tb_size_t tb_sizeP,
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) const uint32_t sourceL2Id,
,const uint32_t sourceL2Id const uint32_t destinationL2Id
,const uint32_t destinationL2Id
#endif
) )
{ {
nr_rlc_ue_t *ue; nr_rlc_ue_t *ue;
...@@ -210,11 +206,9 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP, ...@@ -210,11 +206,9 @@ rlc_op_status_t rlc_data_req (const protocol_ctxt_t *const ctxt_pP,
const mui_t muiP, const mui_t muiP,
confirm_t confirmP, confirm_t confirmP,
sdu_size_t sdu_sizeP, sdu_size_t sdu_sizeP,
mem_block_t *sdu_pP mem_block_t *sdu_pP,
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0)) const uint32_t *const sourceL2Id,
,const uint32_t *const sourceL2Id const uint32_t *const destinationL2Id
,const uint32_t *const destinationL2Id
#endif
) )
{ {
int rnti = ctxt_pP->rnti; int rnti = ctxt_pP->rnti;
...@@ -754,13 +748,10 @@ static void add_drb(int rnti, struct LTE_DRB_ToAddMod *s) ...@@ -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, 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_SRB_ToAddModList_t * const srb2add_listP,
const LTE_DRB_ToAddModList_t * const drb2add_listP, const LTE_DRB_ToAddModList_t * const drb2add_listP,
const LTE_DRB_ToReleaseList_t * const drb2release_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 LTE_PMCH_InfoList_r9_t * const pmch_InfoList_r9_pP const uint32_t sourceL2Id,
,const uint32_t sourceL2Id const uint32_t destinationL2Id)
,const uint32_t destinationL2Id
#endif
)
{ {
int rnti = ctxt_pP->rnti; int rnti = ctxt_pP->rnti;
int i; int i;
......
...@@ -3624,9 +3624,7 @@ int decode_SI( const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index ) { ...@@ -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, rrc_mac_config_req_ue(ctxt_pP->module_id, 0, eNB_index,
(LTE_RadioResourceConfigCommonSIB_t *)NULL, (LTE_RadioResourceConfigCommonSIB_t *)NULL,
(struct LTE_PhysicalConfigDedicated *)NULL, (struct LTE_PhysicalConfigDedicated *)NULL,
#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
(LTE_SCellToAddMod_r10_t *)NULL, (LTE_SCellToAddMod_r10_t *)NULL,
#endif
(LTE_MeasObjectToAddMod_t **)NULL, (LTE_MeasObjectToAddMod_t **)NULL,
(LTE_MAC_MainConfig_t *)NULL, (LTE_MAC_MainConfig_t *)NULL,
0, 0,
...@@ -3640,27 +3638,18 @@ int decode_SI( const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index ) { ...@@ -3640,27 +3638,18 @@ int decode_SI( const protocol_ctxt_t *const ctxt_pP, const uint8_t eNB_index ) {
NULL, NULL,
NULL, NULL,
UE_rrc_inst[ctxt_pP->module_id].sib2[eNB_index]->mbsfn_SubframeConfigList UE_rrc_inst[ctxt_pP->module_id].sib2[eNB_index]->mbsfn_SubframeConfigList
#if (LTE_RRC_VERSION >= MAKE_VERSION(9, 0, 0))
,0, ,0,
(LTE_MBSFN_AreaInfoList_r9_t *)NULL, (LTE_MBSFN_AreaInfoList_r9_t *)NULL,
(LTE_PMCH_InfoList_r9_t *)NULL (LTE_PMCH_InfoList_r9_t *)NULL,
#endif
#ifdef CBA #ifdef CBA
,0, 0,0,
0
#endif #endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0, 0,
NULL, NULL,
NULL NULL,
#endif
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0, 0,
(struct LTE_NonMBSFN_SubframeConfig_r14 *)NULL, (struct LTE_NonMBSFN_SubframeConfig_r14 *)NULL,
(LTE_MBSFN_AreaInfoList_r9_t *)NULL (LTE_MBSFN_AreaInfoList_r9_t *)NULL
#endif
); );
} }
......
This diff is collapsed.
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