merge develop-nr

cmake_targets/oaisim_build_oai/CMakeLists.template

-cmake_minimum_required(VERSION 2.8)
-
-set (  CMAKE_BUILD_TYPE "RelWithDebInfo" )
-set (  DEBUG_OMG False )
-set (  DISABLE_XER_PRINT False )
-set (  DRIVER2013 True )
-set (  ENABLE_ITTI True )
-set (  ENABLE_NAS_UE_LOGGING True )
-set (  ENABLE_NEW_MULTICAST True )
-set (  ENABLE_RAL False )
-set (  ENABLE_SECURITY True )
-set (  ENABLE_STANDALONE_EPC False)
-set (  ENABLE_USE_CPU_EXECUTION_TIME True )
-set (  ENABLE_USE_MME True )
-set (  ENABLE_USE_RAW_SOCKET_FOR_SGI True)
-set (  ENABLE_VCD_FIFO False )
-set (  ENB_MODE True )
-set (  EXMIMO_IOT True )
-set (  JUMBO_FRAME True )
-set (  LARGE_SCALE False )
-set (  LINK_ENB_PDCP_TO_GTPV1U True)
-set (  LINUX_LIST False )
-set (  LINUX True )
-set (  LOCALIZATION False )
-set (  LOG_NO_THREAD True )
-set (  DEADLINE_SCHEDULER False )
-set (  MAC_CONTEXT 1 )
-set (  MAX_NUM_CCs 1 )
-set (  MESSAGE_CHART_GENERATOR False)
-set (  MSG_PRINT False )
-set (  MU_RECEIVER False )
-set (  NAS_ADDRESS_FIX False )
-set (  NAS_BUILT_IN_UE True)
-set (  NAS_MME False )
-set (  NAS_UE True )
-set (  NB_ANTENNAS_RX "2" )
-set (  NB_ANTENNAS_TX "2" )
-set (  NO_RRM True )
-set (  OAISIM True )
-set (  OAI_NW_DRIVER_TYPE_ETHERNET False )
-set (  OAI_NW_DRIVER_USE_NETLINK True )
-set (  OPENAIR2 True )
-set (  OPENAIR_LTE True )
-set (  PACKAGE_NAME "oaisim" )
-set (  PDCP_USE_NETLINK True )
-set (  PDCP_MSG_PRINT False )
-set (  PHY_CONTEXT False )
-set (  PHY_EMUL False )
-set (  PHYSIM True )
-set (  RF_BOARD "False" )
-set (  RLC_STOP_ON_LOST_PDU False )
-set (  RRC_ASN1_VERSION "Rel10" )
-set (  RRC_DEFAULT_RAB_IS_AM True)
-set (  RRC_MSG_PRINT False )
-set (  SECU False )
-set (  SMBV False )
-set (  TEST_OMG False )
-set (  USE_3GPP_ADDR_AS_LINK_ADDR False )
-set (  USE_MME "R10" )
-set (  XER_PRINT False )

cmake_targets/oaisim_mme_build_oai/CMakeLists.template

