From d21aa79fe0a656fadff59c3c7b17df780009b35b Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 17 Jul 2023 17:32:30 +0200 Subject: [PATCH] Refactor F1 Setup Req: MeasurementTimingInformation is part of cell info --- openair2/COMMON/f1ap_messages_types.h | 5 ++--- openair2/F1AP/f1ap_du_interface_management.c | 2 +- openair2/GNB_APP/gnb_config.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/openair2/COMMON/f1ap_messages_types.h b/openair2/COMMON/f1ap_messages_types.h index b003b46b3d..777b5a7550 100644 --- a/openair2/COMMON/f1ap_messages_types.h +++ b/openair2/COMMON/f1ap_messages_types.h @@ -135,6 +135,8 @@ typedef struct f1ap_served_cell_info_t { f1ap_fdd_info_t fdd; f1ap_tdd_info_t tdd; }; + + char *measurement_timing_information; } f1ap_served_cell_info_t; typedef struct f1ap_setup_req_s { @@ -150,9 +152,6 @@ typedef struct f1ap_setup_req_s { } cell[F1AP_MAX_NB_CELLS]; - char *measurement_timing_information[F1AP_MAX_NB_CELLS]; - uint8_t ranac[F1AP_MAX_NB_CELLS]; - // System Information uint8_t *mib[F1AP_MAX_NB_CELLS]; int mib_length[F1AP_MAX_NB_CELLS]; diff --git a/openair2/F1AP/f1ap_du_interface_management.c b/openair2/F1AP/f1ap_du_interface_management.c index 91629762ee..be0429a2ba 100644 --- a/openair2/F1AP/f1ap_du_interface_management.c +++ b/openair2/F1AP/f1ap_du_interface_management.c @@ -275,7 +275,7 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance, f1ap_setup_req_t *setup_req) } /* - measurementTimingConfiguration */ - char *measurementTimingConfiguration = setup_req->measurement_timing_information[i]; // sept. 2018 + char *measurementTimingConfiguration = cell->measurement_timing_information; // sept. 2018 OCTET_STRING_fromBuf(&served_cell_information->measurementTimingConfiguration, measurementTimingConfiguration, strlen(measurementTimingConfiguration)); diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c index 44da60010c..ec4a8c18bb 100644 --- a/openair2/GNB_APP/gnb_config.c +++ b/openair2/GNB_APP/gnb_config.c @@ -2009,8 +2009,8 @@ int RCconfig_NR_DU_F1(MessageDef *msg_p, uint32_t i) { /***************** for test *****************/ } - f1Setup->measurement_timing_information[k] = "0"; - f1Setup->ranac[k] = 0; + f1Setup->cell[k].info.measurement_timing_information = "0"; + DevAssert(rrc->carrier.mib != NULL); int buf_len = 3; // this is what we assume in monolithic f1Setup->mib[k] = calloc(buf_len, sizeof(*f1Setup->mib[k]));