From 9bfe62b85b26788cee21960e1cfd9a4c09c5e910 Mon Sep 17 00:00:00 2001 From: Guido Casati Date: Tue, 6 Jan 2026 11:08:28 +0100 Subject: [PATCH] RRC multi-cell (finalise): make internal helper functions static After introduction of new cell management design, these helper functions are now only used internally within their respective modules and do not need to be part of the public API. They are made static and their declarations are removed from public headers. Changes: - f1ap_interface_management.c: Make free_f1ap_cell() and copy_f1ap_served_cell_info() static - f1ap_interface_management.h: Remove declarations for the above functions - rrc_gNB_du.c: Make get_dl_band() and get_ssb_scs() static - rrc_gNB_du.h: Remove declarations for get_dl_band() and get_ssb_scs() --- openair2/F1AP/lib/f1ap_interface_management.c | 4 ++-- openair2/F1AP/lib/f1ap_interface_management.h | 2 -- openair2/RRC/NR/rrc_gNB_du.c | 4 ++-- openair2/RRC/NR/rrc_gNB_du.h | 2 -- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/openair2/F1AP/lib/f1ap_interface_management.c b/openair2/F1AP/lib/f1ap_interface_management.c index 38de5e4dcc..55b4972d4b 100644 --- a/openair2/F1AP/lib/f1ap_interface_management.c +++ b/openair2/F1AP/lib/f1ap_interface_management.c @@ -423,7 +423,7 @@ static F1AP_ProtocolExtensionContainer_11023P34_t *write_slice_info(int num_ssi, /** * @brief F1AP Setup Request memory management */ -void free_f1ap_cell(const f1ap_served_cell_info_t *info, const f1ap_gnb_du_system_info_t *sys_info) +static void free_f1ap_cell(const f1ap_served_cell_info_t *info, const f1ap_gnb_du_system_info_t *sys_info) { if (sys_info) { free(sys_info->mib); @@ -886,7 +886,7 @@ bool decode_f1ap_setup_request(const F1AP_F1AP_PDU_t *pdu, f1ap_setup_req_t *out return true; } -f1ap_served_cell_info_t copy_f1ap_served_cell_info(const f1ap_served_cell_info_t *src) +static f1ap_served_cell_info_t copy_f1ap_served_cell_info(const f1ap_served_cell_info_t *src) { f1ap_served_cell_info_t dst = { .plmn = src->plmn, diff --git a/openair2/F1AP/lib/f1ap_interface_management.h b/openair2/F1AP/lib/f1ap_interface_management.h index 56f6579f2f..942a9932ad 100644 --- a/openair2/F1AP/lib/f1ap_interface_management.h +++ b/openair2/F1AP/lib/f1ap_interface_management.h @@ -46,8 +46,6 @@ bool decode_f1ap_setup_request(const struct F1AP_F1AP_PDU *pdu, f1ap_setup_req_t f1ap_setup_req_t cp_f1ap_setup_request(const f1ap_setup_req_t *msg); bool eq_f1ap_setup_request(const f1ap_setup_req_t *a, const f1ap_setup_req_t *b); void free_f1ap_setup_request(const f1ap_setup_req_t *msg); -f1ap_served_cell_info_t copy_f1ap_served_cell_info(const f1ap_served_cell_info_t *src); -void free_f1ap_cell(const f1ap_served_cell_info_t *info, const f1ap_gnb_du_system_info_t *sys_info); /* F1 Setup Response */ struct F1AP_F1AP_PDU *encode_f1ap_setup_response(const f1ap_setup_resp_t *msg); diff --git a/openair2/RRC/NR/rrc_gNB_du.c b/openair2/RRC/NR/rrc_gNB_du.c index f50c7a2c6e..f2e66257f6 100644 --- a/openair2/RRC/NR/rrc_gNB_du.c +++ b/openair2/RRC/NR/rrc_gNB_du.c @@ -53,12 +53,12 @@ #include "utils.h" #include "xer_encoder.h" -int get_dl_band(const struct f1ap_served_cell_info_t *cell_info) +static 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) +static 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; } diff --git a/openair2/RRC/NR/rrc_gNB_du.h b/openair2/RRC/NR/rrc_gNB_du.h index ce033e91e8..8942af9af5 100644 --- a/openair2/RRC/NR/rrc_gNB_du.h +++ b/openair2/RRC/NR/rrc_gNB_du.h @@ -42,8 +42,6 @@ struct nr_rrc_du_container_t *get_du_for_ue(struct gNB_RRC_INST_s *rrc, uint32_t 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_cell_container_t *cell); struct nr_rrc_du_container_t *find_target_du(struct gNB_RRC_INST_s *rrc, sctp_assoc_t source_assoc_id);