unitary simulation compilation and simple testing

openair1/PHY/INIT/nr_init.c

@@ -182,13 +182,13 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
   for (UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
     srs_vars[UE_id].srs = (int32_t *)malloc16_clear(2*fp->ofdm_symbol_size*sizeof(int32_t));
   }
-
+*/
   // PRACH
   prach_vars->prachF = (int16_t *)malloc16_clear( 1024*2*sizeof(int16_t) );
 
   prach_vars->prach_ifft       = (int32_t *)malloc16_clear(1024*2*sizeof(int32_t));
 
-
+/*
   for (int ulsch_id=0; ulsch_id<NUMBER_OF_NR_ULSCH_MAX; ulsch_id++) {
     //FIXME
 

openair1/SCHED_NR/nr_prach_procedures.c

@@ -125,7 +125,7 @@ void L1_nr_prach_procedures(PHY_VARS_gNB *gNB,int frame,int subframe) {
 	    gNB->preamble_list[0].preamble_rel8.preamble,
 	    gNB->preamble_list[0].preamble_rel8.rnti);
       
-      oai_nfapi_rach_ind(&gNB->UL_INFO.rach_ind);
+      oai_nfapi_nr_rach_ind(&gNB->UL_INFO.rach_ind);
       
       gNB->UL_INFO.rach_ind.rach_indication_body.number_of_preambles = 0;
     }

openair1/SIMULATION/NR_PHY/pbchsim.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);}
 
@@ -362,10 +362,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 = (PHY_VARS_gNB**) malloc(sizeof(PHY_VARS_gNB *));
-  RC.gNB[0] = (PHY_VARS_gNB**) malloc(sizeof(PHY_VARS_gNB *));
+  RC.gNB[0] = malloc(sizeof(PHY_VARS_gNB));
-  RC.gNB[0][0] = malloc(sizeof(PHY_VARS_gNB));
+  gNB = RC.gNB[0];
-  gNB = RC.gNB[0][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/prachsim.c

@@ -72,6 +72,8 @@ int8_t nr_ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP, uint8_t e
 
 int32_t get_nr_uldl_offset(int nr_bandP) {return(0);}
 
+int oai_nfapi_rach_ind(nfapi_rach_indication_t *rach_ind) {return(0);}
+
 openair0_config_t openair0_cfg[MAX_CARDS];
 int nfapi_mode=0;
 NR_IF_Module_t *NR_IF_Module_init(int Mod_id){return(NULL);}
@@ -346,17 +348,16 @@ int main(int argc, char **argv)
       snr1 = snr0+5.0;
   }
 
-  RC.gNB = (PHY_VARS_gNB***) malloc(2*sizeof(PHY_VARS_gNB **));
+  RC.gNB = (PHY_VARS_gNB**) malloc(2*sizeof(PHY_VARS_gNB *));
-  RC.gNB[0] = (PHY_VARS_gNB**) malloc(2*sizeof(PHY_VARS_gNB *));
+  RC.gNB[0] = malloc(sizeof(PHY_VARS_gNB));
-  RC.gNB[0][0] = malloc(sizeof(PHY_VARS_gNB));
+  memset(RC.gNB[0],0,sizeof(PHY_VARS_gNB));
-  memset(RC.gNB[0][0],0,sizeof(PHY_VARS_gNB));
 
   RC.ru = (RU_t**) malloc(2*sizeof(RU_t *));
   RC.ru[0] = (RU_t*) malloc(sizeof(RU_t ));
   memset(RC.ru[0],0,sizeof(RU_t));
   RC.nb_RU = 1;
 
-  gNB = RC.gNB[0][0];
+  gNB = RC.gNB[0];
   RU = RC.ru[0];