-cmake_minimum_required(VERSION 2.8)
-
-set (  CMAKE_BUILD_TYPE "RelWithDebInfo" )
-set (  DEBUG_OMG False )
-set (  DISABLE_XER_PRINT False )
-set (  DRIVER2013 False )
-set (  ENABLE_ITTI True )
-set (  ENABLE_NAS_UE_LOGGING False )
-set (  ENABLE_NEW_MULTICAST False )
-set (  ENABLE_RAL False )
-set (  ENABLE_SECURITY False )
-set (  ENABLE_STANDALONE_EPC False )
-set (  ENABLE_USE_CPU_EXECUTION_TIME False )
-set (  ENABLE_USE_MME False )
-set (  ENABLE_USE_RAW_SOCKET_FOR_SGI True)
-set (  ENABLE_VCD_FIFO False )
-set (  ENB_MODE False )
-set (  EPC_BUILD True )
-set (  EXMIMO_IOT False )
-set (  JUMBO_FRAME False )
-set (  LARGE_SCALE False )
-set (  LINK_ENB_PDCP_TO_GTPV1U True)
-set (  LINUX_LIST False )
-set (  LINUX False )
-set (  LOCALIZATION False )
-set (  LOG_NO_THREAD False )
-set (  DEADLINE_SCHEDULER False )
-set (  MAC_CONTEXT 1 )
-set (  MAX_NUM_CCs 1 )
-set (  MSG_PRINT False )
-set (  MU_RECEIVER False )
-set (  NAS_ADDRESS_FIX False )
-set (  NAS_BUILT_IN_EPC True )
-set (  NAS_MME True )
-set (  NAS_NETLINK False )
-set (  NAS_UE False )
-set (  NB_ANTENNAS_RX "2" )
-set (  NB_ANTENNAS_TX "2" )
-set (  NO_RRM False )
-set (  OAISIM False )
-set (  OAI_NW_DRIVER_TYPE_ETHERNET False )
-set (  OAI_NW_DRIVER_USE_NETLINK False )
-set (  OPENAIR2 False )
-set (  OPENAIR_LTE False )
-set (  PACKAGE_NAME "EPC" )
-set (  PDCP_MSG_PRINT False )
-set (  PHY_CONTEXT False )
-set (  PHY_EMUL False )
-set (  PHYSIM False )
-set (  RF_BOARD "False" )
-set (  RRC_ASN1_VERSION "Rel10" )
-set (  RLC_STOP_ON_LOST_PDU False )
-set (  RRC_MSG_PRINT False )
-set (  SECU False )
-set (  SMBV False )
-set (  TEST_OMG False )
-set (  UPDATE_RELEASE_9 True)
-set (  UPDATE_RELEASE_10 True)
-set (  USE_3GPP_ADDR_AS_LINK_ADDR False )
-set (  USE_MME "R10" )
-set (  XER_PRINT False )
-set (  XFORMS False )

cmake_targets/oaisim_noS1_build_oai/CMakeLists.template

-cmake_minimum_required(VERSION 2.8)
-
-set (  DEBUG_OMG False )
-set (  DISABLE_XER_PRINT False )
-set (  DRIVER2013 True )
-set (  ENABLE_ITTI True )
-set (  ENABLE_NAS_UE_LOGGING False )
-set (  ENABLE_NEW_MULTICAST True )
-set (  ENABLE_RAL False )
-set (  ENABLE_SECURITY False )
-set (  ENABLE_STANDALONE_EPC False)
-set (  ENABLE_USE_CPU_EXECUTION_TIME True )
-set (  ENABLE_USE_MME False )
-set (  ENABLE_USE_RAW_SOCKET_FOR_SGI False)
-set (  ENABLE_VCD_FIFO False )
-set (  ENB_MODE True )
-set (  EXMIMO_IOT True )
-set (  JUMBO_FRAME True )
-set (  LARGE_SCALE False )
-set (  LINK_ENB_PDCP_TO_GTPV1U False)
-set (  LINUX_LIST False )
-set (  LINUX True )
-set (  LOCALIZATION False )
-set (  LOG_NO_THREAD 1 )
-set (  DEADLINE_SCHEDULER False )
-set (  MAC_CONTEXT 1 )
-set (  MAX_NUM_CCs 1 )
-set (  MESSAGE_CHART_GENERATOR         False )
-set (  MESSAGE_CHART_GENERATOR_RLC_MAC False )
-set (  MESSAGE_CHART_GENERATOR_PHY     False )
-set (  MSG_PRINT False )
-set (  MU_RECEIVER False )
-set (  NAS_ADDRESS_FIX False )
-set (  NAS_BUILT_IN_UE False)
-set (  NAS_MME False )
-set (  NAS_UE False )
-set (  NB_ANTENNAS_RX "2" )
-set (  NB_ANTENNAS_TX "2" )
-set (  NO_RRM True )
-set (  OAISIM True )
-set (  OAI_NW_DRIVER_TYPE_ETHERNET False )
-set (  OAI_NW_DRIVER_USE_NETLINK True )
-set (  OPENAIR2 True )
-set (  OPENAIR_LTE True )
-set (  PACKAGE_NAME "oaisim" )
-set (  PDCP_USE_NETLINK True )
-set (  PDCP_MSG_PRINT False )
-set (  PHY_CONTEXT False )
-set (  PHY_EMUL False )
-set (  PHYSIM True )
-set (  RF_BOARD "False" )
-set (  RRC_ASN1_VERSION "Rel10" )
-set (  RLC_STOP_ON_LOST_PDU False )
-set (  RRC_MSG_PRINT False )
-set (  SECU False )
-set (  SMBV False )
-set (  TEST_OMG False )
-set (  USE_3GPP_ADDR_AS_LINK_ADDR False )
-set (  USE_MME "R10" )
-set (  XER_PRINT False )
-set (  DEBUG_PHY False )
-set (  DEBUG_PHY_PROC False)
-set (  DEBUG_DLSCH False)

