finishing merge with develop-nr

openair1/PHY/INIT/nr_init.c

@@ -471,21 +471,10 @@ void init_nr_transport(PHY_VARS_gNB *gNB) {
     //gNB->transmission_mode[i] = fp->nb_antenna_ports_gNB==1 ? 1 : 2;
   }
 
-  gNB->dlsch_SI  = new_gNB_dlsch(1,8,NSOFT, 0, fp, cfg);
-  LOG_D(PHY,"gNB %d : SI %p\n",gNB->Mod_id,gNB->dlsch_SI);
-  gNB->dlsch_ra  = new_gNB_dlsch(1,8,NSOFT, 0, fp, cfg);
-  LOG_D(PHY,"gNB %d : RA %p\n",gNB->Mod_id,gNB->dlsch_ra);
-  gNB->dlsch_MCH = new_gNB_dlsch(1,8,NSOFT, 0, fp, cfg);
-  LOG_D(PHY,"gNB %d : MCH %p\n",gNB->Mod_id,gNB->dlsch_MCH);
-
   gNB->rx_total_gain_dB=130;
 
   for(i=0; i<NUMBER_OF_UE_MAX; i++)
     gNB->mu_mimo_mode[i].dl_pow_off = 2;
 
-  gNB->check_for_total_transmissions = 0;
-  gNB->check_for_MUMIMO_transmissions = 0;
-  gNB->FULL_MUMIMO_transmissions = 0;
-  gNB->check_for_SUMIMO_transmissions = 0;
   //fp->pucch_config_common.deltaPUCCH_Shift = 1;
 }

openair1/SCHED_NR/fapi_nr_l1.c

@@ -96,7 +96,6 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
   AssertFatal(RC.gNB[Mod_id]!=NULL,"RC.gNB[%d] is null\n",Mod_id);
 
   gNB         = RC.gNB[Mod_id];
-  proc        = &gNB->proc.L1_proc;
 
   uint8_t number_dl_pdu             = DL_req->dl_config_request_body.number_pdu;
 

openair1/SIMULATION/NR_PHY/dlschsim.c

@@ -84,7 +84,7 @@ int oai_nfapi_nr_dl_config_req(nfapi_nr_dl_config_request_t *dl_config_req) {
 uint32_t from_nrarfcn(int nr_bandP, uint32_t dl_earfcn) {
 	return (0);
 }
-int32_t get_uldl_offset(int eutra_bandP) {
+int32_t get_nr_uldl_offset(int eutra_bandP) {
 	return (0);
 }
 

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -83,7 +83,7 @@ int oai_nfapi_ul_config_req(nfapi_ul_config_request_t *ul_config_req) { return(0
 
 int oai_nfapi_nr_dl_config_req(nfapi_nr_dl_config_request_t *dl_config_req) {return(0);}
 
-int32_t get_uldl_offset(int nr_bandP) {return(0);}
+int32_t get_nr_uldl_offset(int nr_bandP) {return(0);}
 
 NR_IF_Module_t *NR_IF_Module_init(int Mod_id){return(NULL);}
 

openair1/SIMULATION/NR_PHY/prachsim.c

@@ -70,7 +70,7 @@ int8_t nr_ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP, uint8_t e
   return 0;
 }
 
-int32_t get_uldl_offset(int nr_bandP) {return(0);}
+int32_t get_nr_uldl_offset(int nr_bandP) {return(0);}
 
 openair0_config_t openair0_cfg[MAX_CARDS];
 int nfapi_mode=0;

openair1/SIMULATION/NR_PHY/pucchsim.c

@@ -68,7 +68,7 @@ int oai_nfapi_ul_config_req(nfapi_ul_config_request_t *ul_config_req) { return(0
 int oai_nfapi_nr_dl_config_req(nfapi_nr_dl_config_request_t *dl_config_req) {return(0);}
 
 uint32_t from_nrarfcn(int nr_bandP,uint32_t dl_nrarfcn) {return(0);}
-int32_t get_uldl_offset(int nr_bandP) {return(0);}
+int32_t get_nr_uldl_offset(int nr_bandP) {return(0);}
 
 NR_IF_Module_t *NR_IF_Module_init(int Mod_id){return(NULL);}
 
@@ -343,10 +343,9 @@ int main(int argc, char **argv)
 
   printf("Initializing gNodeB for mu %d, N_RB_DL %d\n",mu,N_RB_DL);
 
-  RC.gNB = (PHY_VARS_gNB***) malloc(sizeof(PHY_VARS_gNB **));
-  RC.gNB[0] = (PHY_VARS_gNB**) malloc(sizeof(PHY_VARS_gNB *));
-  RC.gNB[0][0] = malloc(sizeof(PHY_VARS_gNB));
-  gNB = RC.gNB[0][0];
+  RC.gNB = (PHY_VARS_gNB**) malloc(sizeof(PHY_VARS_gNB *));
+  RC.gNB[0] = malloc(sizeof(PHY_VARS_gNB));
+  gNB = RC.gNB[0];
   gNB_config = &gNB->gNB_config;
   frame_parms = &gNB->frame_parms; //to be initialized I suppose (maybe not necessary for PBCH)
   frame_parms->nb_antennas_tx = n_tx;

openair1/SIMULATION/NR_PHY/ulschsim.c

@@ -86,7 +86,7 @@ int oai_nfapi_nr_dl_config_req(nfapi_nr_dl_config_request_t *dl_config_req) {
 uint32_t from_nrarfcn(int nr_bandP, uint32_t dl_earfcn) {
   return (0);
 }
-int32_t get_uldl_offset(int eutra_bandP) {
+int32_t get_nr_uldl_offset(int eutra_bandP) {
   return (0);
 }