Merge remote-tracking branch 'origin/fix-rftest-compilation' into integration_2023_w05

CMakeLists.txt

@@ -2465,7 +2465,8 @@ add_executable(rftest
   ${OPENAIR_DIR}/executables/softmodem-common.c
   ${SHLIB_LOADER_SOURCES}
 )
-target_link_libraries(rftest minimal_lib CONFIG_LIB PHY_NR_COMMON UTIL pthread dl m forms ${T_LIB} )
+target_link_libraries(rftest PRIVATE minimal_lib CONFIG_LIB PHY_NR_COMMON UTIL pthread dl m forms ${T_LIB} )
+target_link_libraries(rftest PRIVATE asn1_lte_rrc asn1_nr_rrc)
 
 add_executable(polartest
   ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/polartest.c

openair1/PHY/TOOLS/calibration_test.c

@@ -3,9 +3,10 @@
 #include <radio/COMMON/common_lib.h>
 #include <executables/softmodem-common.h>
 #include <openair1/PHY/TOOLS/calibration_scope.h>
+#include "nfapi/oai_integration/vendor_ext.h"
 
 
-volatile int oai_exit=false;
+int oai_exit=false;
 unsigned int mmapped_dma=0;
 int      single_thread_flag;
 uint32_t timing_advance;
@@ -21,6 +22,9 @@ uint64_t dlsch_slot_bitmap = (1<<1);
 uint64_t ulsch_slot_bitmap = (1<<8);
 uint32_t target_ul_bw = 50;
 uint32_t target_dl_bw = 50;
+uint32_t target_dl_Nl;
+uint32_t target_ul_Nl;
+char *uecap_file;
 #include <executables/nr-softmodem.h>
 
 int read_recplayconfig(recplay_conf_t **recplay_conf, recplay_state_t **recplay_state) {return 0;}