more changes to numerology and bandwidth

executables/nr-uesoftmodem.c

@@ -516,7 +516,7 @@ void init_openair0(void) {
     openair0_cfg[card].configFilename = NULL;
     openair0_cfg[card].threequarter_fs = frame_parms[0]->threequarter_fs;
 
-    if(frame_param[0]->N_RB_DL == 66) {
+    if(frame_parms[0]->N_RB_DL == 66) {
       if (numerology==3) {
           openair0_cfg[card].sample_rate=122.88e6;
           openair0_cfg[card].samples_per_frame = 1228800;

openair1/PHY/INIT/nr_init_ue.c

@@ -992,8 +992,8 @@ void set_default_frame_parms_single(nfapi_nr_config_request_t *config,
   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->N_RB_DL             = 66;
+  frame_parms->N_RB_UL             = 66;
   frame_parms->Ncp                 = NORMAL;
   //frame_parms[CC_id]->Ncp_UL              = NORMAL;
   frame_parms->Nid_cell            = 0;
@@ -1021,7 +1021,7 @@ void set_default_frame_parms_single(nfapi_nr_config_request_t *config,
   frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.highSpeedFlag=0;
   frame_parms[CC_id]->prach_config_common.prach_ConfigInfo.prach_FreqOffset=0;*/
   // NR: Init to legacy LTE 20Mhz params
-  frame_parms->numerology_index = 0;
+  frame_parms->numerology_index = 3;
   frame_parms->ttis_per_subframe  = 1;
   frame_parms->slots_per_tti    = 2;
   //}

openair1/PHY/MODULATION/slot_fep_nr.c

@@ -117,8 +117,8 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
     return(-1);
     }*/
 
-  if (Ns<0 || Ns>=20) {
-    printf("slot_fep: Ns must be between 0 and 19\n");
+  if (Ns<0 || Ns>=80) {
+    printf("slot_fep: Ns must be between 0 and 79\n");
     return(-1);
   }
 

openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c

@@ -220,7 +220,7 @@ int nr_initial_sync(UE_nr_rxtx_proc_t *proc, PHY_VARS_NR_UE *ue, runmode_t mode,
   fp->Ncp=NORMAL;
   fp->frame_type=TDD;
   // FK: added N_RB_DL paramter here as this function shares code with the gNB where it is needed. We should rewrite this function for the UE. 
-  nr_init_frame_parms_ue(fp,NR_MU_1,NORMAL,fp->N_RB_DL,n_ssb_crb,0);
+  nr_init_frame_parms_ue(fp,NR_MU_3,NORMAL,fp->N_RB_DL,n_ssb_crb,0);
   LOG_D(PHY,"nr_initial sync ue RB_DL %d\n", fp->N_RB_DL);
 
 

openair1/SCHED_UE/phy_procedures_lte_ue.c

@@ -79,7 +79,7 @@ extern double cpuf;
 void Msg1_transmitted(module_id_t module_idP, uint8_t CC_id, frame_t frameP, uint8_t eNB_id);
 void Msg3_transmitted(module_id_t module_idP, uint8_t CC_id, frame_t frameP, uint8_t eNB_id);
 
-extern uint32_t downlink_frequency[MAX_NUM_CCs][4];
+extern uint64_t downlink_frequency[MAX_NUM_CCs][4];
 
 void get_dumpparam(PHY_VARS_UE *ue,
                    UE_rxtx_proc_t *proc,

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -89,7 +89,7 @@ void config_common(int Mod_idP,
 {
   nfapi_nr_config_request_t *cfg = &RC.nrmac[Mod_idP]->config[CC_idP];
 
-  int mu = 1;
+  int mu = 3;
 
   cfg->sch_config.physical_cell_id.value = cellid;
   cfg->sch_config.ssb_scg_position_in_burst.value = ssb_pattern;