Skip to content

O
OpenXG-RAN
Commit f9b84615 authored by Melissa Elkadi's avatar Melissa Elkadi
Browse files
Options

Reverting more changing that were unnecessary for SA

parent 59458c96
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
openair2/RRC/NR/rrc_gNB.c
View file @ f9b84615
......@@ -212,16 +212,13 @@ void rrc_gNB_generate_SgNBAdditionRequestAcknowledge(
static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration) {
LOG_D(RRC,"%s()\n\n\n\n",__FUNCTION__);
if (NODE_IS_DU(rrc->node_type) || NODE_IS_MONOLITHIC(rrc->node_type) || get_softmodem_params()->emulate_l2) {
if (NODE_IS_DU(rrc->node_type) || NODE_IS_MONOLITHIC(rrc->node_type)) {
rrc->carrier.MIB = (uint8_t *) malloc16(4);
rrc->carrier.sizeof_MIB = do_MIB_NR(rrc,0);
}
if(get_softmodem_params()->sa &&
((NODE_IS_DU(rrc->node_type) ||
NODE_IS_MONOLITHIC(rrc->node_type) ||
get_softmodem_params()->emulate_l2))) {
rrc->carrier.sizeof_SIB1 = do_SIB1_NR(&rrc->carrier, configuration);
if((get_softmodem_params()->sa) && ( (NODE_IS_DU(rrc->node_type) || NODE_IS_MONOLITHIC(rrc->node_type)))) {
rrc->carrier.sizeof_SIB1 = do_SIB1_NR(&rrc->carrier,configuration);
}
if (!NODE_IS_DU(rrc->node_type)) {
......@@ -234,7 +231,7 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
LOG_I(NR_RRC,"Done init_NR_SI\n");
if (NODE_IS_MONOLITHIC(rrc->node_type) || get_softmodem_params()->emulate_l2){
if (NODE_IS_MONOLITHIC(rrc->node_type)){
rrc_mac_config_req_gNB(rrc->module_id,
rrc->carrier.ssb_SubcarrierOffset,
rrc->carrier.pdsch_AntennaPorts,
......
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