Make all compile in same tree
This commit is contained in:
@@ -1295,10 +1295,8 @@ int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t instance,
|
|||||||
rrcSetup_ies->masterCellGroup.size,0,0);
|
rrcSetup_ies->masterCellGroup.size,0,0);
|
||||||
AssertFatal(dec_rval.code == RC_OK, "could not decode masterCellGroup\n");
|
AssertFatal(dec_rval.code == RC_OK, "could not decode masterCellGroup\n");
|
||||||
|
|
||||||
#if NR
|
|
||||||
gNB_RRC_INST *rrc = RC.nrrrc[ctxt.module_id];
|
|
||||||
|
|
||||||
// configure MAC
|
// configure MAC
|
||||||
|
gNB_RRC_INST *rrc = RC.nrrrc[ctxt.module_id];
|
||||||
rrc_mac_config_req_gNB(ctxt.module_id,
|
rrc_mac_config_req_gNB(ctxt.module_id,
|
||||||
rrc->carrier.ssb_SubcarrierOffset,
|
rrc->carrier.ssb_SubcarrierOffset,
|
||||||
rrc->carrier.pdsch_AntennaPorts,
|
rrc->carrier.pdsch_AntennaPorts,
|
||||||
@@ -1308,6 +1306,7 @@ int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t instance,
|
|||||||
ue_context_p->ue_context.rnti,
|
ue_context_p->ue_context.rnti,
|
||||||
ue_context_p->ue_context.masterCellGroup
|
ue_context_p->ue_context.masterCellGroup
|
||||||
);
|
);
|
||||||
|
|
||||||
// rrc_rlc_config_asn1_req
|
// rrc_rlc_config_asn1_req
|
||||||
nr_rrc_rlc_config_asn1_req(&ctxt,
|
nr_rrc_rlc_config_asn1_req(&ctxt,
|
||||||
ue_context_p->ue_context.SRB_configList,
|
ue_context_p->ue_context.SRB_configList,
|
||||||
@@ -1316,7 +1315,6 @@ int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t instance,
|
|||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
#endif
|
|
||||||
|
|
||||||
// This should be somewhere in the f1ap_cudu_ue_inst_t
|
// This should be somewhere in the f1ap_cudu_ue_inst_t
|
||||||
/*int macrlc_instance = 0;
|
/*int macrlc_instance = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user