Merge branch 'episys/master-nsa' into episys/david/multi_ue_sa

cmake_targets/CMakeLists.txt

@@ -2131,7 +2131,7 @@ set (MAC_NR_SRC
 
 set (MAC_SRC_UE
   ${PHY_INTERFACE_DIR}/phy_stub_UE.c
-  ${PHY_INTERFACE_DIR}/queue.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
   ${MAC_DIR}/main_ue.c
   ${MAC_DIR}/ue_procedures.c
   ${MAC_DIR}/ra_procedures.c
@@ -2845,7 +2845,7 @@ add_executable(lte-softmodem
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${OPENAIR_DIR}/common/utils/utils.c
   ${OPENAIR_DIR}/common/utils/system.c
-  ${PHY_INTERFACE_DIR}/queue.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
   ${GTPU_need_ITTI}
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
   ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
@@ -2891,7 +2891,7 @@ add_executable(ocp-enb
   ${OPENAIR_DIR}/common/utils/system.c
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
   ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
-  ${PHY_INTERFACE_DIR}/queue.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
   ${XFORMSINTERFACE_SOURCE}
   ${T_SOURCE}
   ${CONFIG_SOURCES}
@@ -3033,7 +3033,7 @@ add_executable(nr-softmodem
   ${OPENAIR_DIR}/common/utils/lte/ue_power.c
   ${OPENAIR_DIR}/common/utils/lte/prach_utils.c
   ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${PHY_INTERFACE_DIR}/queue.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
   ${GTPU_need_ITTI}
   ${XFORMSINTERFACE_SOURCE}
   ${T_SOURCE}
@@ -3075,7 +3075,7 @@ add_executable(ocp-gnb
   ${OPENAIR_DIR}/common/utils/nr/nr_common.c
   ${OPENAIR_DIR}/common/utils/utils.c
   ${OPENAIR_DIR}/common/utils/system.c
-  ${PHY_INTERFACE_DIR}/queue.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
   ${XFORMS_SOURCE_NR}
   ${T_SOURCE}
   ${CONFIG_SOURCES}
@@ -3282,7 +3282,7 @@ add_executable(nr_dlsim
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
-  ${PHY_INTERFACE_DIR}/queue.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
   ${UTIL_SRC}
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES}
@@ -3304,7 +3304,7 @@ add_executable(nr_prachsim
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
   ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
-  ${PHY_INTERFACE_DIR}/queue.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
   ${UTIL_SRC}
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES})
@@ -3318,7 +3318,7 @@ add_executable(nr_ulschsim
   ${OPENAIR_DIR}/common/utils/utils.c
   ${OPENAIR_DIR}/common/utils/system.c
   ${OPENAIR_DIR}/common/utils/nr/nr_common.c
-  ${PHY_INTERFACE_DIR}/queue.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
   ${UTIL_SRC}
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES}
@@ -3339,7 +3339,7 @@ add_executable(nr_ulsim
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
   ${NR_UE_RRC_DIR}/rrc_nsa.c
   ${NFAPI_USER_DIR}/nfapi.c
-  ${PHY_INTERFACE_DIR}/queue.c
+  ${PHY_INTERFACE_DIR}/queue_t.c
   ${UTIL_SRC}
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES}

nfapi/oai_integration/gnb_ind_vars.h

 #pragma once
 
-#include "openair2/PHY_INTERFACE/queue.h"
+#include "openair2/PHY_INTERFACE/queue_t.h"
 
 extern queue_t gnb_rach_ind_queue;
 extern queue_t gnb_rx_ind_queue;

nfapi/oai_integration/nfapi_vnf.c

@@ -43,7 +43,7 @@
 #include <targets/RT/USER/lte-softmodem.h>
 
 #include "common/ran_context.h"
-#include "openair2/PHY_INTERFACE/queue.h"
+#include "openair2/PHY_INTERFACE/queue_t.h"
 #include "gnb_ind_vars.h"
 
 #define TEST

nfapi/open-nFAPI/vnf/public_inc/nfapi_vnf_interface.h

@@ -20,7 +20,7 @@
 #include "nfapi_interface.h"
 #include "nfapi_nr_interface_scf.h"
 #include "nfapi_nr_interface.h"
-#include "openair2/PHY_INTERFACE/queue.h"
+#include "openair2/PHY_INTERFACE/queue_t.h"
 
 #include "debug.h"
 

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -38,7 +38,7 @@
 #include "executables/softmodem-common.h"
 #include "nfapi/oai_integration/vendor_ext.h" 
 #include "nfapi/oai_integration/gnb_ind_vars.h"
-#include "openair2/PHY_INTERFACE/queue.h"
+#include "openair2/PHY_INTERFACE/queue_t.h"
 
 #define MAX_IF_MODULES 100
 //#define UL_HARQ_PRINT

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h

@@ -37,7 +37,7 @@
 #include <openair1/PHY/thread_NR_UE.h>
 #include <semaphore.h>
 #include "fapi_nr_ue_interface.h"
-#include "openair2/PHY_INTERFACE/queue.h"
+#include "openair2/PHY_INTERFACE/queue_t.h"
 #include "nfapi_nr_interface_scf.h"
 #include "openair2/NR_PHY_INTERFACE/NR_IF_Module.h"
 

openair2/PHY_INTERFACE/phy_stub_UE.h

@@ -19,7 +19,7 @@
 //#include "openair1/PHY/LTE_TRANSPORT/defs.h"
 //#include "openair1/PHY/defs.h"
 //#include "openair1/PHY/LTE_TRANSPORT/defs.h"
-#include "queue.h"
+#include "queue_t.h"
 
 #define NUM_MCS 28
 #define NUM_SINR 100

openair2/PHY_INTERFACE/queue.c → openair2/PHY_INTERFACE/queue_t.c

-#include "queue.h"
+#include "queue_t.h"
 #include <string.h>
 #include <assert.h>
 

openair2/PHY_INTERFACE/queue_test.c

-#include "queue.h"
+#include "queue_t.h"
 #include <stdio.h>
 #include <stdlib.h>
 

openair2/RRC/NR_UE/rrc_proto.h

@@ -39,7 +39,7 @@
 #include "NR_MeasConfig.h"
 #include "NR_CellGroupConfig.h"
 #include "NR_RadioBearerConfig.h"
-#include "openair2/PHY_INTERFACE/queue.h"
+#include "openair2/PHY_INTERFACE/queue_t.h"
 
 extern queue_t nr_rach_ind_queue;
 extern queue_t nr_rx_ind_queue;