Delete build option --mu.

cmake_targets/CMakeLists.txt

@@ -630,9 +630,8 @@ add_boolean_option(MESSAGE_CHART_GENERATOR False         "For generating sequenc
 add_boolean_option(MESSAGE_CHART_GENERATOR_RLC_MAC False "trace RLC-MAC exchanges in sequence diagrams")
 add_boolean_option(MESSAGE_CHART_GENERATOR_PHY     False "trace some PHY exchanges in sequence diagrams")
 
-add_boolean_option(UE_EXPANSION             False         "enable UE_EXPANSION with max 256 UE")
-add_boolean_option(PHY_TX_THREAD            False         "enable UE_EXPANSION with max 256 UE")
-add_boolean_option(PRE_SCD_THREAD           False         "enable UE_EXPANSION with max 256 UE")
+add_boolean_option(PHY_TX_THREAD            False         "enable PHY_TX_THREAD with multiple UE")
+add_boolean_option(PRE_SCD_THREAD           False         "enable PRE_SCD_THREAD with multiple UE")
 add_boolean_option(UESIM_EXPANSION          False         "enable UESIM_EXPANSION with max 256 UE")
 
 ########################

cmake_targets/build_oai

@@ -42,8 +42,8 @@ conf_nvram_path=$OPENAIR_DIR/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf
 
 MSC_GEN=0
 XFORMS="True"
-UE_EXPANSION="False"
-UESIM_EXPANSION="False"
+PRE_SCD_THREAD="False"
+PHY_TX_THREAD="False"
 PRINT_STATS="False"
 VCD_TIMING="False"
 DEADLINE_SCHEDULER_FLAG_USER="False"
@@ -202,10 +202,6 @@ function main() {
             UE=1
             echo_info "Will compile UE"
             shift;;
-       --mu)
-            UE_EXPANSION="True"
-            echo_info "Will compile with UE_EXPANSION"
-            shift;;
        --musim)
             UESIM_EXPANSION="True"
             echo_info "Will compile with UESIM_EXPANSION"
@@ -488,9 +484,7 @@ function main() {
     echo "cmake_minimum_required(VERSION 2.8)"   >  $cmake_file
     echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
     echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >>  $cmake_file
-    echo "set ( UE_EXPANSION $UE_EXPANSION )"      >>  $cmake_file
-#    echo "set ( PHY_TX_THREAD $UE_EXPANSION )"     >>  $cmake_file
-    echo "set ( PRE_SCD_THREAD $UE_EXPANSION )"    >>  $cmake_file
+    echo "set ( PRE_SCD_THREAD $PRE_SCD_THREAD )"    >>  $cmake_file
     echo "set ( UESIM_EXPANSION $UESIM_EXPANSION )"      >>  $cmake_file
     echo "set ( RRC_ASN1_VERSION \"${REL}\")"      >>  $cmake_file
     echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )"     >>  $cmake_file

openair1/PHY/INIT/lte_init.c

