From d66986a23fa83aa2aba0b0692cbf21d0b9ed99d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BAben=20Soares=20Silva?= Date: Mon, 9 Sep 2024 09:36:52 +0100 Subject: [PATCH] Use P5 copy function for config.request instead of memcpy --- CMakeLists.txt | 2 +- openair1/PHY/INIT/nr_init.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38168ae460..cc30b7a5bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1047,7 +1047,7 @@ add_library(PHY_NR_COMMON ${PHY_NR_SRC_COMMON}) target_link_libraries(PHY_NR_COMMON PUBLIC UTIL) add_library(PHY_NR ${PHY_NR_SRC}) -target_link_libraries(PHY_NR nr_phy_common nr_common) +target_link_libraries(PHY_NR nr_phy_common nr_common nr_fapi_p5) add_library(PHY_NR_NO_AVX_256 ${PHY_NR_SRC}) target_link_libraries(PHY_NR_NO_AVX_256 nr_phy_common nr_common) diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c index ca453b6e65..7a706f61bf 100644 --- a/openair1/PHY/INIT/nr_init.c +++ b/openair1/PHY/INIT/nr_init.c @@ -42,6 +42,7 @@ #include "SCHED_NR/fapi_nr_l1.h" #include "PHY/NR_REFSIG/ul_ref_seq_nr.h" #include +#include "nfapi/open-nFAPI/fapi/inc/nr_fapi_p5_utils.h" int l1_north_init_gNB() { @@ -363,7 +364,7 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config) NR_DL_FRAME_PARMS *fp = &RC.gNB[Mod_id]->frame_parms; nfapi_nr_config_request_scf_t *gNB_config = &RC.gNB[Mod_id]->gNB_config; - memcpy((void*)gNB_config,phy_config->cfg,sizeof(*phy_config->cfg)); + copy_config_request(phy_config->cfg, gNB_config); uint64_t dl_bw_khz = (12*gNB_config->carrier_config.dl_grid_size[gNB_config->ssb_config.scs_common.value].value)*(15<ssb_config.scs_common.value); fp->dl_CarrierFreq = ((dl_bw_khz>>1) + gNB_config->carrier_config.dl_frequency.value)*1000 ;