executables/nr-ru.c

@@ -1445,7 +1445,7 @@ static void *ru_thread( void *param ) {
     // wakeup all gNB processes waiting for this RU
     if (ru->num_gNB>0) wakeup_gNB_L1s(ru);
 
-    if(get_thread_parallel_conf() == PARALLEL_SINGLE_THREAD && ru->num_gNB>0) {
+    if(get_thread_parallel_conf() == PARALLEL_SINGLE_THREAD || ru->num_gNB==0) {
       // do TX front-end processing if needed (precoding and/or IDFTs)
       if (ru->feptx_prec) ru->feptx_prec(ru,proc->frame_tx,proc->tti_tx);
 

executables/nr-softmodem.c

@@ -977,6 +977,8 @@ int main( int argc, char **argv ) {
     exit(-1);
   }
 
+  openair0_cfg[0].threequarter_fs = threequarter_fs;
+
 #if T_TRACER
   T_Config_Init();
 #endif

executables/openairinterface5g_limits.h

-#ifndef OPENAIRINTERFACE5G_LIMITS_H_
-#define OPENAIRINTERFACE5G_LIMITS_H_
-
-#if 1 /*defined(CBMIMO1) || defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706)*/
-  #define NUMBER_OF_eNB_MAX 1
-  #define NUMBER_OF_gNB_MAX 1
-  #define NUMBER_OF_RU_MAX 2
-  #define NUMBER_OF_NR_RU_MAX 2
-  #ifndef PHYSIM
-    #ifndef UE_EXPANSION
-      #define NUMBER_OF_UE_MAX 16
-      #define NUMBER_OF_NR_UE_MAX 16
-      #define NUMBER_OF_CONNECTED_eNB_MAX 3
-      #define NUMBER_OF_CONNECTED_gNB_MAX 3
-    #else
-      #define NUMBER_OF_UE_MAX 256
-      #define NUMBER_OF_NR_UE_MAX 256
-      #define NUMBER_OF_CONNECTED_eNB_MAX 1
-      #define NUMBER_OF_CONNECTED_gNB_MAX 1
-    #endif
-  #else
-    #define NUMBER_OF_UE_MAX 1
-    #define NUMBER_OF_NR_UE_MAX 1
-    #define NUMBER_OF_CONNECTED_eNB_MAX 1
-    #define NUMBER_OF_CONNECTED_gNB_MAX 1
-  #endif
-#else
-  #define NUMBER_OF_eNB_MAX 7
-  #define NUMBER_OF_gNB_MAX 7
-  #define NUMBER_OF_RU_MAX 32
-  #define NUMBER_OF_NR_RU_MAX 32
-  #ifndef UE_EXPANSION
-    #define NUMBER_OF_UE_MAX 20
-    #define NUMBER_OF_NR_UE_MAX 20
-    #define NUMBER_OF_CONNECTED_eNB_MAX 3
-    #define NUMBER_OF_CONNECTED_gNB_MAX 3
-  #else
-    #define NUMBER_OF_UE_MAX 256
-    #define NUMBER_OF_NR_UE_MAX 256
-    #define NUMBER_OF_CONNECTED_eNB_MAX 1
-    #define NUMBER_OF_CONNECTED_gNB_MAX 1
-  #endif
-  #if defined(STANDALONE) && STANDALONE==1
-    #undef  NUMBER_OF_eNB_MAX
-    #undef  NUMBER_OF_gNB_MAX
-
-    #undef  NUMBER_OF_UE_MAX
-    #undef  NUMBER_OF_NR_UE_MAX
-
-    #undef  NUMBER_OF_RU_MAX
-    #undef  NUMBER_OF_NR_RU_MAX
-
-    #define NUMBER_OF_eNB_MAX 3
-    #define NUMBER_OF_gNB_MAX 3
-
-    #define NUMBER_OF_UE_MAX 3
-    #define NUMBER_OF_NR_UE_MAX 3
-
-    #define NUMBER_OF_RU_MAX 3
-    #define NUMBER_OF_NR_RU_MAX 3
-  #endif
-  #if defined(LARGE_SCALE) && LARGE_SCALE
-    #undef  NUMBER_OF_eNB_MAX
-    #undef  NUMBER_OF_gNB_MAX
-
-    #undef  NUMBER_OF_UE_MAX
-    #undef  NUMBER_OF_NR_UE_MAX
-
-    #undef  NUMBER_OF_CONNECTED_eNB_MAX
-    #undef  NUMBER_OF_CONNECTED_gNB_MAX
-
-    #undef  NUMBER_OF_RU_MAX
-    #undef  NUMBER_OF_NR_RU_MAX
-
-    #define NUMBER_OF_eNB_MAX 2
-    #define NUMBER_OF_gNB_MAX 2
-
-    #define NUMBER_OF_UE_MAX 120
-    #define NUMBER_OF_NR_UE_MAX 120
-
-    #define NUMBER_OF_RU_MAX 16
-    #define NUMBER_OF_NR_RU_MAX 16
-
-    #define NUMBER_OF_CONNECTED_eNB_MAX 1 // to save some memory
-    #define NUMBER_OF_CONNECTED_gNB_MAX 1
-  #endif
-#endif
-
-#endif /* OPENAIRINTERFACE5G_LIMITS_H_ */

targets/COMMON/openairinterface5g_limits.h

@@ -6,14 +6,12 @@
 #        define NUMBER_OF_gNB_MAX 1
 #        define NUMBER_OF_RU_MAX 2
 #        define NUMBER_OF_NR_RU_MAX 2
-#        define NUMBER_OF_NR_DLSCH_MAX 16
-#        define NUMBER_OF_NR_ULSCH_MAX 16
 #        ifndef PHYSIM
 #        ifndef UE_EXPANSION
-#                define NUMBER_OF_UE_MAX 4
-#                define NUMBER_OF_NR_UE_MAX 4
-#                define NUMBER_OF_CONNECTED_eNB_MAX 1
-#                define NUMBER_OF_CONNECTED_gNB_MAX 1
+#                define NUMBER_OF_UE_MAX 16
+#                define NUMBER_OF_NR_UE_MAX 16
+#                define NUMBER_OF_CONNECTED_eNB_MAX 3
+#                define NUMBER_OF_CONNECTED_gNB_MAX 3
 #        else
 #                define NUMBER_OF_UE_MAX 256
 #                define NUMBER_OF_NR_UE_MAX 256