Fix for unit tests

openair1/PHY/INIT/nr_parms.h

@@ -0,0 +1,27 @@
+/*
+ * SPDX-License-Identifier: LicenseRef-CSSL-1.0
+ */
+
+#ifndef _NR_PARMS_H_
+#define _NR_PARMS_H_
+#include "fapi_nr_ue_interface.h"
+#include "openair1/PHY/defs_nr_UE.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void nr_init_frame_parms(nfapi_nr_config_request_scf_t *config, NR_DL_FRAME_PARMS *frame_parms);
+int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *frame_parms, fapi_nr_config_request_t *config, uint16_t nr_band);
+void nr_init_frame_parms_ue_sa(NR_DL_FRAME_PARMS *frame_parms, const nrUE_cell_params_t *cell);
+int nr_init_frame_parms_ue_sl(NR_DL_FRAME_PARMS *fp,
+                              sl_nr_phy_config_request_t *config,
+                              int threequarter_fs,
+                              uint32_t ofdm_offset_divisor);
+void nr_dump_frame_parms(NR_DL_FRAME_PARMS *frame_parms);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

openair1/PHY/INIT/nr_phy_init.h

@@ -7,19 +7,12 @@
 
 #include "PHY/defs_gNB.h"
 #include "PHY/defs_nr_UE.h"
+#include "nr_parms.h"
 
 int nr_get_ssb_start_symbol(const NR_DL_FRAME_PARMS *fp, uint8_t i_ssb);
-void nr_init_frame_parms(nfapi_nr_config_request_scf_t *config, NR_DL_FRAME_PARMS *frame_parms);
-int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *frame_parms, fapi_nr_config_request_t *config, uint16_t nr_band);
-void nr_init_frame_parms_ue_sa(NR_DL_FRAME_PARMS *frame_parms, const nrUE_cell_params_t *cell);
-int nr_init_frame_parms_ue_sl(NR_DL_FRAME_PARMS *fp,
-                              sl_nr_phy_config_request_t *config,
-                              int threequarter_fs,
-                              uint32_t ofdm_offset_divisor);
 int init_nr_ue_signal(PHY_VARS_NR_UE *ue,int nb_connected_eNB);
 void term_nr_ue_signal(PHY_VARS_NR_UE *ue);
 void init_nr_ue_transport(PHY_VARS_NR_UE *ue);
-void nr_dump_frame_parms(NR_DL_FRAME_PARMS *frame_parms);
 void phy_init_nr_gNB(PHY_VARS_gNB *gNB);
 int init_codebook_gNB(PHY_VARS_gNB *gNB);
 void nr_phy_config_request(NR_PHY_Config_t *gNB);

openair1/PHY/INIT/tests/test_nr_frame_params.cpp

@@ -6,7 +6,7 @@
 extern "C" {
 #include <stdlib.h>
 #include "openair1/PHY/defs_nr_common.h"
-#include "openair1/PHY/INIT/nr_phy_init.h"
+#include "openair1/PHY/INIT/nr_parms.h"
 
 static softmodem_params_t softmodem_params;
 softmodem_params_t *get_softmodem_params(void)

openair2/LAYER2/NR_MAC_UE/tests/test_nr_ue_power_procedures.cpp

@@ -691,7 +691,7 @@ TEST(test_srs_power, tpc_accumulation)
 int main(int argc, char** argv)
 {
   logInit();
-  uniqCfg = load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY);
+  load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY);
   g_log->log_component[MAC].level = OAILOG_DEBUG;
   g_log->log_component[NR_MAC].level = OAILOG_DEBUG;
   testing::InitGoogleTest(&argc, argv);

openair2/LAYER2/NR_MAC_UE/tests/test_nr_ue_ra_procedures.cpp

@@ -134,7 +134,7 @@ TEST(test_init_ra, four_step_cfra)
 int main(int argc, char **argv)
 {
   logInit();
-  uniqCfg = load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY);
+  load_configmodule(argc, argv, CONFIG_ENABLECMDLINEONLY);
   g_log->log_component[MAC].level = OAILOG_DEBUG;
   g_log->log_component[NR_MAC].level = OAILOG_DEBUG;
   testing::InitGoogleTest(&argc, argv);