Merge remote-tracking branch 'origin/ci-5g-tests-ran-container-parent' into integration_2022_wk50

openair1/PHY/INIT/nr_init.c

@@ -469,9 +469,8 @@ int init_codebook_gNB(PHY_VARS_gNB *gNB) {
   return 0;
 }
 
-int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
-                    unsigned char is_secondary_gNB,
-                    unsigned char lowmem_flag) {
+int phy_init_nr_gNB(PHY_VARS_gNB *gNB)
+{
   // shortcuts
   NR_DL_FRAME_PARMS *const fp       = &gNB->frame_parms;
   nfapi_nr_config_request_scf_t *cfg = &gNB->gNB_config;
@@ -490,14 +489,8 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
 
   while(gNB->configured == 0) usleep(10000);
 
-  if (lowmem_flag == 1) {
-    gNB->number_of_nr_dlsch_max = 2;
-    gNB->number_of_nr_ulsch_max = 2;
-  }
-  else {
-    gNB->number_of_nr_dlsch_max = NUMBER_OF_NR_DLSCH_MAX;
-    gNB->number_of_nr_ulsch_max = NUMBER_OF_NR_ULSCH_MAX;
-  }  
+  gNB->number_of_nr_dlsch_max = NUMBER_OF_NR_DLSCH_MAX;
+  gNB->number_of_nr_ulsch_max = NUMBER_OF_NR_ULSCH_MAX;
 
   load_dftslib();
 

openair1/PHY/INIT/phy_init.h

@@ -401,7 +401,7 @@ void term_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB);
 void init_nr_ue_transport(PHY_VARS_NR_UE *ue);
 void init_N_TA_offset(PHY_VARS_NR_UE *ue);
 void nr_dump_frame_parms(NR_DL_FRAME_PARMS *frame_parms);
-int phy_init_nr_gNB(PHY_VARS_gNB *gNB, unsigned char is_secondary_gNB, unsigned char lowmem_flag);
+int phy_init_nr_gNB(PHY_VARS_gNB *gNB);
 int init_codebook_gNB(PHY_VARS_gNB *gNB);
 void nr_phy_config_request(NR_PHY_Config_t *gNB);
 void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,int N_RB_DL,int N_RB_UL,int mu,int Nid_cell,uint64_t position_in_burst);

openair1/SIMULATION/NR_PHY/dlschsim.c

@@ -366,7 +366,7 @@ int main(int argc, char **argv)
 	frame_parms->Ncp = extended_prefix_flag ? EXTENDED : NORMAL;
 	crcTableInit();
 	nr_phy_config_request_sim(gNB, N_RB_DL, N_RB_DL, mu, Nid_cell,SSB_positions);
-	phy_init_nr_gNB(gNB, 0, 1); //lowmem
+	phy_init_nr_gNB(gNB);
 	//init_eNB_afterRU();
 	frame_length_complex_samples = frame_parms->samples_per_subframe;
 	//frame_length_complex_samples_no_prefix = frame_parms->samples_per_subframe_wCP;

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -869,7 +869,7 @@ int main(int argc, char **argv)
   // reset preprocessor to the one of DLSIM after it has been set during
   // rrc_mac_config_req_gNB
   gNB_mac->pre_processor_dl = nr_dlsim_preprocessor;
-  phy_init_nr_gNB(gNB,0,1);
+  phy_init_nr_gNB(gNB);
   N_RB_DL = gNB->frame_parms.N_RB_DL;
   NR_UE_info_t *UE_info = RC.nrmac[0]->UE_info.list[0];
 

openair1/SIMULATION/NR_PHY/pbchsim.c

@@ -471,7 +471,7 @@ int main(int argc, char **argv)
   frame_parms->freq_range = mu<2 ? nr_FR1 : nr_FR2;
 
   nr_phy_config_request_sim_pbchsim(gNB,N_RB_DL,N_RB_DL,mu,Nid_cell,SSB_positions);
-  phy_init_nr_gNB(gNB,0,1);
+  phy_init_nr_gNB(gNB);
   frame_parms->ssb_start_subcarrier = 12 * gNB->gNB_config.ssb_table.ssb_offset_point_a.value + ssb_subcarrier_offset;
 
   uint8_t n_hf = 0;

openair1/SIMULATION/NR_PHY/prachsim.c

@@ -673,7 +673,7 @@ int main(int argc, char **argv){
 
   memcpy((void*)&ru->config,(void*)&RC.gNB[0]->gNB_config,sizeof(ru->config));
   RC.nb_nr_L1_inst=1;
-  phy_init_nr_gNB(gNB,0,1); //lowmem
+  phy_init_nr_gNB(gNB);
   nr_phy_init_RU(ru);
   set_tdd_config_nr(&gNB->gNB_config, mu, 7, 6, 2, 4);
 

openair1/SIMULATION/NR_PHY/pucchsim.c

@@ -404,7 +404,7 @@ int main(int argc, char **argv)
   cfg->carrier_config.num_tx_ant.value = n_tx;
   cfg->carrier_config.num_rx_ant.value = n_rx;
   nr_phy_config_request_sim(gNB,N_RB_DL,N_RB_DL,mu,Nid_cell,SSB_positions);
-  phy_init_nr_gNB(gNB,0,0);
+  phy_init_nr_gNB(gNB);
   /* RU handles rxdataF, and gNB just has a pointer. Here, we don't have an RU,
    * so we need to allocate that memory as well. */
   for (i = 0; i < n_rx; i++)

openair1/SIMULATION/NR_PHY/ulschsim.c

@@ -419,7 +419,7 @@ int main(int argc, char **argv)
 
   nr_phy_config_request_sim(gNB, N_RB_UL, N_RB_UL, mu, Nid_cell, SSB_positions);
 
-  phy_init_nr_gNB(gNB, 0, 1); //lowmem
+  phy_init_nr_gNB(gNB);
 
   //configure UE
   UE = malloc(sizeof(PHY_VARS_NR_UE));

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -778,7 +778,7 @@ int main(int argc, char **argv)
   gNB->chest_freq = chest_type[0];
   gNB->chest_time = chest_type[1];
 
-  phy_init_nr_gNB(gNB,0,1);
+  phy_init_nr_gNB(gNB);
   /* RU handles rxdataF, and gNB just has a pointer. Here, we don't have an RU,
    * so we need to allocate that memory as well. */
   for (i = 0; i < n_rx; i++)