From 94d146e80b5fdc254a05a7dbc42f170dc53a8cdb Mon Sep 17 00:00:00 2001
From: Melissa Elkadi <melissa@episci.com>
Date: Tue, 23 Nov 2021 08:05:58 -0800
Subject: [PATCH] Renaming queue.h in PHY_INTERFACE layer to queue_t.h
There are two queue.h files in this repository.
---
cmake_targets/CMakeLists.txt | 18 +++++++++---------
nfapi/oai_integration/gnb_ind_vars.h | 2 +-
nfapi/oai_integration/nfapi_vnf.c | 2 +-
.../vnf/public_inc/nfapi_vnf_interface.h | 2 +-
openair2/NR_PHY_INTERFACE/NR_IF_Module.c | 2 +-
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h | 2 +-
openair2/PHY_INTERFACE/phy_stub_UE.h | 2 +-
openair2/PHY_INTERFACE/{queue.c => queue_t.c} | 2 +-
openair2/PHY_INTERFACE/{queue.h => queue_t.h} | 0
openair2/PHY_INTERFACE/queue_test.c | 2 +-
openair2/RRC/NR_UE/rrc_proto.h | 2 +-
11 files changed, 18 insertions(+), 18 deletions(-)
rename openair2/PHY_INTERFACE/{queue.c => queue_t.c} (99%)
rename openair2/PHY_INTERFACE/{queue.h => queue_t.h} (100%)
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 111ee99ed0e..8580857b0b9 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/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}
diff --git a/nfapi/oai_integration/gnb_ind_vars.h b/nfapi/oai_integration/gnb_ind_vars.h
index aff5baa7e42..8561037d3e4 100644
--- a/nfapi/oai_integration/gnb_ind_vars.h
+++ b/nfapi/oai_integration/gnb_ind_vars.h
@@ -1,6 +1,6 @@
#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;
diff --git a/nfapi/oai_integration/nfapi_vnf.c b/nfapi/oai_integration/nfapi_vnf.c
index 8fae03f7b62..44ee05940fc 100644
--- a/nfapi/oai_integration/nfapi_vnf.c
+++ b/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
diff --git a/nfapi/open-nFAPI/vnf/public_inc/nfapi_vnf_interface.h b/nfapi/open-nFAPI/vnf/public_inc/nfapi_vnf_interface.h
index b6d640a75a9..decb48e5c83 100644
--- a/nfapi/open-nFAPI/vnf/public_inc/nfapi_vnf_interface.h
+++ b/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"
diff --git a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
index 7d19f350271..8cdc39ef6a0 100644
--- a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+++ b/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
diff --git a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h b/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h
index 37771282c07..2a8a5147694 100755
--- a/openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h
+++ b/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"
diff --git a/openair2/PHY_INTERFACE/phy_stub_UE.h b/openair2/PHY_INTERFACE/phy_stub_UE.h
index 0d7986640a3..ebaae6e667b 100644
--- a/openair2/PHY_INTERFACE/phy_stub_UE.h
+++ b/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
diff --git a/openair2/PHY_INTERFACE/queue.c b/openair2/PHY_INTERFACE/queue_t.c
similarity index 99%
rename from openair2/PHY_INTERFACE/queue.c
rename to openair2/PHY_INTERFACE/queue_t.c
index d837857ac72..fd4b870676c 100644
--- a/openair2/PHY_INTERFACE/queue.c
+++ b/openair2/PHY_INTERFACE/queue_t.c
@@ -1,4 +1,4 @@
-#include "queue.h"
+#include "queue_t.h"
#include <string.h>
#include <assert.h>
diff --git a/openair2/PHY_INTERFACE/queue.h b/openair2/PHY_INTERFACE/queue_t.h
similarity index 100%
rename from openair2/PHY_INTERFACE/queue.h
rename to openair2/PHY_INTERFACE/queue_t.h
diff --git a/openair2/PHY_INTERFACE/queue_test.c b/openair2/PHY_INTERFACE/queue_test.c
index e33a437b435..542b6a676b2 100644
--- a/openair2/PHY_INTERFACE/queue_test.c
+++ b/openair2/PHY_INTERFACE/queue_test.c
@@ -1,4 +1,4 @@
-#include "queue.h"
+#include "queue_t.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/openair2/RRC/NR_UE/rrc_proto.h b/openair2/RRC/NR_UE/rrc_proto.h
index f13ad8805de..c9b3bf86a10 100644
--- a/openair2/RRC/NR_UE/rrc_proto.h
+++ b/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;
--
GitLab