Commit 84439d87 authored by Vaibhav Shrivastava's avatar Vaibhav Shrivastava

Some missing changes and added some new test cases in Firecell CI

parent d835408f
......@@ -66,9 +66,72 @@ rrc_init_global_param(
DTCH_UL_LCHAN_DESC.transport_block_size = 52;
DTCH_UL_LCHAN_DESC.max_transport_blocks = 20;
DTCH_UL_LCHAN_DESC.Delay_class = 1;
for(int CC_id=0; CC_id<MAX_NUM_CCs; CC_id++)
{
for(int i=0;i<MAX_RBS;i++)
{
RC.RB_Config[CC_id][i].isRBConfigValid = false;
memset(&RC.RB_Config[CC_id][i],0,sizeof(RBConfig));
}
/*SRB1 Default Config for RLC and MAC*/
RC.RB_Config[CC_id][1].RlcCfg.present = 1;
RC.RB_Config[CC_id][1].RlcCfg.choice.am.ul_AM_RLC.t_PollRetransmit = 15;
RC.RB_Config[CC_id][1].RlcCfg.choice.am.ul_AM_RLC.pollPDU = 0;
RC.RB_Config[CC_id][1].RlcCfg.choice.am.ul_AM_RLC.pollByte = 14;
RC.RB_Config[CC_id][1].RlcCfg.choice.am.ul_AM_RLC.maxRetxThreshold = 3;
RC.RB_Config[CC_id][1].RlcCfg.choice.am.dl_AM_RLC.t_Reordering = 7;
RC.RB_Config[CC_id][1].RlcCfg.choice.am.dl_AM_RLC.t_StatusProhibit = 0;
RC.RB_Config[CC_id][1].Mac.ul_SpecificParameters = CALLOC(1, sizeof(struct LTE_LogicalChannelConfig__ul_SpecificParameters));
RC.RB_Config[CC_id][1].Mac.ul_SpecificParameters->priority = 1;
RC.RB_Config[CC_id][1].Mac.ul_SpecificParameters->prioritisedBitRate = 7;
/*SRB2 Default Config for RLC and MAC*/
RC.RB_Config[CC_id][2].RlcCfg.present = LTE_RLC_Config_PR_am;
RC.RB_Config[CC_id][2].RlcCfg.choice.am.ul_AM_RLC.t_PollRetransmit = LTE_T_PollRetransmit_ms15;
RC.RB_Config[CC_id][2].RlcCfg.choice.am.ul_AM_RLC.pollPDU = LTE_PollPDU_p8;
RC.RB_Config[CC_id][2].RlcCfg.choice.am.ul_AM_RLC.pollByte = LTE_PollByte_kB1000;
RC.RB_Config[CC_id][2].RlcCfg.choice.am.ul_AM_RLC.maxRetxThreshold = LTE_UL_AM_RLC__maxRetxThreshold_t32;
RC.RB_Config[CC_id][2].RlcCfg.choice.am.dl_AM_RLC.t_Reordering = LTE_T_Reordering_ms35;
RC.RB_Config[CC_id][2].RlcCfg.choice.am.dl_AM_RLC.t_StatusProhibit = LTE_T_StatusProhibit_ms10;
RC.RB_Config[CC_id][2].Mac.ul_SpecificParameters = CALLOC(1, sizeof(struct LTE_LogicalChannelConfig__ul_SpecificParameters));
RC.RB_Config[CC_id][2].Mac.ul_SpecificParameters->priority = 3;
RC.RB_Config[CC_id][2].Mac.ul_SpecificParameters->prioritisedBitRate = LTE_LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
/*DRB Default Config for PDCP,RLC(AM) and MAC*/
RC.RB_Config[CC_id][3].RlcCfg.present = LTE_RLC_Config_PR_am;
RC.RB_Config[CC_id][3].RlcCfg.choice.am.ul_AM_RLC.t_PollRetransmit = LTE_T_PollRetransmit_ms50;
RC.RB_Config[CC_id][3].RlcCfg.choice.am.ul_AM_RLC.pollPDU = LTE_PollPDU_p16;
RC.RB_Config[CC_id][3].RlcCfg.choice.am.ul_AM_RLC.pollByte = LTE_PollByte_kBinfinity;
RC.RB_Config[CC_id][3].RlcCfg.choice.am.ul_AM_RLC.maxRetxThreshold = LTE_UL_AM_RLC__maxRetxThreshold_t8;
RC.RB_Config[CC_id][3].RlcCfg.choice.am.dl_AM_RLC.t_Reordering = LTE_T_Reordering_ms35;
RC.RB_Config[CC_id][3].RlcCfg.choice.am.dl_AM_RLC.t_StatusProhibit = LTE_T_StatusProhibit_ms25;
RC.RB_Config[CC_id][3].PdcpCfg.rlc_AM = CALLOC(1, sizeof(struct LTE_PDCP_Config__rlc_AM));
RC.RB_Config[CC_id][3].PdcpCfg.rlc_AM->statusReportRequired = false;
RC.RB_Config[CC_id][3].PdcpCfg.headerCompression.present = LTE_PDCP_Config__headerCompression_PR_notUsed;
RC.RB_Config[CC_id][3].Mac.ul_SpecificParameters = CALLOC(1, sizeof(struct LTE_LogicalChannelConfig__ul_SpecificParameters));
RC.RB_Config[CC_id][3].Mac.ul_SpecificParameters->priority = 12;
RC.RB_Config[CC_id][3].Mac.ul_SpecificParameters->prioritisedBitRate = LTE_LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_kBps8;
RC.RB_Config[CC_id][3].PdcpCfg.discardTimer = CALLOC(1, sizeof(long));
*(RC.RB_Config[CC_id][3].PdcpCfg.discardTimer) = LTE_PDCP_Config__discardTimer_infinity;
/*DRB Default Config for PDCP,RLC(UM) and MAC*/
RC.RB_Config[CC_id][4].RlcCfg.present = LTE_RLC_Config_PR_um_Bi_Directional;
RC.RB_Config[CC_id][4].RlcCfg.choice.um_Bi_Directional.ul_UM_RLC.sn_FieldLength = LTE_SN_FieldLength_size10;
RC.RB_Config[CC_id][4].RlcCfg.choice.um_Bi_Directional.dl_UM_RLC.sn_FieldLength = LTE_SN_FieldLength_size10;
RC.RB_Config[CC_id][4].RlcCfg.choice.um_Bi_Directional.dl_UM_RLC.t_Reordering = LTE_T_Reordering_ms35;
RC.RB_Config[CC_id][4].PdcpCfg.rlc_UM = CALLOC(1, sizeof(struct LTE_PDCP_Config__rlc_UM));
RC.RB_Config[CC_id][4].PdcpCfg.rlc_UM->pdcp_SN_Size = LTE_PDCP_Config__rlc_UM__pdcp_SN_Size_len12bits;
RC.RB_Config[CC_id][4].PdcpCfg.headerCompression.present = LTE_PDCP_Config__headerCompression_PR_notUsed;
RC.RB_Config[CC_id][4].Mac.ul_SpecificParameters = CALLOC(1, sizeof(struct LTE_LogicalChannelConfig__ul_SpecificParameters));
RC.RB_Config[CC_id][4].Mac.ul_SpecificParameters->priority = 12;
RC.RB_Config[CC_id][4].Mac.ul_SpecificParameters->prioritisedBitRate = LTE_LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_kBps8;
RC.RB_Config[CC_id][4].PdcpCfg.discardTimer = CALLOC(1, sizeof(long));
*(RC.RB_Config[CC_id][4].PdcpCfg.discardTimer) = LTE_PDCP_Config__discardTimer_infinity;
}
return 0;
}
/*
* Function : rrc_init_global_cc_context
* Description: Helper funtion to initilize the RB_Config for a
......
......@@ -539,6 +539,8 @@ init_SI(
}
LOG_D(RRC, "About to call rrc_mac_config_req_eNB for ngran_eNB\n");
lchannelType = Bearer_BCCH_BCH_e;
bcchTransportType = bch_TRANSPORT;
rrc_mac_config_req_eNB_t tmp = {
.CC_id = CC_id,
.physCellId = carrier->physCellId,
......@@ -1275,6 +1277,7 @@ extern void clean_eNb_dlsch(LTE_eNB_DLSCH_t *dlsch);
void release_UE_in_freeList(module_id_t mod_id) {
PHY_VARS_eNB *eNB_PHY = NULL;
eNB_MAC_INST *eNB_MAC = RC.mac[mod_id];
int CC_id;
pthread_mutex_lock(&lock_ue_freelist);
for(int ue_num = 0; ue_num < sizeofArray(eNB_MAC->UE_free_ctrl) ; ue_num++) {
......@@ -1284,7 +1287,7 @@ void release_UE_in_freeList(module_id_t mod_id) {
protocol_ctxt_t ctxt;
PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, mod_id, ENB_FLAG_YES, rnti, 0, 0, mod_id);
for (int CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
for (int CC_id = 0; CC_id < RC.nb_CC[0]; CC_id++) {
eNB_PHY = RC.eNB[mod_id][CC_id];
int id;
// clean ULSCH entries for rnti
......@@ -1440,6 +1443,8 @@ rrc_eNB_generate_SecurityModeCommand(
DCCH);
LOG_I(RRC, "calling rrc_data_req :securityModeCommand\n");
lchannelType = Bearer_DCCH_e;
bcchTransportType = dlsch_TRANSPORT;
rrc_data_req(ctxt_pP, DCCH, rrc_eNB_mui++, SDU_CONFIRM_NO, size, buffer, PDCP_TRANSMISSION_MODE_CONTROL);
}
......@@ -1473,6 +1478,8 @@ rrc_eNB_generate_UECapabilityEnquiry(
size,
rrc_eNB_mui,
DCCH);
lchannelType = Bearer_DCCH_e;
bcchTransportType = dlsch_TRANSPORT;
rrc_data_req(
ctxt_pP,
DCCH,
......@@ -2163,6 +2170,8 @@ rrc_eNB_process_RRCConnectionReestablishmentComplete(
LOG_D(RRC,
"[FRAME %05d][RRC_eNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_eNB_mui, ctxt_pP->module_id, DCCH);
lchannelType = Bearer_DCCH_e;
bcchTransportType = dlsch_TRANSPORT;
rrc_data_req(
ctxt_pP,
DCCH,
......@@ -2296,6 +2305,9 @@ rrc_eNB_generate_RRCConnectionRelease(
pthread_mutex_unlock(&rrc_release_freelist);
lchannelType = Bearer_DCCH_e;
bcchTransportType = dlsch_TRANSPORT;
rrc_data_req(ctxt_pP,
DCCH,
rrc_eNB_mui++,
......@@ -2577,6 +2589,8 @@ rrc_eNB_generate_dedicatedRRCConnectionReconfiguration(const protocol_ctxt_t *co
LOG_D(RRC,
"[FRAME %05d][RRC_eNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_eNB_mui, ctxt_pP->module_id, DCCH);
lchannelType = Bearer_DCCH_e;
bcchTransportType = dlsch_TRANSPORT;
rrc_data_req(
ctxt_pP,
DCCH,
......@@ -2860,6 +2874,8 @@ rrc_eNB_modify_dedicatedRRCConnectionReconfiguration(const protocol_ctxt_t *cons
LOG_D(RRC,
"[FRAME %05d][RRC_eNB][MOD %u][][--- PDCP_DATA_REQ/%d Bytes (rrcConnectionReconfiguration to UE %x MUI %d) --->][PDCP][MOD %u][RB %u]\n",
ctxt_pP->frame, ctxt_pP->module_id, size, ue_context_pP->ue_context.rnti, rrc_eNB_mui, ctxt_pP->module_id, DCCH);
lchannelType = Bearer_DCCH_e;
bcchTransportType = dlsch_TRANSPORT;
rrc_data_req(
ctxt_pP,
DCCH,
......@@ -9707,6 +9723,8 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
}
itti_poll_msg(TASK_RRC_ENB, &msg_p);
}
msg_p = NULL;
return NULL;
}
......
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