diff --git a/openair2/RRC/LITE/rrc_eNB.c b/openair2/RRC/LITE/rrc_eNB.c
index 57632d4ce1310e5d008b7a8f761d4cd869a167cd..2d96a4593a2f488298d17f7adc047390be748af6 100644
--- a/openair2/RRC/LITE/rrc_eNB.c
+++ b/openair2/RRC/LITE/rrc_eNB.c
@@ -405,7 +405,7 @@ static void init_MCCH (u8 Mod_id) {
(struct LogicalChannelConfig *) NULL,
(MeasGapConfig_t *) NULL,
(TDD_Config_t *) NULL,
- NULL,
+ NULL,
(u8 *) NULL,
(u16 *) NULL,
NULL, NULL, NULL, (MBSFN_SubframeConfigList_t *) NULL
@@ -434,29 +434,27 @@ static void init_MBMS (u8 Mod_id, u32 frame) {
// Configuring PDCP and RLC for MBMS Radio Bearer
rrc_pdcp_config_asn1_req (Mod_id, 0, frame, 1,
- NULL, // SRB_ToAddModList
+ NULL, // SRB_ToAddModList
NULL, // DRB_ToAddModList
(DRB_ToReleaseList_t *) NULL,
- 0, // security mode
- NULL, // key rrc encryption
- NULL, // key rrc integrity
- NULL // key encryption
+ 0, // security mode
+ NULL, // key rrc encryption
+ NULL, // key rrc integrity
+ NULL // key encryption
#ifdef Rel10
,
&(eNB_rrc_inst[Mod_id].mcch_message->pmch_InfoList_r9)
#endif
- );
+ );
rrc_rlc_config_asn1_req(Mod_id, frame, 1, 0,
- NULL,// SRB_ToAddModList
- NULL,// DRB_ToAddModList
- NULL,// DRB_ToReleaseList
- &(eNB_rrc_inst[Mod_id].mcch_message->pmch_InfoList_r9));
+ NULL,// SRB_ToAddModList
+ NULL,// DRB_ToAddModList
+ NULL,// DRB_ToReleaseList
+ &(eNB_rrc_inst[Mod_id].mcch_message->pmch_InfoList_r9));
//rrc_mac_config_req();
-
}
-
}
#endif
@@ -495,7 +493,7 @@ static uint8_t rrc_eNB_get_next_free_UE_index (uint8_t Mod_id, uint64_t UE_ident
{
uint8_t i, first_index = UE_INDEX_INVALID, reg = 0;
- DevCheck(Mod_id < NB_eNB_INST, Mod_id, NB_eNB_INST, 0);
+ AssertFatal(Mod_id < NB_eNB_INST, "eNB index invalid (%d/%d)!", Mod_id, NB_eNB_INST);
for (i = 0; i < NUMBER_OF_UE_MAX; i++) {
if ((first_index == UE_INDEX_INVALID) && (eNB_rrc_inst[Mod_id].Info.UE_list[i] == 0)) {
@@ -519,8 +517,8 @@ static uint8_t rrc_eNB_get_next_free_UE_index (uint8_t Mod_id, uint64_t UE_ident
void rrc_eNB_free_UE_index (uint8_t Mod_id, uint8_t UE_id)
{
- DevCheck(Mod_id < NB_eNB_INST, Mod_id, UE_id, NB_eNB_INST);
- DevCheck(UE_id < NUMBER_OF_UE_MAX, Mod_id, UE_id, NUMBER_OF_UE_MAX);
+ AssertFatal(Mod_id < NB_eNB_INST, "eNB index invalid (%d/%d) for UE %d!", Mod_id, NB_eNB_INST, UE_id);
+ AssertFatal(UE_id < NUMBER_OF_UE_MAX, "UE index invalid (%d/%d) for eNB %d!", UE_id, NUMBER_OF_UE_MAX, Mod_id);
LOG_I (RRC, "[eNB %d] Removing UE %d rv 0x%" PRIx64 "\n", Mod_id, UE_id, eNB_rrc_inst[Mod_id].Info.UE_list[UE_id]);
eNB_rrc_inst[Mod_id].Info.UE[UE_id].Status = RRC_IDLE;
@@ -2398,7 +2396,7 @@ void rrc_eNB_generate_RRCConnectionSetup (u8 Mod_id, u32 frame, u16 UE_index) {
SRB_ToAddMod_t *SRB1_config;
int cnt;
- DevCheck(UE_index < NUMBER_OF_UE_MAX, UE_index, NUMBER_OF_UE_MAX, 0);
+ AssertFatal(UE_index < NUMBER_OF_UE_MAX, "UE index invalid (%d/%d) for eNB %d!", UE_index, NUMBER_OF_UE_MAX, Mod_id);
SRB_configList = &eNB_rrc_inst[Mod_id].SRB_configList[UE_index];
@@ -2496,7 +2494,7 @@ char openair_rrc_lite_eNB_init (u8 Mod_id)
LOG_D (RRC, "[MSC_NEW][FRAME 00000][RRC_eNB][MOD %02d][]\n", Mod_id);
LOG_D (RRC, "[MSC_NEW][FRAME 00000][IP][MOD %02d][]\n", Mod_id);
- DevAssert(eNB_rrc_inst != NULL);
+ AssertFatal(eNB_rrc_inst != NULL, "eNB_rrc_inst not initialized!");
for (j = 0; j < NUMBER_OF_UE_MAX; j++)
eNB_rrc_inst[Mod_id].Info.UE[j].Status = RRC_IDLE; //CH_READY;
diff --git a/openair2/RRC/LITE/rrc_eNB_S1AP.c b/openair2/RRC/LITE/rrc_eNB_S1AP.c
index 0e02d5dcc119f064bb3d8f62821cb7100e7174b5..318de543a6c6ca30ace6990f18fd126f2d5e1518 100644
--- a/openair2/RRC/LITE/rrc_eNB_S1AP.c
+++ b/openair2/RRC/LITE/rrc_eNB_S1AP.c
@@ -97,7 +97,7 @@ static uint16_t get_next_ue_initial_id(uint8_t mod_id) {
static uint8_t get_UE_index_from_initial_id(uint8_t mod_id, uint16_t ue_initial_id) {
uint8_t ue_index;
- DevCheck(mod_id < NB_eNB_INST, mod_id, NB_eNB_INST, 0);
+ AssertFatal(mod_id < NB_eNB_INST, "eNB index invalid (%d/%d)!", mod_id, NB_eNB_INST);
LOG_D(RRC, "[eNB %d] get_UE_index_from_initial_id: ue_initial_id %d\n", ue_initial_id);
for (ue_index = 0; ue_index < NUMBER_OF_UE_MAX; ue_index++) {
@@ -124,7 +124,7 @@ static uint8_t get_UE_index_from_initial_id(uint8_t mod_id, uint16_t ue_initial_
static uint8_t get_UE_index_from_eNB_ue_s1ap_id(uint8_t mod_id, uint32_t eNB_ue_s1ap_id) {
uint8_t ue_index;
- DevCheck(mod_id < NB_eNB_INST, mod_id, NB_eNB_INST, 0);
+ AssertFatal(mod_id < NB_eNB_INST, "eNB index invalid (%d/%d)!", mod_id, NB_eNB_INST);
LOG_D(RRC, "[eNB %d] get_UE_index_from_eNB_ue_s1ap_id: eNB_ue_s1ap_id %d\n", mod_id, eNB_ue_s1ap_id);
for (ue_index = 0; ue_index < NUMBER_OF_UE_MAX; ue_index++) {
@@ -390,8 +390,9 @@ void rrc_eNB_send_S1AP_NAS_FIRST_REQ(uint8_t mod_id, uint8_t ue_index,
S1AP_NAS_FIRST_REQ (message_p).ue_initial_id = eNB_rrc_inst[mod_id].Info.UE[ue_index].ue_initial_id;
/* Assume that cause is coded in the same way in RRC and S1ap, just check that the value is in S1ap range */
- DevCheck(eNB_rrc_inst[mod_id].Info.UE[ue_index].establishment_cause < RRC_CAUSE_LAST,
- eNB_rrc_inst[mod_id].Info.UE[ue_index].establishment_cause, RRC_CAUSE_LAST, mod_id);
+ AssertFatal(eNB_rrc_inst[mod_id].Info.UE[ue_index].establishment_cause < RRC_CAUSE_LAST,
+ "Establishment cause invalid (%d/%d) for eNB %d!",
+ eNB_rrc_inst[mod_id].Info.UE[ue_index].establishment_cause, RRC_CAUSE_LAST, mod_id);
S1AP_NAS_FIRST_REQ (message_p).establishment_cause = eNB_rrc_inst[mod_id].Info.UE[ue_index].establishment_cause;
/* Forward NAS message */S1AP_NAS_FIRST_REQ (message_p).nas_pdu.buffer =