Skip to content

O
OpenXG-RAN
Commit f61aae66 authored by Sakthivel Velumani's avatar Sakthivel Velumani
Browse files
Options

fix of last commit

parent bb81e35a
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
openair2/COMMON/rrc_messages_types.h
View file @ f61aae66
...@@ -326,7 +326,6 @@ typedef struct RrcConfigurationReq_s { ...@@ -326,7 +326,6 @@ 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
......
openair2/RRC/LTE/rrc_eNB.c
View file @ f61aae66
...@@ -3310,7 +3310,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t ...@@ -3310,7 +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;
MeasObj2->measObject.choice.measObjectNR_r15.ext1->bandNR_r15->choice.setup = rrc_inst->nr_band; MeasObj2->measObject.choice.measObjectNR_r15.ext1->bandNR_r15->choice.setup = RC.rrc[ctxt_pP->module_id]->nr_gnb_freq_band[0][0];
ASN_SEQUENCE_ADD(&MeasObj_list->list, MeasObj2); ASN_SEQUENCE_ADD(&MeasObj_list->list, MeasObj2);
} }
...@@ -7023,7 +7023,6 @@ char openair_rrc_eNB_configuration( ...@@ -7023,7 +7023,6 @@ 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);
...@@ -9063,9 +9062,9 @@ void rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) { ...@@ -9063,9 +9062,9 @@ void rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) {
fprintf(fd,"NR_pci %ld\n",ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->pci_r15); fprintf(fd,"NR_pci %ld\n",ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->pci_r15);
if(ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultCell_r15.rsrpResult_r15) if(ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultCell_r15.rsrpResult_r15)
fprintf(fd,"NR_rsrp %f dB\n",to_nr_rsrp(*ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultCell_r15.rsrpResult_r15,RC.rrc[ctxt_pP->module_id])); fprintf(fd,"NR_rsrp %f dB\n",to_nr_rsrp(*ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultCell_r15.rsrpResult_r15));
if (ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultCell_r15.rsrqResult_r15) if (ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultCell_r15.rsrqResult_r15)
fprintf(fd,"NR_rsrq %f dB\n",to_nr_rsrq(*ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultCell_r15.rsrqResult_r15,RC.rrc[ctxt_pP->module_id])); fprintf(fd,"NR_rsrq %f dB\n",to_nr_rsrq(*ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultCell_r15.rsrqResult_r15));
if (ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultRS_IndexList_r15) if (ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultRS_IndexList_r15)
fprintf(fd,"NR_ssb_index %ld\n",ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultRS_IndexList_r15->list.array[0]->ssb_Index_r15); fprintf(fd,"NR_ssb_index %ld\n",ue_context_p->ue_context.measResults->measResultNeighCells->choice.measResultNeighCellListNR_r15.list.array[0]->measResultRS_IndexList_r15->list.array[0]->ssb_Index_r15);
} }
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb.conf
View file @ f61aae66
...@@ -143,7 +143,6 @@ eNBs = ...@@ -143,7 +143,6 @@ 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;
} }
); );
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_enb_fr2.conf
View file @ f61aae66
...@@ -143,7 +143,6 @@ eNBs = ...@@ -143,7 +143,6 @@ 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 = 2071241; nr_scg_ssb_freq = 2071241;
nr_band = 257;
} }
); );
......
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