maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move cell-value lookup functions (SSB ARFCN, ...) to rrc_gNB_du.c

Browse Source 
The functions are needed in a later commit in both rrc_gNB_du.c and
rrc_gNB.c, so move to the rrc_gNB_du.c file concerned with DUs (cells).
This commit is contained in:
batuhan duyuler
2024-06-04 07:43:54 +02:00
committed by Robert Schmidt
parent 76f06a9386
commit e5afdcdd43
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/NR/rrc_gNB.c
-18
View File
@@ -176,24 +176,6 @@ void nr_rrc_transfer_protected_rrc_message(const gNB_RRC_INST *rrc,
&data); &data);
} }
static int get_dl_band(const f1ap_served_cell_info_t *cell_info)
{
return cell_info->mode == F1AP_MODE_TDD ? cell_info->tdd.freqinfo.band : cell_info->fdd.dl_freqinfo.band;
}
static int get_ssb_scs(const f1ap_served_cell_info_t *cell_info)
{
return cell_info->mode == F1AP_MODE_TDD ? cell_info->tdd.tbw.scs : cell_info->fdd.dl_tbw.scs;
}
static int get_ssb_arfcn(const nr_rrc_du_container_t *du)
{
DevAssert(du != NULL && du->mtc != NULL);
/* format has been verified when accepting MeasurementTimingConfiguration */
NR_MeasTimingList_t *mtlist = du->mtc->criticalExtensions.choice.c1->choice.measTimingConf->measTiming;
return mtlist->list.array[0]->frequencyAndTiming->carrierFreq;
}
///---------------------------------------------------------------------------------------------------------------/// ///---------------------------------------------------------------------------------------------------------------///
///---------------------------------------------------------------------------------------------------------------/// ///---------------------------------------------------------------------------------------------------------------///
openair2/RRC/NR/rrc_gNB_du.c
+17
View File
@@ -28,6 +28,23 @@
#include "openair2/F1AP/f1ap_ids.h" #include "openair2/F1AP/f1ap_ids.h"
#include "executables/softmodem-common.h" #include "executables/softmodem-common.h"
int get_dl_band(const struct f1ap_served_cell_info_t *cell_info)
{
return cell_info->mode == F1AP_MODE_TDD ? cell_info->tdd.freqinfo.band : cell_info->fdd.dl_freqinfo.band;
}
int get_ssb_scs(const struct f1ap_served_cell_info_t *cell_info)
{
return cell_info->mode == F1AP_MODE_TDD ? cell_info->tdd.tbw.scs : cell_info->fdd.dl_tbw.scs;
}
int get_ssb_arfcn(const struct nr_rrc_du_container_t *du)
{
DevAssert(du != NULL && du->mtc != NULL);
/* format has been verified when accepting MeasurementTimingConfiguration */
NR_MeasTimingList_t *mtlist = du->mtc->criticalExtensions.choice.c1->choice.measTimingConf->measTiming;
return mtlist->list.array[0]->frequencyAndTiming->carrierFreq;
}
static int du_compare(const nr_rrc_du_container_t *a, const nr_rrc_du_container_t *b) static int du_compare(const nr_rrc_du_container_t *a, const nr_rrc_du_container_t *b)
{ {
openair2/RRC/NR/rrc_gNB_du.h
+4
View File
@@ -42,4 +42,8 @@ struct nr_rrc_du_container_t *get_du_by_assoc_id(struct gNB_RRC_INST_s *rrc, sct
void dump_du_info(const struct gNB_RRC_INST_s *rrc, FILE *f); void dump_du_info(const struct gNB_RRC_INST_s *rrc, FILE *f);
int get_dl_band(const struct f1ap_served_cell_info_t *cell_info);
int get_ssb_scs(const struct f1ap_served_cell_info_t *cell_info);
int get_ssb_arfcn(const struct nr_rrc_du_container_t *du);
#endif /* RRC_GNB_DU_H_ */ #endif /* RRC_GNB_DU_H_ */