@@ -606,6 +606,7 @@ void phy_free_lte_eNB(PHY_VARS_eNB *eNB)
 void phy_vars_eNB_free(PHY_VARS_eNB *eNB)
 {
   int i, j;
+  free_and_zero(eNB->uci_vars);
   free_and_zero(eNB->srs_vars);
   free_and_zero(eNB->pusch_vars);
   free_and_zero(eNB->ulsch);

openair1/PHY/INIT/lte_param_init.c

@@ -78,6 +78,7 @@ void phy_measurements_eNB_malloc(PHY_MEASUREMENTS_eNB *meas)
 void phy_vars_eNB_malloc(PHY_VARS_eNB *eNB)
 {
   int i, j;
+  eNB->uci_vars = (LTE_eNB_UCI *)malloc(sizeof(LTE_eNB_UCI)*NUMBER_OF_UCI_VARS_MAX);
   eNB->srs_vars = (LTE_eNB_SRS *)malloc(sizeof(LTE_eNB_SRS)*NUMBER_OF_UE_MAX);
   eNB->pusch_vars = (LTE_eNB_PUSCH **)malloc(sizeof(LTE_eNB_PUSCH *)*NUMBER_OF_UE_MAX);
   eNB->dlsch = (LTE_eNB_DLSCH_t ***)malloc(sizeof(LTE_eNB_DLSCH_t **)*NUMBER_OF_UE_MAX);
@@ -157,6 +158,7 @@ void lte_param_init(PHY_VARS_eNB **eNBp,
   printf("Start lte_param_init\n");
   // dlsim does not read the config file to get number_of_ue_max, so we set NUMBER_OF_UE_MAX to 16
   NUMBER_OF_UE_MAX = 16;
+  NUMBER_OF_UCI_VARS_MAX = 4*10 + NUMBER_OF_UE_MAX;
   *eNBp = malloc(sizeof(PHY_VARS_eNB));
   *UEp = malloc(sizeof(PHY_VARS_UE));
   *rup = malloc(sizeof(RU_t));

openair1/PHY/defs_eNB.h

@@ -1063,8 +1063,9 @@ typedef struct PHY_VARS_eNB_s {
   LTE_eNB_PRACH        prach_vars_br;
 #endif
   LTE_eNB_COMMON       common_vars;
-  LTE_eNB_UCI          uci_vars[NUMBER_OF_UCI_VARS_MAX];
+//  LTE_eNB_UCI          uci_vars[NUMBER_OF_UCI_VARS_MAX];
 //  LTE_eNB_SRS          srs_vars[NUMBER_OF_UE_MAX];
+  LTE_eNB_UCI         *uci_vars;
   LTE_eNB_SRS         *srs_vars;
   LTE_eNB_PBCH         pbch;
 //  LTE_eNB_PUSCH       *pusch_vars[NUMBER_OF_UE_MAX];

openair2/COMMON/platform_constants.h

@@ -63,7 +63,6 @@
 
 #    define MAX_MODULES                NB_MODULES_MAX
 
-#ifndef UE_EXPANSION
 // TODO:L2 FAPI simulator.
 // UESIM_EXPANSION is used to be same value of MAX_MOBILES_PER_ENB
 // in eNB and UE.
@@ -84,11 +83,6 @@
 #    define MAX_eNB                      2
 # endif
 #endif
-#else
-#    define MAX_MOBILES_PER_ENB 256
-#    define MAX_MOBILES_PER_ENB_NB_IoT 256
-#    define MAX_eNB                      2
-#endif
 
 
 #define MAX_MANAGED_ENB_PER_MOBILE  2

openair2/ENB_APP/enb_config.c

@@ -1635,6 +1635,8 @@ int RCconfig_RRC(uint32_t i, eNB_RRC_INST *rrc, int macrlc_has_f1) {
                                RC.config_file_name, i, ccparams_lte.N_RB_DL);
                   break;
               }
+              NUMBER_OF_UCI_VARS_MAX = NUMBER_OF_UE_MAX + 4*ccparams_lte.ue_multiple_max;
+              printf("NUMBER_OF_UCI_VARS_MAX = %d\n",NUMBER_OF_UCI_VARS_MAX);
 
               // eMBMS configuration
               RRC_CONFIGURATION_REQ(msg_p).eMBMS_configured = 0;

targets/COMMON/openairinterface5g_limits.h

@@ -2,68 +2,45 @@
 #define OPENAIRINTERFACE5G_LIMITS_H_
 
 signed int NUMBER_OF_UE_MAX;
+signed int NUMBER_OF_UCI_VARS_MAX;
 
 #if defined(CBMIMO1) || defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_LMSSDR)
 #        define NUMBER_OF_eNB_MAX 1
 #        define NUMBER_OF_RU_MAX 2
-#        ifndef UE_EXPANSION
 // TODO:L2 FAPI simulator.
 // UESIM_EXPANSION is used to be same value of NUMBER_OF_UE_MAX
 // in eNB and UE.
 // now , if we use --mu option in UE, compiling error will occur.
 // This problem will be fixed in the future.
 #        ifndef UESIM_EXPANSION
-//#                define NUMBER_OF_UE_MAX 16
-#                define NUMBER_OF_UCI_VARS_MAX 56
 #            define NUMBER_OF_CONNECTED_eNB_MAX 3
 #        else
-//#                define NUMBER_OF_UE_MAX 256
-#                define NUMBER_OF_UCI_VARS_MAX 256
-#                define NUMBER_OF_CONNECTED_eNB_MAX 1
-#            endif
-#        else
-//#                define NUMBER_OF_UE_MAX 256
-#                define NUMBER_OF_UCI_VARS_MAX 256
 #            define NUMBER_OF_CONNECTED_eNB_MAX 1
 #        endif
 #else
 #        define NUMBER_OF_eNB_MAX 7
 #        define NUMBER_OF_RU_MAX 32
-#        ifndef UE_EXPANSION
 /* if the value of MAX_MOBILES_PER_ENB and NUMBER_OF_UE_MAX is different,
 eNB process will exit because unexpected access happens.
 Now some parts are using NUMBER_OF_UE_MAX
 and the other are using MAX_MOBILES_PER_ENB in for-loop.
 */
 #        ifndef UESIM_EXPANSION
-//#                define NUMBER_OF_UE_MAX 16
-#                define NUMBER_OF_UCI_VARS_MAX 56
 #            define NUMBER_OF_CONNECTED_eNB_MAX 3
 #        else
-//#                define NUMBER_OF_UE_MAX 256
-#                define NUMBER_OF_UCI_VARS_MAX 256
-#                define NUMBER_OF_CONNECTED_eNB_MAX 1
-#            endif
-#        else
-//#                define NUMBER_OF_UE_MAX 256
-#                define NUMBER_OF_UCI_VARS_MAX 256
 #            define NUMBER_OF_CONNECTED_eNB_MAX 1
 #        endif
 #        if defined(STANDALONE) && STANDALONE==1
 #                undef  NUMBER_OF_eNB_MAX
-//#                undef  NUMBER_OF_UE_MAX
 #                undef  NUMBER_OF_RU_MAX
 #                define NUMBER_OF_eNB_MAX 3
-//#                define NUMBER_OF_UE_MAX 3
 #                define NUMBER_OF_RU_MAX 3
 #        endif
 #        if defined(LARGE_SCALE) && LARGE_SCALE
 #                undef  NUMBER_OF_eNB_MAX
-//#                undef  NUMBER_OF_UE_MAX
 #                undef  NUMBER_OF_CONNECTED_eNB_MAX
 #                undef  NUMBER_OF_RU_MAX
 #                define NUMBER_OF_eNB_MAX 2
-//#                define NUMBER_OF_UE_MAX 120
 #                define NUMBER_OF_RU_MAX 16
 #                define NUMBER_OF_CONNECTED_eNB_MAX 1 // to save some memory
 #        endif

targets/RT/USER/lte-enb.c

@@ -1309,6 +1309,7 @@ void init_eNB(int single_thread_flag,int wait_for_sync) {
 void phy_vars_eNB_malloc(PHY_VARS_eNB *eNB)
 {
   int i, j;
+  eNB->uci_vars = (LTE_eNB_UCI *)malloc(sizeof(LTE_eNB_UCI)*NUMBER_OF_UCI_VARS_MAX);
   eNB->srs_vars = (LTE_eNB_SRS *)malloc(sizeof(LTE_eNB_SRS)*NUMBER_OF_UE_MAX);
   eNB->pusch_vars = (LTE_eNB_PUSCH **)malloc(sizeof(LTE_eNB_PUSCH *)*NUMBER_OF_UE_MAX);
   eNB->dlsch = (LTE_eNB_DLSCH_t ***)malloc(sizeof(LTE_eNB_DLSCH_t **)*NUMBER_OF_UE_MAX);