Skip to content

O
OpenXG-RAN
Commit b081d3d7 authored by Raymond Knopp's avatar Raymond Knopp
Browse files
Options

Substitute remaining ifdef Rel10/14 with LTE_RRC_VERSION macro

parent 87e0ce9f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 1086 deletions
openair1/PHY/INIT/lte_init_ue.c
View file @ b081d3d7
...@@ -769,7 +769,7 @@ int init_lte_ue_signal(PHY_VARS_UE *ue, ...@@ -769,7 +769,7 @@ int init_lte_ue_signal(PHY_VARS_UE *ue,
prach_vars[eNB_id] = (LTE_UE_PRACH *)malloc16_clear(sizeof(LTE_UE_PRACH)); prach_vars[eNB_id] = (LTE_UE_PRACH *)malloc16_clear(sizeof(LTE_UE_PRACH));
pbch_vars[eNB_id] = (LTE_UE_PBCH *)malloc16_clear(sizeof(LTE_UE_PBCH)); pbch_vars[eNB_id] = (LTE_UE_PBCH *)malloc16_clear(sizeof(LTE_UE_PBCH));
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
ue->pscch_vars_tx = (LTE_UE_PSCCH_TX *)malloc16_clear(sizeof(LTE_UE_PSCCH_TX)); ue->pscch_vars_tx = (LTE_UE_PSCCH_TX *)malloc16_clear(sizeof(LTE_UE_PSCCH_TX));
ue->pscch_vars_rx = (LTE_UE_PSCCH_RX *)malloc16_clear(sizeof(LTE_UE_PSCCH_RX)); ue->pscch_vars_rx = (LTE_UE_PSCCH_RX *)malloc16_clear(sizeof(LTE_UE_PSCCH_RX));
#endif #endif
...@@ -1159,7 +1159,7 @@ void free_ue_resources(PHY_VARS_UE *ue) { ...@@ -1159,7 +1159,7 @@ void free_ue_resources(PHY_VARS_UE *ue) {
free(prach_vars[eNB_id]); free(prach_vars[eNB_id]);
free(pbch_vars[eNB_id]); free(pbch_vars[eNB_id]);
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
free(ue->pscch_vars_tx); free(ue->pscch_vars_tx);
free(ue->pscch_vars_rx); free(ue->pscch_vars_rx);
#endif #endif
......
openair1/SCHED/fapi_l1.c
View file @ b081d3d7
...@@ -183,7 +183,7 @@ void phy_config_request(PHY_Config_t *phy_config) { ...@@ -183,7 +183,7 @@ void phy_config_request(PHY_Config_t *phy_config) {
fp->frame_type, fp->frame_type,
RC.eNB[Mod_id][CC_id]->X_u); RC.eNB[Mod_id][CC_id]->X_u);
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
fp->prach_emtc_config_common.prach_Config_enabled=1; fp->prach_emtc_config_common.prach_Config_enabled=1;
fp->prach_emtc_config_common.rootSequenceIndex = cfg->emtc_config.prach_catm_root_sequence_index.value; fp->prach_emtc_config_common.rootSequenceIndex = cfg->emtc_config.prach_catm_root_sequence_index.value;
......
openair2/COMMON/mac_rrc_primitives.h
View file @ b081d3d7
...@@ -346,7 +346,7 @@ typedef struct { ...@@ -346,7 +346,7 @@ typedef struct {
void (*pdcp_run)(void); void (*pdcp_run)(void);
void (*pdcp_data_req)(module_id_t, rb_id_t, sdu_size_t, char*); void (*pdcp_data_req)(module_id_t, rb_id_t, sdu_size_t, char*);
signed int (*rrc_rlc_config_req)(unsigned int, unsigned int, unsigned int, unsigned int, rlc_info_t signed int (*rrc_rlc_config_req)(unsigned int, unsigned int, unsigned int, unsigned int, rlc_info_t
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,unsigned int ,unsigned int
,unsigned int ,unsigned int
#endif #endif
......
openair2/LAYER2/MAC/config_ue.c
View file @ b081d3d7
This diff is collapsed.
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @ b081d3d7
...@@ -652,7 +652,7 @@ rx_sdu(const module_id_t enb_mod_idP, ...@@ -652,7 +652,7 @@ rx_sdu(const module_id_t enb_mod_idP,
enb_mod_idP, CC_idP, frameP, rx_lengths[i], UE_id, enb_mod_idP, CC_idP, frameP, rx_lengths[i], UE_id,
rx_lcids[i]); rx_lcids[i]);
mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL
#ifdef Rel14 # if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,SL_RESET_RLC_FLAG_NO ,SL_RESET_RLC_FLAG_NO
#endif #endif
); //(unsigned int*)crc_status); ); //(unsigned int*)crc_status);
...@@ -715,7 +715,7 @@ rx_sdu(const module_id_t enb_mod_idP, ...@@ -715,7 +715,7 @@ rx_sdu(const module_id_t enb_mod_idP,
if ((rx_lengths[i] < SCH_PAYLOAD_SIZE_MAX) && (rx_lengths[i] > 0)) { // MAX SIZE OF transport block if ((rx_lengths[i] < SCH_PAYLOAD_SIZE_MAX) && (rx_lengths[i] > 0)) { // MAX SIZE OF transport block
mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL mac_rlc_data_ind(enb_mod_idP, current_rnti, enb_mod_idP, frameP, ENB_FLAG_YES, MBMS_FLAG_NO, rx_lcids[i], (char *) payload_ptr, rx_lengths[i], 1, NULL
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,SL_RESET_RLC_FLAG_NO ,SL_RESET_RLC_FLAG_NO
#endif #endif
); );
......
openair2/LAYER2/MAC/ue_procedures.c
View file @ b081d3d7
...@@ -575,7 +575,7 @@ ue_send_sdu(module_id_t module_idP, ...@@ -575,7 +575,7 @@ ue_send_sdu(module_id_t module_idP,
MBMS_FLAG_NO, rx_lcids[i], MBMS_FLAG_NO, rx_lcids[i],
(char *) payload_ptr, rx_lengths[i], 1, (char *) payload_ptr, rx_lengths[i], 1,
NULL NULL
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,SL_RESET_RLC_FLAG_NO ,SL_RESET_RLC_FLAG_NO
#endif #endif
); );
...@@ -602,7 +602,7 @@ ue_send_sdu(module_id_t module_idP, ...@@ -602,7 +602,7 @@ ue_send_sdu(module_id_t module_idP,
rx_lcids[i], rx_lcids[i],
(char *) payload_ptr, rx_lengths[i], 1, (char *) payload_ptr, rx_lengths[i], 1,
NULL NULL
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,SL_RESET_RLC_FLAG_NO ,SL_RESET_RLC_FLAG_NO
#endif #endif
); );
...@@ -643,7 +643,7 @@ ue_decode_si(module_id_t module_idP, int CC_id, frame_t frameP, ...@@ -643,7 +643,7 @@ ue_decode_si(module_id_t module_idP, int CC_id, frame_t frameP,
0); 0);
} }
else { else {
LOG_D(MAC, "[UE %d] Frame %d Sending MIBSL to RRC (LCID Id %d,len %d) : %x.%x.%x.%x.%x\n", LOG_I(MAC, "[UE %d] Frame %d Sending MIBSL to RRC (LCID Id %d,len %d) : %x.%x.%x.%x.%x\n",
module_idP, frameP, MIBSLCH, 5, slss->slmib[0],slss->slmib[1],slss->slmib[2],slss->slmib[3],slss->slmib[4]); module_idP, frameP, MIBSLCH, 5, slss->slmib[0],slss->slmib[1],slss->slmib[2],slss->slmib[3],slss->slmib[4]);
mac_rrc_data_ind_ue(module_idP, CC_id, frameP, 0, // unknown subframe mac_rrc_data_ind_ue(module_idP, CC_id, frameP, 0, // unknown subframe
...@@ -653,7 +653,7 @@ ue_decode_si(module_id_t module_idP, int CC_id, frame_t frameP, ...@@ -653,7 +653,7 @@ ue_decode_si(module_id_t module_idP, int CC_id, frame_t frameP,
// copy frame/subframe // copy frame/subframe
*frame = UE_mac_inst[module_idP].directFrameNumber_r12; *frame = UE_mac_inst[module_idP].directFrameNumber_r12;
*subframe = UE_mac_inst[module_idP].directSubframeNumber_r12; *subframe = UE_mac_inst[module_idP].directSubframeNumber_r12;
LOG_D(MAC,"SL: Resetting SF.SFN to %d.%d\n",*frame,*subframe); LOG_I(MAC,"SL: Resetting SF.SFN to %d.%d\n",*frame,*subframe);
} }
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_DECODE_SI, VCD_FUNCTION_OUT); (VCD_SIGNAL_DUMPER_FUNCTIONS_UE_DECODE_SI, VCD_FUNCTION_OUT);
...@@ -669,7 +669,7 @@ ue_decode_si(module_id_t module_idP, int CC_id, frame_t frameP, ...@@ -669,7 +669,7 @@ ue_decode_si(module_id_t module_idP, int CC_id, frame_t frameP,
0xffff, 0xffff,
UE_mac_inst[module_idP].rxFrame, UE_mac_inst[module_idP].rxFrame,
UE_mac_inst[module_idP].rxSubframe, 0, 0); UE_mac_inst[module_idP].rxSubframe, 0, 0);
LOG_D(OPT, LOG_I(OPT,
"[UE %d][BCH] Frame %d trace pdu for CC_id %d rnti %x with size %d\n", "[UE %d][BCH] Frame %d trace pdu for CC_id %d rnti %x with size %d\n",
module_idP, frameP, CC_id, 0xffff, len); module_idP, frameP, CC_id, 0xffff, len);
} }
...@@ -855,7 +855,7 @@ ue_send_mch_sdu(module_id_t module_idP, uint8_t CC_id, frame_t frameP, ...@@ -855,7 +855,7 @@ ue_send_mch_sdu(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
rx_lengths[i], rx_lengths[i],
1, 1,
NULL NULL
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,SL_RESET_RLC_FLAG_NO ,SL_RESET_RLC_FLAG_NO
#endif #endif
); );
...@@ -1021,7 +1021,7 @@ void ue_send_sl_sdu(module_id_t module_idP, ...@@ -1021,7 +1021,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
rlc_sdu_len, rlc_sdu_len,
1, 1,
NULL NULL
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,reset_flag ,reset_flag
#endif #endif
); );
...@@ -1039,7 +1039,7 @@ void ue_send_sl_sdu(module_id_t module_idP, ...@@ -1039,7 +1039,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
rlc_sdu_len, rlc_sdu_len,
1, 1,
NULL NULL
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,reset_flag ,reset_flag
#endif #endif
); );
...@@ -3713,7 +3713,7 @@ SLSCH_t *ue_get_slsch(module_id_t module_idP,int CC_id,frame_t frameP,sub_frame_ ...@@ -3713,7 +3713,7 @@ SLSCH_t *ue_get_slsch(module_id_t module_idP,int CC_id,frame_t frameP,sub_frame_
ue->slsch_lcid, ue->slsch_lcid,
req, req,
(char*)(ue->slsch_pdu.payload + sizeof(SLSCH_SUBHEADER_24_Bit_DST_LONG)) (char*)(ue->slsch_pdu.payload + sizeof(SLSCH_SUBHEADER_24_Bit_DST_LONG))
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,ue->sourceL2Id, ,ue->sourceL2Id,
ue->destinationL2Id ue->destinationL2Id
#endif #endif
......
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @ b081d3d7
...@@ -809,7 +809,7 @@ pdcp_data_ind( ...@@ -809,7 +809,7 @@ pdcp_data_ind(
((pdcp_data_ind_header_t*) new_sdu_p->data)->inst = ctxt_pP->module_id; ((pdcp_data_ind_header_t*) new_sdu_p->data)->inst = ctxt_pP->module_id;
#endif #endif
} else { } else {
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
//TTN (29/05/18) should check value of INST since 0 is for OIP0 (UE-UE), 1 is for OIP1 (UE-eNB) [even with S1 mode] //TTN (29/05/18) should check value of INST since 0 is for OIP0 (UE-UE), 1 is for OIP1 (UE-eNB) [even with S1 mode]
//for the moment, based on rb_id, we distinguish between the traffic from eNB and from other UE //for the moment, based on rb_id, we distinguish between the traffic from eNB and from other UE
//if traffic from other UE //if traffic from other UE
......
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @ b081d3d7
...@@ -179,7 +179,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const ctxt_pP) ...@@ -179,7 +179,7 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t* const ctxt_pP)
//} //}
#endif #endif
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
//TTN (29/05/18) OIP1 for UE-eNB, OIP0 for UE-UE (incoming packets) //TTN (29/05/18) OIP1 for UE-eNB, OIP0 for UE-UE (incoming packets)
//for the moment, based on rb_id, we distinguish between the traffic from eNB and from other UE //for the moment, based on rb_id, we distinguish between the traffic from eNB and from other UE
......
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
View file @ b081d3d7
...@@ -176,7 +176,7 @@ rlc_um_get_pdus (const protocol_ctxt_t* const ctxt_pP, void *argP) ...@@ -176,7 +176,7 @@ rlc_um_get_pdus (const protocol_ctxt_t* const ctxt_pP, void *argP)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void void
rlc_um_rx (const protocol_ctxt_t* const ctxt_pP, void *argP, struct mac_data_ind data_indP rlc_um_rx (const protocol_ctxt_t* const ctxt_pP, void *argP, struct mac_data_ind data_indP
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
, sl_reset_rlc_flag_t sl_reset_rlc_flag , sl_reset_rlc_flag_t sl_reset_rlc_flag
#endif #endif
) )
...@@ -382,7 +382,7 @@ rlc_um_rx (const protocol_ctxt_t* const ctxt_pP, void *argP, struct mac_data_ind ...@@ -382,7 +382,7 @@ rlc_um_rx (const protocol_ctxt_t* const ctxt_pP, void *argP, struct mac_data_ind
} }
#endif #endif
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
//trick to make UE receive multicast packet from different sources //trick to make UE receive multicast packet from different sources
mem_block_t *tb_p = NULL; mem_block_t *tb_p = NULL;
uint8_t *first_byte_p = NULL; uint8_t *first_byte_p = NULL;
...@@ -730,13 +730,13 @@ rlc_um_mac_data_request (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP,cons ...@@ -730,13 +730,13 @@ rlc_um_mac_data_request (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP,cons
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void void
rlc_um_mac_data_indication (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, struct mac_data_ind data_indP rlc_um_mac_data_indication (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, struct mac_data_ind data_indP
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
, sl_reset_rlc_flag_t sl_reset_rlc_flag , sl_reset_rlc_flag_t sl_reset_rlc_flag
#endif #endif
) )
{ {
rlc_um_rx (ctxt_pP, rlc_pP, data_indP rlc_um_rx (ctxt_pP, rlc_pP, data_indP
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,sl_reset_rlc_flag ,sl_reset_rlc_flag
#endif #endif
); );
......
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.h
View file @ b081d3d7
...@@ -161,7 +161,7 @@ rlc_um_get_pdus (const protocol_ctxt_t* const ctxt_pP, void *argP); ...@@ -161,7 +161,7 @@ rlc_um_get_pdus (const protocol_ctxt_t* const ctxt_pP, void *argP);
void void
rlc_um_rx (const protocol_ctxt_t* const ctxt_pP, void *argP, struct mac_data_ind data_indP rlc_um_rx (const protocol_ctxt_t* const ctxt_pP, void *argP, struct mac_data_ind data_indP
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
, sl_reset_rlc_flag_t sl_reset_rlc_flag , sl_reset_rlc_flag_t sl_reset_rlc_flag
#endif #endif
); );
...@@ -218,7 +218,7 @@ uint32_t rlc_um_get_buffer_occupancy (rlc_um_entity_t *rlc_pP); ...@@ -218,7 +218,7 @@ uint32_t rlc_um_get_buffer_occupancy (rlc_um_entity_t *rlc_pP);
*/ */
void void
rlc_um_mac_data_indication (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, struct mac_data_ind data_indP rlc_um_mac_data_indication (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, struct mac_data_ind data_indP
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
, sl_reset_rlc_flag_t sl_reset_rlc_flag , sl_reset_rlc_flag_t sl_reset_rlc_flag
#endif #endif
); );
......
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_test.c
View file @ b081d3d7
...@@ -479,12 +479,12 @@ void rlc_um_v9_3_0_test_exchange_pdus(rlc_um_entity_t *um_txP, ...@@ -479,12 +479,12 @@ void rlc_um_v9_3_0_test_exchange_pdus(rlc_um_entity_t *um_txP,
rlc_um_v9_3_0_test_mac_rlc_loop(&data_ind_rx, &data_request_tx, &g_drop_tx, &g_tx_packets, &g_dropped_tx_packets); rlc_um_v9_3_0_test_mac_rlc_loop(&data_ind_rx, &data_request_tx, &g_drop_tx, &g_tx_packets, &g_dropped_tx_packets);
rlc_um_v9_3_0_test_mac_rlc_loop(&data_ind_tx, &data_request_rx, &g_drop_rx, &g_rx_packets, &g_dropped_rx_packets); rlc_um_v9_3_0_test_mac_rlc_loop(&data_ind_tx, &data_request_rx, &g_drop_rx, &g_rx_packets, &g_dropped_rx_packets);
rlc_um_mac_data_indication(um_rxP, g_frame, um_rxP->is_enb, data_ind_rx rlc_um_mac_data_indication(um_rxP, g_frame, um_rxP->is_enb, data_ind_rx
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,SL_RESET_RLC_FLAG_NO ,SL_RESET_RLC_FLAG_NO
#endif #endif
); );
rlc_um_mac_data_indication(um_txP, g_frame, um_txP->is_enb, data_ind_tx rlc_um_mac_data_indication(um_txP, g_frame, um_txP->is_enb, data_ind_tx
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,SL_RESET_RLC_FLAG_NO ,SL_RESET_RLC_FLAG_NO
#endif #endif
); );
...@@ -538,14 +538,14 @@ void rlc_um_v9_3_0_test_exchange_delayed_pdus(rlc_um_entity_t *um_txP, ...@@ -538,14 +538,14 @@ void rlc_um_v9_3_0_test_exchange_delayed_pdus(rlc_um_entity_t *um_txP,
rlc_um_mac_data_indication(um_rxP, g_frame, um_rxP->is_enb, g_rx_delayed_indications[frame_modulo] rlc_um_mac_data_indication(um_rxP, g_frame, um_rxP->is_enb, g_rx_delayed_indications[frame_modulo]
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,SL_RESET_RLC_FLAG_NO ,SL_RESET_RLC_FLAG_NO
#endif #endif
); );
memset(&g_rx_delayed_indications[frame_modulo], 0, sizeof(struct mac_data_ind)); memset(&g_rx_delayed_indications[frame_modulo], 0, sizeof(struct mac_data_ind));
rlc_um_mac_data_indication(um_txP, g_frame, um_txP->is_enb, g_tx_delayed_indications[frame_modulo] rlc_um_mac_data_indication(um_txP, g_frame, um_txP->is_enb, g_tx_delayed_indications[frame_modulo]
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,SL_RESET_RLC_FLAG_NO ,SL_RESET_RLC_FLAG_NO
#endif #endif
); );
......
openair2/LAYER2/RLC/rlc.h
View file @ b081d3d7
...@@ -346,7 +346,7 @@ rlc_op_status_t rrc_rlc_remove_ue (const protocol_ctxt_t* const); ...@@ -346,7 +346,7 @@ rlc_op_status_t rrc_rlc_remove_ue (const protocol_ctxt_t* const);
* \return A status about the processing, OK or error code. * \return A status about the processing, OK or error code.
*/ */
rlc_op_status_t rrc_rlc_remove_rlc (const protocol_ctxt_t* const, const srb_flag_t, const MBMS_flag_t, const rb_id_t rlc_op_status_t rrc_rlc_remove_rlc (const protocol_ctxt_t* const, const srb_flag_t, const MBMS_flag_t, const rb_id_t
#ifdef Rel14 #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 #endif
...@@ -394,7 +394,7 @@ rlc_op_status_t rrc_rlc_config_req ( ...@@ -394,7 +394,7 @@ rlc_op_status_t rrc_rlc_config_req (
config_action_t, config_action_t,
const rb_id_t, const rb_id_t,
rlc_info_t rlc_info_t
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,const uint32_t ,const uint32_t
,const uint32_t ,const uint32_t
#endif #endif
...@@ -457,7 +457,7 @@ tbs_size_t mac_rlc_data_req (const module_id_t, const rnti_t, con ...@@ -457,7 +457,7 @@ tbs_size_t mac_rlc_data_req (const module_id_t, const rnti_t, con
*/ */
void mac_rlc_data_ind (const module_id_t, const rnti_t, const eNB_index_t,const frame_t, const eNB_flag_t, const MBMS_flag_t, logical_chan_id_t, char*, tb_size_t, num_tb_t, void mac_rlc_data_ind (const module_id_t, const rnti_t, const eNB_index_t,const frame_t, const eNB_flag_t, const MBMS_flag_t, logical_chan_id_t, char*, tb_size_t, num_tb_t,
crc_t* crc_t*
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
, sl_reset_rlc_flag_t , sl_reset_rlc_flag_t
#endif #endif
); );
......
openair2/LAYER2/RLC/rlc_mac.c
View file @ b081d3d7
...@@ -244,7 +244,7 @@ void mac_rlc_data_ind ( ...@@ -244,7 +244,7 @@ void mac_rlc_data_ind (
const tb_size_t tb_sizeP, const tb_size_t tb_sizeP,
num_tb_t num_tbP, num_tb_t num_tbP,
crc_t *crcs_pP crc_t *crcs_pP
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
, sl_reset_rlc_flag_t sl_reset_rlc_flag , sl_reset_rlc_flag_t sl_reset_rlc_flag
#endif #endif
) )
...@@ -315,7 +315,7 @@ void mac_rlc_data_ind ( ...@@ -315,7 +315,7 @@ void mac_rlc_data_ind (
case RLC_MODE_UM: case RLC_MODE_UM:
rlc_um_mac_data_indication(&ctxt, &rlc_union_p->rlc.um, data_ind rlc_um_mac_data_indication(&ctxt, &rlc_union_p->rlc.um, data_ind
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,sl_reset_rlc_flag ,sl_reset_rlc_flag
#endif #endif
); );
......
openair2/LAYER2/RLC/rlc_rrc.c
View file @ b081d3d7
...@@ -404,7 +404,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP ...@@ -404,7 +404,7 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t * const ctxt_pP
SRB_FLAG_NO, SRB_FLAG_NO,
MBMS_FLAG_NO, MBMS_FLAG_NO,
drb_id drb_id
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,sourceL2Id, ,sourceL2Id,
destinationL2Id destinationL2Id
#endif #endif
...@@ -540,7 +540,7 @@ rlc_op_status_t rrc_rlc_remove_ue ( ...@@ -540,7 +540,7 @@ rlc_op_status_t rrc_rlc_remove_ue (
SRB_FLAG_YES, SRB_FLAG_YES,
MBMS_FLAG_NO, MBMS_FLAG_NO,
rb_id rb_id
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,0, 0 ,0, 0
#endif #endif
); );
...@@ -551,7 +551,7 @@ rlc_op_status_t rrc_rlc_remove_ue ( ...@@ -551,7 +551,7 @@ rlc_op_status_t rrc_rlc_remove_ue (
SRB_FLAG_NO, SRB_FLAG_NO,
MBMS_FLAG_NO, MBMS_FLAG_NO,
rb_id rb_id
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,0, 0 ,0, 0
#endif #endif
); );
...@@ -566,7 +566,7 @@ rlc_op_status_t rrc_rlc_remove_rlc ( ...@@ -566,7 +566,7 @@ rlc_op_status_t rrc_rlc_remove_rlc (
const srb_flag_t srb_flagP, const srb_flag_t srb_flagP,
const MBMS_flag_t MBMS_flagP, const MBMS_flag_t MBMS_flagP,
const rb_id_t rb_idP const rb_id_t rb_idP
#ifdef Rel14 #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 #endif
...@@ -641,7 +641,7 @@ rlc_op_status_t rrc_rlc_remove_rlc ( ...@@ -641,7 +641,7 @@ rlc_op_status_t rrc_rlc_remove_rlc (
(srb_flagP) ? "SRB" : "DRB", (srb_flagP) ? "SRB" : "DRB",
rb_idP); rb_idP);
} }
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
if ((sourceL2Id > 0) && (destinationL2Id > 0) ){ if ((sourceL2Id > 0) && (destinationL2Id > 0) ){
key_lcid = RLC_COLL_KEY_LCID_SOURCE_DEST_VALUE(ctxt_pP->module_id, ctxt_pP->rnti, ctxt_pP->enb_flag, lcid, sourceL2Id, destinationL2Id, srb_flagP); key_lcid = RLC_COLL_KEY_LCID_SOURCE_DEST_VALUE(ctxt_pP->module_id, ctxt_pP->rnti, ctxt_pP->enb_flag, lcid, sourceL2Id, destinationL2Id, srb_flagP);
} else } else
...@@ -817,7 +817,7 @@ rlc_op_status_t rrc_rlc_config_req ( ...@@ -817,7 +817,7 @@ rlc_op_status_t rrc_rlc_config_req (
const config_action_t actionP, const config_action_t actionP,
const rb_id_t rb_idP, const rb_id_t rb_idP,
const rlc_info_t rlc_infoP const rlc_info_t rlc_infoP
#ifdef Rel14 #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 #endif
...@@ -893,7 +893,7 @@ rlc_op_status_t rrc_rlc_config_req ( ...@@ -893,7 +893,7 @@ rlc_op_status_t rrc_rlc_config_req (
case CONFIG_ACTION_REMOVE: case CONFIG_ACTION_REMOVE:
return rrc_rlc_remove_rlc(ctxt_pP, srb_flagP, mbms_flagP, rb_idP return rrc_rlc_remove_rlc(ctxt_pP, srb_flagP, mbms_flagP, rb_idP
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,sourceL2Id ,sourceL2Id
,destinationL2Id ,destinationL2Id
#endif #endif
......
openair2/PHY_INTERFACE/dummy_functions.c
View file @ b081d3d7
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
void initiate_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP, void initiate_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP,
sub_frame_t subframeP, uint16_t preamble_index, sub_frame_t subframeP, uint16_t preamble_index,
int16_t timing_offset, uint16_t rnti int16_t timing_offset, uint16_t rnti
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
, uint8_t rach_resource_type , uint8_t rach_resource_type
#endif #endif
) {;} ) {;}
......
openair2/RRC/LTE/L2_interface_ue.c
View file @ b081d3d7
...@@ -297,7 +297,7 @@ mac_rrc_data_ind_ue( ...@@ -297,7 +297,7 @@ mac_rrc_data_ind_ue(
#endif // #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0)) #endif // #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
if (srb_idP == MIBSLCH) { if (srb_idP == MIBSLCH) {
LOG_D(RRC,"[UE %d] Received SDU for MIBSL\n",module_idP); LOG_D(RRC,"[UE %d] Received SDU for MIBSL\n",module_idP);
......
openair2/RRC/LTE/rrc_UE.c
View file @ b081d3d7
...@@ -576,7 +576,7 @@ rrc_t310_expiration( ...@@ -576,7 +576,7 @@ rrc_t310_expiration(
CONFIG_ACTION_REMOVE, CONFIG_ACTION_REMOVE,
UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id, UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id,
Rlc_info_um Rlc_info_um
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,0 ,0
,0 ,0
#endif #endif
...@@ -2234,7 +2234,7 @@ rrc_ue_process_mobilityControlInfo( ...@@ -2234,7 +2234,7 @@ rrc_ue_process_mobilityControlInfo(
#endif #endif
); );
rrc_rlc_config_req(ctxt_pP, SRB_FLAG_YES, MBMS_FLAG_NO, CONFIG_ACTION_REMOVE,ctxt_pP->module_id+DCCH,Rlc_info_am_config rrc_rlc_config_req(ctxt_pP, SRB_FLAG_YES, MBMS_FLAG_NO, CONFIG_ACTION_REMOVE,ctxt_pP->module_id+DCCH,Rlc_info_am_config
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,0 ,0
,0 ,0
#endif #endif
...@@ -2246,7 +2246,7 @@ rrc_ue_process_mobilityControlInfo( ...@@ -2246,7 +2246,7 @@ rrc_ue_process_mobilityControlInfo(
#endif #endif
); );
rrc_rlc_config_req(ctxt_pP, SRB_FLAG_YES,CONFIG_ACTION_REMOVE, MBMS_FLAG_NO,ctxt_pP->module_id+DCCH1,Rlc_info_am_config rrc_rlc_config_req(ctxt_pP, SRB_FLAG_YES,CONFIG_ACTION_REMOVE, MBMS_FLAG_NO,ctxt_pP->module_id+DCCH1,Rlc_info_am_config
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,0 ,0
,0 ,0
#endif #endif
...@@ -2258,7 +2258,7 @@ rrc_ue_process_mobilityControlInfo( ...@@ -2258,7 +2258,7 @@ rrc_ue_process_mobilityControlInfo(
#endif #endif
); );
rrc_rlc_config_req(ctxt_pP, SRB_FLAG_NO,CONFIG_ACTION_REMOVE, MBMS_FLAG_NO,ctxt_pP->module_id+DTCH,Rlc_info_um rrc_rlc_config_req(ctxt_pP, SRB_FLAG_NO,CONFIG_ACTION_REMOVE, MBMS_FLAG_NO,ctxt_pP->module_id+DTCH,Rlc_info_um
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,0 ,0
,0 ,0
#endif #endif
...@@ -6212,14 +6212,14 @@ void *rrc_control_socket_thread_fct(void *arg) ...@@ -6212,14 +6212,14 @@ void *rrc_control_socket_thread_fct(void *arg)
(SRB_ToAddModList_t*)NULL, (SRB_ToAddModList_t*)NULL,
(DRB_ToAddModList_t*)NULL, (DRB_ToAddModList_t*)NULL,
(DRB_ToReleaseList_t*)drb2release_list (DRB_ToReleaseList_t*)drb2release_list
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,(PMCH_InfoList_r9_t *)NULL ,(PMCH_InfoList_r9_t *)NULL
, sourceL2Id, destinationL2Id , sourceL2Id, destinationL2Id
#endif #endif
); );
*/ */
rrc_rlc_config_req(&ctxt, SRB_FLAG_NO,CONFIG_ACTION_REMOVE, MBMS_FLAG_NO,slrb_id,Rlc_info_um rrc_rlc_config_req(&ctxt, SRB_FLAG_NO,CONFIG_ACTION_REMOVE, MBMS_FLAG_NO,slrb_id,Rlc_info_um
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,sourceL2Id ,sourceL2Id
,destinationL2Id ,destinationL2Id
#endif #endif
...@@ -6231,7 +6231,7 @@ void *rrc_control_socket_thread_fct(void *arg) ...@@ -6231,7 +6231,7 @@ void *rrc_control_socket_thread_fct(void *arg)
rrc_mac_config_req_ue(module_id,0,0, //eNB_index =0 rrc_mac_config_req_ue(module_id,0,0, //eNB_index =0
(LTE_RadioResourceConfigCommonSIB_t *)NULL, (LTE_RadioResourceConfigCommonSIB_t *)NULL,
(struct LTE_PhysicalConfigDedicated *)NULL, (struct LTE_PhysicalConfigDedicated *)NULL,
#if defined(Rel10) || defined(Rel14) #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
(LTE_SCellToAddMod_r10_t *)NULL, (LTE_SCellToAddMod_r10_t *)NULL,
//struct PhysicalConfigDedicatedSCell_r10 *physicalConfigDedicatedSCell_r10, //struct PhysicalConfigDedicatedSCell_r10 *physicalConfigDedicatedSCell_r10,
#endif #endif
...@@ -6248,7 +6248,7 @@ void *rrc_control_socket_thread_fct(void *arg) ...@@ -6248,7 +6248,7 @@ void *rrc_control_socket_thread_fct(void *arg)
NULL, NULL,
NULL, NULL,
NULL NULL
#if defined(Rel10) || defined(Rel14) #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 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
...@@ -6259,7 +6259,7 @@ void *rrc_control_socket_thread_fct(void *arg) ...@@ -6259,7 +6259,7 @@ void *rrc_control_socket_thread_fct(void *arg)
0, 0,
0 0
#endif #endif
#if defined(Rel10) || defined(Rel14) #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
,CONFIG_ACTION_REMOVE, ,CONFIG_ACTION_REMOVE,
&sourceL2Id, &sourceL2Id,
NULL, NULL,
...@@ -6596,7 +6596,7 @@ void *rrc_control_socket_thread_fct(void *arg) ...@@ -6596,7 +6596,7 @@ void *rrc_control_socket_thread_fct(void *arg)
(LTE_SRB_ToAddModList_t*)NULL, (LTE_SRB_ToAddModList_t*)NULL,
(LTE_DRB_ToAddModList_t*)NULL, (LTE_DRB_ToAddModList_t*)NULL,
(LTE_DRB_ToReleaseList_t*)drb2release_list (LTE_DRB_ToReleaseList_t*)drb2release_list
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,(LTE_PMCH_InfoList_r9_t *)NULL ,(LTE_PMCH_InfoList_r9_t *)NULL
, sourceL2Id, destinationL2Id , sourceL2Id, destinationL2Id
#endif #endif
...@@ -6606,7 +6606,7 @@ void *rrc_control_socket_thread_fct(void *arg) ...@@ -6606,7 +6606,7 @@ void *rrc_control_socket_thread_fct(void *arg)
rrc_mac_config_req_ue(module_id,0,0, //eNB_index =0 rrc_mac_config_req_ue(module_id,0,0, //eNB_index =0
(LTE_RadioResourceConfigCommonSIB_t *)NULL, (LTE_RadioResourceConfigCommonSIB_t *)NULL,
(struct LTE_PhysicalConfigDedicated *)NULL, (struct LTE_PhysicalConfigDedicated *)NULL,
#if defined(Rel10) || defined(Rel14) #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
(LTE_SCellToAddMod_r10_t *)NULL, (LTE_SCellToAddMod_r10_t *)NULL,
//struct PhysicalConfigDedicatedSCell_r10 *physicalConfigDedicatedSCell_r10, //struct PhysicalConfigDedicatedSCell_r10 *physicalConfigDedicatedSCell_r10,
#endif #endif
...@@ -6623,7 +6623,7 @@ void *rrc_control_socket_thread_fct(void *arg) ...@@ -6623,7 +6623,7 @@ void *rrc_control_socket_thread_fct(void *arg)
NULL, NULL,
NULL, NULL,
NULL NULL
#if defined(Rel10) || defined(Rel14) #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 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
...@@ -6634,7 +6634,7 @@ void *rrc_control_socket_thread_fct(void *arg) ...@@ -6634,7 +6634,7 @@ void *rrc_control_socket_thread_fct(void *arg)
0, 0,
0 0
#endif #endif
#if defined(Rel10) || defined(Rel14) #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,CONFIG_ACTION_REMOVE, ,CONFIG_ACTION_REMOVE,
&sourceL2Id, &sourceL2Id,
NULL, NULL,
...@@ -6714,7 +6714,7 @@ int decode_MIB_SL( const protocol_ctxt_t* const ctxt_pP, ...@@ -6714,7 +6714,7 @@ int decode_MIB_SL( const protocol_ctxt_t* const ctxt_pP,
rrc_mac_config_req_ue(ctxt_pP->module_id, 0, 0, rrc_mac_config_req_ue(ctxt_pP->module_id, 0, 0,
(LTE_RadioResourceConfigCommonSIB_t *)NULL, (LTE_RadioResourceConfigCommonSIB_t *)NULL,
(struct LTE_PhysicalConfigDedicated *)NULL, (struct LTE_PhysicalConfigDedicated *)NULL,
#if defined(Rel10) || defined(Rel14) #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
(LTE_SCellToAddMod_r10_t *)NULL, (LTE_SCellToAddMod_r10_t *)NULL,
//(struct PhysicalConfigDedicatedSCell_r10 *)NULL, //(struct PhysicalConfigDedicatedSCell_r10 *)NULL,
#endif #endif
...@@ -6731,7 +6731,7 @@ int decode_MIB_SL( const protocol_ctxt_t* const ctxt_pP, ...@@ -6731,7 +6731,7 @@ int decode_MIB_SL( const protocol_ctxt_t* const ctxt_pP,
NULL, NULL,
NULL, NULL,
(LTE_MBSFN_SubframeConfigList_t *)NULL (LTE_MBSFN_SubframeConfigList_t *)NULL
#if defined(Rel10) || defined(Rel14) #if (LTE_RRC_VERSION >= MAKE_VERSION(10, 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
...@@ -6742,7 +6742,7 @@ int decode_MIB_SL( const protocol_ctxt_t* const ctxt_pP, ...@@ -6742,7 +6742,7 @@ int decode_MIB_SL( const protocol_ctxt_t* const ctxt_pP,
0, 0,
0 0
#endif #endif
#if defined(Rel14) #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
, ,
0, 0,
NULL, NULL,
......
openair2/RRC/LTE/rrc_eNB.c
View file @ b081d3d7
...@@ -5151,7 +5151,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete( ...@@ -5151,7 +5151,7 @@ rrc_eNB_process_RRCConnectionReconfigurationComplete(
CONFIG_ACTION_REMOVE, CONFIG_ACTION_REMOVE,
DRB2LCHAN[i], DRB2LCHAN[i],
Rlc_info_um Rlc_info_um
#ifdef Rel14 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,0 ,0
,0 ,0
#endif #endif
......
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