UE nr parms init

openair1/PHY/INIT/nr_parms.c

@@ -40,6 +40,19 @@ int nr_init_frame_parms(nfapi_config_request_t* config,
   LOG_I(PHY,"Initializing frame parms for mu %d, N_RB %d, Ncp %d\n",mu, N_RB, Ncp);
 #endif
 
+  frame_parms->frame_type          = FDD;
+  frame_parms->tdd_config          = 3;
+  //frame_parms[CC_id]->tdd_config_S        = 0;
+  frame_parms->N_RB_DL             = 100;
+  frame_parms->N_RB_UL             = 100;
+  frame_parms->Ncp                 = NORMAL;
+  //frame_parms[CC_id]->Ncp_UL              = NORMAL;
+  frame_parms->Nid_cell            = 0;
+  //frame_parms[CC_id]->num_MBSFN_config    = 0;
+  frame_parms->nb_antenna_ports_eNB  = 1;
+  frame_parms->nb_antennas_tx      = 1;
+  frame_parms->nb_antennas_rx      = 1;
+
   if (Ncp == EXTENDED)
     AssertFatal(mu == NR_MU_2,"Invalid cyclic prefix %d for numerology index %d\n", Ncp, mu);
 

targets/RT/USER/nr-ue.c

@@ -413,7 +413,7 @@ static void *UE_thread_synch(void *arg) {
                     //UE->rfdevice.trx_set_gains_func(&openair0,&openair0_cfg[0]);
                     //UE->rfdevice.trx_stop_func(&UE->rfdevice);
                     // sleep(1);
-                    //init_frame_parms(&UE->frame_parms,1);
+                    //nr_init_frame_parms(&UE->frame_parms);
                     /*if (UE->rfdevice.trx_start_func(&UE->rfdevice) != 0 ) {
                         LOG_E(HW,"Could not start the device\n");
                         oai_exit=1;

targets/RT/USER/nr-uesoftmodem.c

@@ -556,7 +556,7 @@ static void get_options (int argc, char **argv) {
 	  paramdef_t cmdline_params[] =CMDLINE_PARAMS_DESC ;
 	  paramdef_t cmdline_logparams[] =CMDLINE_LOGPARAMS_DESC ;
 
-	  set_default_frame_parms(config,frame_parms);
+	  //set_default_frame_parms(config,frame_parms);
 	  config_process_cmdline( cmdline_params,sizeof(cmdline_params)/sizeof(paramdef_t),NULL);
 
 	  if (strlen(in_path) > 0) {
@@ -832,7 +832,7 @@ int main( int argc, char **argv ) {
     set_latency_target();
 
     // set default parameters
-    //set_default_frame_parms(frame_parms);
+    set_default_frame_parms(config,frame_parms);
 
     // initialize logging
     logInit();
@@ -938,9 +938,11 @@ int main( int argc, char **argv ) {
 
       LOG_I(PHY,"Set nb_rx_antenna %d , nb_tx_antenna %d \n",frame_parms[CC_id]->nb_antennas_rx, frame_parms[CC_id]->nb_antennas_tx);
 
+      set_default_frame_parms(config[CC_id],frame_parms[CC_id]);
       
     //init_ul_hopping(frame_parms[CC_id]);
-    //nr_init_frame_parms(frame_parms[CC_id],1);
+    nr_init_frame_parms(config[CC_id],frame_parms[CC_id]);
+    printf("after init frame_parms %d\n",frame_parms[CC_id]->ofdm_symbol_size);
     //   phy_init_top(frame_parms[CC_id]);
     //phy_init_lte_top(frame_parms[CC_id]);
   }
@@ -966,6 +968,8 @@ int main( int argc, char **argv ) {
 
             printf("PHY_vars_UE_g[0][%d] = %p\n",CC_id,UE[CC_id]);
 
+            printf("frame_parms %d\n",frame_parms[CC_id]->ofdm_symbol_size);
+
             PHY_vars_UE_g[0][CC_id] = init_nr_ue_vars(frame_parms[CC_id], 0,abstraction_flag);
             UE[CC_id] = PHY_vars_UE_g[0][CC_id];