From 653988982116f4a7c79190a1e559d98ecc178125 Mon Sep 17 00:00:00 2001 From: francescomani Date: Thu, 23 Apr 2026 09:04:35 +0200 Subject: [PATCH 1/2] remove unnecessary nfapi_nr_interface_scf dependence in nr_mac_common_tdd Signed-off-by: francescomani --- nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h | 1 - openair2/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h index fb178951f3..312a3a6e3c 100644 --- a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h +++ b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h @@ -23,7 +23,6 @@ #define NFAPI_MAX_NUM_CB 8 #define NFAPI_MAX_NUM_PRGS 1 #define NFAPI_MAX_NUM_BG_IF 6 -#define NFAPI_MAX_NUM_PERIODS 8 // Extension to the generic structures for single tlv values diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c index 3d43c6e867..2b5e9f33dc 100644 --- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c +++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common_tdd.c @@ -2,10 +2,10 @@ * SPDX-License-Identifier: LicenseRef-CSSL-1.0 */ - #include "nr_mac_common.h" #include "common/utils/nr/nr_common.h" -#include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h" + +#define MAX_NUM_PERIODS 8 uint16_t get_ul_bitmap(const frame_structure_t *fs, int slot) { @@ -58,7 +58,7 @@ int get_tdd_period_idx(NR_TDD_UL_DL_ConfigCommon_t *tdd) float pattern2_ms = tdd->pattern2 ? get_tdd_periodicity(tdd->pattern2) : 0.0; bool found_match = false; // Find matching TDD period in the predefined list of periodicities - for (int i = 0; i < NFAPI_MAX_NUM_PERIODS; i++) { + for (int i = 0; i < MAX_NUM_PERIODS; i++) { if ((pattern1_ms + pattern2_ms) == tdd_ms_period_pattern[i]) { tdd_period_idx = i; LOG_I(NR_MAC, From fb60743b26da511762bcd7be1e985a2e9b361649 Mon Sep 17 00:00:00 2001 From: francescomani Date: Thu, 23 Apr 2026 09:09:54 +0200 Subject: [PATCH 2/2] remove unused defines in nfapi_nr_interface_scf Signed-off-by: francescomani --- nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h index 312a3a6e3c..c779cd1a0f 100644 --- a/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h +++ b/nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface_scf.h @@ -11,14 +11,9 @@ #include "nfapi_interface.h" #include "nfapi_nr_interface.h" -#define NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS 5 -#define NFAPI_NR_MAX_NB_TCI_STATES_PDCCH 64 #define NFAPI_NR_MAX_NB_CORESETS 12 -#define NFAPI_NR_MAX_NB_SEARCH_SPACES 40 - #define NFAPI_MAX_NUM_UL_UE_PER_GROUP 6 #define NFAPI_MAX_NUM_UL_PDU 255 -#define NFAPI_MAX_NUM_UCI_INDICATION 8 #define NFAPI_MAX_NUM_GROUPS 8 #define NFAPI_MAX_NUM_CB 8 #define NFAPI_MAX_NUM_PRGS 1