Commit 0794033d authored by Vaibhav Shrivastava's avatar Vaibhav Shrivastava Committed by jperaldi

Remaining MultiCell Changes

parent 8acf8f05
This diff is collapsed.
...@@ -790,8 +790,8 @@ void schedule_response(Sched_Rsp_t *Sched_INFO, void *arg) { ...@@ -790,8 +790,8 @@ void schedule_response(Sched_Rsp_t *Sched_INFO, void *arg) {
eNB->pdcch_vars[subframe&1].num_dci = 0; eNB->pdcch_vars[subframe&1].num_dci = 0;
eNB->phich_vars[subframe&1].num_hi = 0; eNB->phich_vars[subframe&1].num_hi = 0;
eNB->mpdcch_vars[subframe&1].num_dci = 0; eNB->mpdcch_vars[subframe&1].num_dci = 0;
LOG_D(PHY,"NFAPI: Sched_INFO:SFN/SF:%04d%d DL_req:SFN/SF:%04d%d:dl_pdu:%d tx_req:SFN/SF:%04d%d:pdus:%d\n", LOG_A(PHY,"NFAPI: Sched_INFO:SFN/SF:%04d%d CC_id:%d DL_req:SFN/SF:%04d%d:dl_pdu:%d tx_req:SFN/SF:%04d%d:pdus:%d\n",
frame,subframe, frame,subframe,CC_id,
NFAPI_SFNSF2SFN(DL_req->sfn_sf),NFAPI_SFNSF2SF(DL_req->sfn_sf),number_dl_pdu, NFAPI_SFNSF2SFN(DL_req->sfn_sf),NFAPI_SFNSF2SF(DL_req->sfn_sf),number_dl_pdu,
NFAPI_SFNSF2SFN(TX_req->sfn_sf),NFAPI_SFNSF2SF(TX_req->sfn_sf),TX_req->tx_request_body.number_of_pdus NFAPI_SFNSF2SFN(TX_req->sfn_sf),NFAPI_SFNSF2SF(TX_req->sfn_sf),TX_req->tx_request_body.number_of_pdus
); );
...@@ -965,6 +965,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO, void *arg) { ...@@ -965,6 +965,7 @@ void schedule_response(Sched_Rsp_t *Sched_INFO, void *arg) {
} }
Sched_INFO->DL_req->sfn_sf = frame << 4 | subframe; Sched_INFO->DL_req->sfn_sf = frame << 4 | subframe;
Sched_INFO->DL_req->header.phy_id = Sched_INFO->CC_id;
oai_nfapi_dl_config_req(Sched_INFO->DL_req); // DJP - .dl_config_request_body.dl_config_pdu_list[0]); // DJP - FIXME TODO - yuk - only copes with 1 pdu oai_nfapi_dl_config_req(Sched_INFO->DL_req); // DJP - .dl_config_request_body.dl_config_pdu_list[0]); // DJP - FIXME TODO - yuk - only copes with 1 pdu
Sched_INFO->UE_release_req->sfn_sf = frame << 4 | subframe; Sched_INFO->UE_release_req->sfn_sf = frame << 4 | subframe;
oai_nfapi_ue_release_req(Sched_INFO->UE_release_req); oai_nfapi_ue_release_req(Sched_INFO->UE_release_req);
......
This diff is collapsed.
...@@ -10503,6 +10503,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -10503,6 +10503,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
LTE_DL_CCCH_Message_t *dl_ccch_msg=NULL; LTE_DL_CCCH_Message_t *dl_ccch_msg=NULL;
ue_context_pP = rrc_eNB_get_ue_context(RC.rrc[instance], SS_RRC_PDU_REQ(msg_p).rnti); ue_context_pP = rrc_eNB_get_ue_context(RC.rrc[instance], SS_RRC_PDU_REQ(msg_p).rnti);
LOG_A(RRC, "Genreating RRC-CS from TTCN message RRC_PDU_REQ\n"); LOG_A(RRC, "Genreating RRC-CS from TTCN message RRC_PDU_REQ\n");
uint8_t cc_id = ue_context_pP->ue_context.primaryCC_id;
module_id_t Idx; module_id_t Idx;
LOG_A(RRC, "Received data on SRB0 from SS, module id: %d, Frame: %d, instance: %lu \n", LOG_A(RRC, "Received data on SRB0 from SS, module id: %d, Frame: %d, instance: %lu \n",
ctxt.module_id, msg_p->ittiMsgHeader.lte_time.frame, instance); ctxt.module_id, msg_p->ittiMsgHeader.lte_time.frame, instance);
...@@ -10540,7 +10541,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -10540,7 +10541,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
if (dl_ccch_msg->message.choice.c1.present == LTE_DL_CCCH_MessageType__c1_PR_rrcConnectionSetup) { if (dl_ccch_msg->message.choice.c1.present == LTE_DL_CCCH_MessageType__c1_PR_rrcConnectionSetup) {
RRCConnSetup_PDU_Present = true; RRCConnSetup_PDU_Present = true;
rrc_eNB_generate_RRCConnectionSetup(&ctxt, ue_context_pP, 0); rrc_eNB_generate_RRCConnectionSetup(&ctxt, ue_context_pP, cc_id);
LOG_I(RRC, PROTOCOL_RRC_CTXT_UE_FMT "CALLING RLC CONFIG SRB1 (rbid %d)\n", LOG_I(RRC, PROTOCOL_RRC_CTXT_UE_FMT "CALLING RLC CONFIG SRB1 (rbid %d)\n",
PROTOCOL_RRC_CTXT_UE_ARGS(&ctxt), PROTOCOL_RRC_CTXT_UE_ARGS(&ctxt),
...@@ -10563,7 +10564,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) { ...@@ -10563,7 +10564,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
(LTE_PMCH_InfoList_r9_t *)NULL, 0, 0); (LTE_PMCH_InfoList_r9_t *)NULL, 0, 0);
} }
} else if (dl_ccch_msg->message.choice.c1.present == LTE_DL_CCCH_MessageType__c1_PR_rrcConnectionReject) { } else if (dl_ccch_msg->message.choice.c1.present == LTE_DL_CCCH_MessageType__c1_PR_rrcConnectionReject) {
rrc_eNB_generate_RRCConnectionReject(&ctxt, ue_context_pP, 0); rrc_eNB_generate_RRCConnectionReject(&ctxt, ue_context_pP, cc_id);
} }
} }
#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