Skip to content

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

conditions for configuration in DU

parent 876e9efd
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 7 deletions
openair2/ENB_APP/enb_config.c
View file @ 45eda995
...@@ -675,8 +675,14 @@ int RCconfig_RRC(uint32_t i, eNB_RRC_INST *rrc, int macrlc_has_f1) { ...@@ -675,8 +675,14 @@ int RCconfig_RRC(uint32_t i, eNB_RRC_INST *rrc, int macrlc_has_f1) {
else { else {
// set to ngran_eNB for now, it will get set to ngran_eNB_DU if macrlc entity which uses F1 is present // set to ngran_eNB for now, it will get set to ngran_eNB_DU if macrlc entity which uses F1 is present
// Note: we will have to handle the case of ngran_ng_eNB_DU // Note: we will have to handle the case of ngran_ng_eNB_DU
if (macrlc_has_f1 == 0) rrc->node_type = ngran_eNB; if (macrlc_has_f1 == 0) {
else rrc->node_type = ngran_eNB_DU; rrc->node_type = ngran_eNB;
LOG_I(RRC,"Setting node_type to ngran_eNB\n");
}
else {
rrc->node_type = ngran_eNB_DU;
LOG_I(RRC,"Setting node_type to ngran_eNB_DU\n");
}
} }
// MCC and MNC // MCC and MNC
......
openair2/RRC/LTE/rrc_eNB.c
View file @ 45eda995
...@@ -169,9 +169,8 @@ init_SI( ...@@ -169,9 +169,8 @@ init_SI(
PROTOCOL_RRC_CTXT_ARGS(ctxt_pP)); PROTOCOL_RRC_CTXT_ARGS(ctxt_pP));
LOG_I(RRC,"[eNB %d] Node type %d \n ", ctxt_pP->module_id, rrc->node_type); LOG_I(RRC,"[eNB %d] Node type %d \n ", ctxt_pP->module_id, rrc->node_type);
if ((rrc->node_type != ngran_eNB_CU) || if ((rrc->node_type == ngran_eNB_DU) ||
(rrc->node_type != ngran_ng_eNB_CU) || (rrc->node_type == ngran_eNB) ) {
(rrc->node_type != ngran_gNB_CU) ) {
// copy basic Cell parameters // copy basic Cell parameters
carrier->physCellId = configuration->Nid_cell[CC_id]; carrier->physCellId = configuration->Nid_cell[CC_id];
carrier->p_eNB = configuration->nb_antenna_ports[CC_id]; carrier->p_eNB = configuration->nb_antenna_ports[CC_id];
...@@ -207,8 +206,9 @@ init_SI( ...@@ -207,8 +206,9 @@ init_SI(
AssertFatal(carrier->sizeof_SIB1 != 255,"FATAL, RC.rrc[enb_mod_idP].carrier[CC_id].sizeof_SIB1 == 255"); AssertFatal(carrier->sizeof_SIB1 != 255,"FATAL, RC.rrc[enb_mod_idP].carrier[CC_id].sizeof_SIB1 == 255");
} }
if ((rrc->node_type != ngran_eNB_DU) || if ((rrc->node_type == ngran_eNB_CU) ||
(rrc->node_type != ngran_gNB_DU)) { (rrc->node_type == ngran_ng_eNB_CU) ||
(rrc->node_type == ngran_eNB)) {
carrier->SIB23 = (uint8_t*) malloc16(64); carrier->SIB23 = (uint8_t*) malloc16(64);
AssertFatal(carrier->SIB23!=NULL,"cannot allocate memory for SIB"); AssertFatal(carrier->SIB23!=NULL,"cannot allocate memory for SIB");
carrier->sizeof_SIB23 = do_SIB23( carrier->sizeof_SIB23 = do_SIB23(
......
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