Merge remote-tracking branch 'origin/develop-nr' into nr_pdsch

cmake_targets/CMakeLists.txt

@@ -1608,7 +1608,13 @@ add_library(L2
   ${ENB_APP_SRC}
   )
 
-#  ${OPENAIR2_DIR}/RRC/L2_INTERFACE/openair_rrc_L2_interface.c)
+add_library(MAC_NR
+  ${MAC_NR_SRC}
+  )
+
+add_library(MAC_UE_NR
+  ${MAC_NR_SRC_UE}
+  )
 
 add_library(L2_NR
   ${L2_NR_SRC}
@@ -2559,6 +2565,9 @@ target_link_libraries(nr_dlschsim  -Wl,--start-group UTIL SIMU PHY PHY_COMMON PH
 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)
 
+add_executable(nr_dlsim  ${OPENAIR1_DIR}/SIMULATION/NR_PHY/dlsim.c ${T_SOURCE})
+target_link_libraries(nr_dlsim  -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR CONFIG_LIB -Wl,--end-group m pthread ${ATLAS_LIBRARIES} ${T_LIB} dl)
+
 
 foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
 

openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c

@@ -91,7 +91,7 @@ uint16_t nr_pbch_extract(int **rxdataF,
     for (rb=0; rb<20; rb++) {
       j=0;
 
-      if (symbol==1 || symbol==7) {
+      if (symbol==1 || symbol==3) {
         for (i=0; i<12; i++) {
           if ((i!=nushiftmod4) &&
               (i!=(nushiftmod4+4)) &&
@@ -147,7 +147,7 @@ uint16_t nr_pbch_extract(int **rxdataF,
     
     for (rb=0; rb<20; rb++) {
       j=0;
-      if (symbol==1 || symbol==7) {
+      if (symbol==1 || symbol==3) {
 	for (i=0; i<12; i++) {
 	  if ((i!=nushiftmod4) &&
 	      (i!=(nushiftmod4+4)) &&

openair1/PHY/phy_vars.h

@@ -59,8 +59,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
 unsigned short rev256[256],rev512[512],rev1024[1024],rev4096[4096],rev2048[2048],rev8192[8192];
 
 
-char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
-
 short conjugate[8]__attribute__((aligned(16))) = {-1,1,-1,1,-1,1,-1,1};
 short conjugate2[8]__attribute__((aligned(16))) = {1,-1,1,-1,1,-1,1,-1};
 

openair1/PHY/phy_vars_nr_ue.h

@@ -55,8 +55,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
 unsigned short rev256[256],rev512[512],rev1024[1024],rev4096[4096],rev2048[2048],rev8192[8192];
 
 
-char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
-
 short conjugate[8]__attribute__((aligned(16))) = {-1,1,-1,1,-1,1,-1,1};
 short conjugate2[8]__attribute__((aligned(16))) = {1,-1,1,-1,1,-1,1,-1};
 

openair1/PHY/phy_vars_ue.h

@@ -24,7 +24,6 @@
 
 #include "PHY/types.h"
 #include "PHY/defs_UE.h"
-#include "PHY/phy_vars_ue.h"
 
 #include "common/ran_context.h"
 
@@ -54,8 +53,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
 unsigned short rev256[256],rev512[512],rev1024[1024],rev4096[4096],rev2048[2048],rev8192[8192];
 
 
-char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
-
 short conjugate[8]__attribute__((aligned(16))) = {-1,1,-1,1,-1,1,-1,1};
 short conjugate2[8]__attribute__((aligned(16))) = {1,-1,1,-1,1,-1,1,-1};
 

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -88,6 +88,8 @@ fifo_dump_emos_UE emos_dump_UE;
 
 #define NS_PER_SLOT 500000
 
+char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
+
 extern double cpuf;
 
 

openair1/SCHED_UE/phy_procedures_lte_ue.c

@@ -71,6 +71,8 @@
 
 #define NS_PER_SLOT 500000
 
+char mode_string[4][20] = {"NOT SYNCHED","PRACH","RAR","PUSCH"};
+
 extern double cpuf;
 
 void Msg1_transmitted(module_id_t module_idP,uint8_t CC_id,frame_t frameP, uint8_t eNB_id);

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h

@@ -181,6 +181,8 @@ int8_t nr_ue_if_module_kill(uint32_t module_id);
    \param dl_info including dci_ind and rx_request messages*/
 int8_t nr_ue_dl_indication(nr_downlink_indication_t *dl_info);
 
+int8_t nr_ue_ul_indication(nr_uplink_indication_t *ul_info);
+
 //  TODO check
 /**\brief handle BCCH-BCH message from dl_indication
    \param pduP            pointer to bch pdu

targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf

@@ -259,6 +259,15 @@ RUs = (
     }
 );  
 
+THREAD_STRUCT = (
+  {
+    #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+    parallel_config    = "PARALLEL_SINGLE_THREAD";
+    #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+    worker_config      = "WORKER_DISABLE";
+  }
+);
+
 NETWORK_CONTROLLER :
 {
     FLEXRAN_ENABLED        = "no";