Commit fb5f1f69 authored by Sakthivel Velumani's avatar Sakthivel Velumani

including NR band in LTE config file

parent 379aa9c4
...@@ -326,6 +326,7 @@ typedef struct RrcConfigurationReq_s { ...@@ -326,6 +326,7 @@ typedef struct RrcConfigurationReq_s {
long discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_bits_unused[MAX_NUM_CCs]; long discRxPoolPS_ResourceConfig_subframeBitmap_choice_bs_bits_unused[MAX_NUM_CCs];
//Nr secondary cell group SSB central frequency (for ENDC NSA) //Nr secondary cell group SSB central frequency (for ENDC NSA)
int nr_scg_ssb_freq; int nr_scg_ssb_freq;
int nr_band;
} RrcConfigurationReq; } RrcConfigurationReq;
#define MAX_NUM_NBIOT_CELEVELS 3 #define MAX_NUM_NBIOT_CELEVELS 3
......
...@@ -3310,10 +3310,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t ...@@ -3310,10 +3310,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
if (MeasObj2->measObject.choice.measObjectNR_r15.ext1->bandNR_r15 == NULL) exit(1); if (MeasObj2->measObject.choice.measObjectNR_r15.ext1->bandNR_r15 == NULL) exit(1);
MeasObj2->measObject.choice.measObjectNR_r15.ext1->bandNR_r15->present = LTE_MeasObjectNR_r15__ext1__bandNR_r15_PR_setup; MeasObj2->measObject.choice.measObjectNR_r15.ext1->bandNR_r15->present = LTE_MeasObjectNR_r15__ext1__bandNR_r15_PR_setup;
if (rrc_inst->nr_scg_ssb_freq > 2016666) //FR2 MeasObj2->measObject.choice.measObjectNR_r15.ext1->bandNR_r15->choice.setup = rrc_inst->nr_band;
MeasObj2->measObject.choice.measObjectNR_r15.ext1->bandNR_r15->choice.setup = 261;
else
MeasObj2->measObject.choice.measObjectNR_r15.ext1->bandNR_r15->choice.setup = 78;
ASN_SEQUENCE_ADD(&MeasObj_list->list, MeasObj2); ASN_SEQUENCE_ADD(&MeasObj_list->list, MeasObj2);
} }
...@@ -7026,6 +7023,7 @@ char openair_rrc_eNB_configuration( ...@@ -7026,6 +7023,7 @@ char openair_rrc_eNB_configuration(
} }
RC.rrc[ctxt.module_id]->nr_scg_ssb_freq = configuration->nr_scg_ssb_freq; RC.rrc[ctxt.module_id]->nr_scg_ssb_freq = configuration->nr_scg_ssb_freq;
RC.rrc[ctxt.module_id]->nr_band = configuration->nr_band;
openair_rrc_on(&ctxt); openair_rrc_on(&ctxt);
......
...@@ -143,6 +143,7 @@ eNBs = ...@@ -143,6 +143,7 @@ eNBs =
//SSB central frequency of NR secondary cell group (for ENDC NSA) //SSB central frequency of NR secondary cell group (for ENDC NSA)
nr_scg_ssb_freq = 641272; nr_scg_ssb_freq = 641272;
nr_band = 78;
} }
); );
......
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