Refactor F1 Setup Req: MeasurementTimingInformation is part of cell info
This commit is contained in:
@@ -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];
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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]));
|
||||
|
||||
Reference in New Issue
Block a user