From 01c2f79f9ea9f23b8f9e105d1871ec5a2254fb9f Mon Sep 17 00:00:00 2001
From: David Kim <david.kim@episci.com>
Date: Thu, 11 Nov 2021 12:43:26 -0800
Subject: [PATCH] Fixed build error in eNB ocp.

---
 cmake_targets/CMakeLists.txt      | 2 ++
 executables/main-fs6.c            | 4 +++-
 executables/nr-uesoftmodem.c      | 1 -
 openair3/NAS/UE/nas_ue_task.c     | 2 ++
 targets/RT/USER/lte-softmodem.c   | 1 -
 targets/RT/USER/lte-uesoftmodem.c | 1 -
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 7c41b5a90b..111ee99ed0 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -2891,6 +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
   ${XFORMSINTERFACE_SOURCE}
   ${T_SOURCE}
   ${CONFIG_SOURCES}
@@ -3074,6 +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
   ${XFORMS_SOURCE_NR}
   ${T_SOURCE}
   ${CONFIG_SOURCES}
diff --git a/executables/main-fs6.c b/executables/main-fs6.c
index 438edb4044..0de22d8c21 100644
--- a/executables/main-fs6.c
+++ b/executables/main-fs6.c
@@ -553,7 +553,9 @@ void fill_rx_indication_from_split(uint8_t *bufferZone, PHY_VARS_eNB *eNB,int UE
   pdu->rx_indication_rel8.tl.tag         = NFAPI_RX_INDICATION_REL8_TAG;
   pdu->rx_indication_rel8.length         = eNB->ulsch[UE_id]->harq_processes[harq_pid]->TBS>>3;
   pdu->rx_indication_rel8.offset         = 1;   // DJP - I dont understand - but broken unless 1 ????  0;  // filled in at the end of the UL_INFO formation
-  pdu->data                              = eNB->ulsch[UE_id]->harq_processes[harq_pid]->decodedBytes;
+  memcpy(pdu->rx_ind_data,
+         eNB->ulsch[UE_id]->harq_processes[harq_pid]->decodedBytes,
+         pdu->rx_indication_rel8.length);
   // estimate timing advance for MAC
   timing_advance_update                  = ul_propa[UE_id].ta;
 
diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c
index 7c2f49f0b1..f6f28d8cf2 100644
--- a/executables/nr-uesoftmodem.c
+++ b/executables/nr-uesoftmodem.c
@@ -155,7 +155,6 @@ char         uecap_xer[1024];
  */
 uint8_t abstraction_flag=0;
 
-uint16_t ue_idx_standalone = 0xFFFF;
 
 /*---------------------BMC: timespec helpers -----------------------------*/
 
diff --git a/openair3/NAS/UE/nas_ue_task.c b/openair3/NAS/UE/nas_ue_task.c
index 670600e0ad..88938c3c37 100644
--- a/openair3/NAS/UE/nas_ue_task.c
+++ b/openair3/NAS/UE/nas_ue_task.c
@@ -42,6 +42,8 @@
 extern unsigned char NB_eNB_INST;
 extern uint16_t NB_UE_INST;
 
+uint16_t ue_idx_standalone = 0xFFFF;
+
 char *make_port_str_from_ueid(const char *base_port_str, int ueid);
 
 static int nas_ue_process_events(nas_user_container_t *users, struct epoll_event *events, int nb_events)
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 11be1a6653..2c4d44643b 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -181,7 +181,6 @@ eth_params_t *eth_params;
 double cpuf;
 
 int oaisim_flag=0;
-uint16_t ue_idx_standalone = 0xFFFF;
 uint8_t proto_agent_flag = 0;
 
 
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index 2f8688f87e..24191d5f71 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -276,7 +276,6 @@ void exit_function(const char *file, const char *function, const int line, const
 }
 
 extern int16_t dlsch_demod_shift;
-uint16_t ue_idx_standalone = 0xFFFF;
 uint16_t node_number;
 static void get_options(void) {
   int CC_id=0;