From 3b102319f6fe5637217f74387f957ae167d6dde7 Mon Sep 17 00:00:00 2001
From: hongzhi wang <hongzhi.wang@tcl.com>
Date: Wed, 14 Nov 2018 17:12:17 +0100
Subject: [PATCH] make nr_dlschsim compile again

---
 cmake_targets/CMakeLists.txt                | 5 ++---
 cmake_targets/build_oai                     | 2 +-
 openair1/PHY/INIT/nr_init.c                 | 4 ++--
 openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index c4737db736..48e67e0662 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -2552,9 +2552,8 @@ target_link_libraries(polartest SIMU PHY PHY_NR PHY_COMMON m ${ATLAS_LIBRARIES})
 add_executable(ldpctest  ${OPENAIR1_DIR}/PHY/CODING/TESTBENCH/ldpctest.c)
 target_link_libraries(ldpctest SIMU PHY PHY_NR m ${ATLAS_LIBRARIES})
 
-add_executable(nr_dlschsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c     
-    ${CONFIG_SOURCES})
-target_link_libraries(nr_dlschsim  -Wl,--start-group UTIL SIMU PHY PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB ${CONFIG_LIBRARIES} -Wl,--end-group m pthread dl rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES})
+add_executable(nr_dlschsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlschsim.c ${T_SOURCE})
+target_link_libraries(nr_dlschsim  -Wl,--start-group UTIL SIMU PHY PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
 
 add_executable(nr_pbchsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/pbchsim.c ${T_SOURCE})
 target_link_libraries(nr_pbchsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 56f5300051..36ed67c7f2 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -692,7 +692,7 @@ function main() {
     echo_info "Compiling unitary tests simulators"
     # TODO: fix: dlsim_tm4 pucchsim prachsim pdcchsim pbchsim mbmssim
     #simlist="dlsim_tm4 dlsim ulsim pucchsim prachsim pdcchsim pbchsim mbmssim"
-    simlist="dlsim ulsim polartest ldpctest nr_pbchsim"
+    simlist="nr_pbchsim nr_dlschsim"
     for f in $simlist ; do
       compilations \
       phy_simulators $f \
diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index d41289f7dc..6702b34ca4 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -496,10 +496,10 @@ void init_nr_transport(PHY_VARS_gNB *gNB) {
       if (!gNB->dlsch[i][j]) {
 	LOG_E(PHY,"Can't get gNB dlsch structures for UE %d \n", i);
 	exit(-1);
-      } else {
+      }/* else {
 	gNB->dlsch[i][j]->rnti=0;
 	LOG_D(PHY,"dlsch[%d][%d] => %p rnti:%d\n",i,j,gNB->dlsch[i][j], gNB->dlsch[i][j]->rnti);
-      }
+      }*/
     }
     
     //LOG_I(PHY,"Allocating Transport Channel Buffer for ULSCH, UE %d\n",i);
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
index 5c89a3b4b5..68c273ddb5 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
@@ -225,10 +225,10 @@ NR_gNB_DLSCH_t *new_gNB_dlsch(unsigned char Kmimo,
     }
   }
 
-  LOG_D(PHY,"new_gNB_dlsch exit flag %d, size of  %ld\n",
+ /* LOG_D(PHY,"new_gNB_dlsch exit flag %d, size of  %ld\n",
 	exit_flag, sizeof(NR_gNB_DLSCH_t));
   free_gNB_dlsch(dlsch);
-  return(NULL);
+  return(NULL);*/
 
 
 }