temporarily reverting nrarfcn to earfcn

openair1/PHY/INIT/nr_init.c

@@ -377,8 +377,8 @@ void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,int N_RB_DL,int N_RB_UL,int mu)
   nfapi_nr_config_request_t *gNB_config = &gNB->gNB_config;
 
   //overwrite for new NR parameters
-  gNB_config->nfapi_config.rf_bands.rf_band[0] = 78;
-  gNB_config->nfapi_config.nrarfcn.value = 620000;
+  gNB_config->nfapi_config.rf_bands.rf_band[0] = 22; //78;
+  gNB_config->nfapi_config.nrarfcn.value = 6600; //620000;
   gNB_config->subframe_config.numerology_index_mu.value = mu;
   gNB_config->subframe_config.duplex_mode.value = TDD;
   gNB_config->rf_config.tx_antenna_ports.value = 1;
@@ -392,7 +392,7 @@ void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,int N_RB_DL,int N_RB_UL,int mu)
 
   gNB->mac_enabled     = 1;
 
-  fp->dl_CarrierFreq = from_nrarfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.nrarfcn.value);
+  fp->dl_CarrierFreq = from_earfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.nrarfcn.value);
   fp->ul_CarrierFreq = fp->dl_CarrierFreq - (get_uldl_offset(gNB_config->nfapi_config.rf_bands.rf_band[0])*100000);
   fp->threequarter_fs                    = 0;
 
@@ -433,7 +433,7 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config)
 
   RC.gNB[Mod_id][CC_id]->mac_enabled     = 1;
 
-  fp->dl_CarrierFreq = from_nrarfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.nrarfcn.value);
+  fp->dl_CarrierFreq = from_earfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.nrarfcn.value);
   fp->ul_CarrierFreq = fp->dl_CarrierFreq - (get_uldl_offset(gNB_config->nfapi_config.rf_bands.rf_band[0])*100000);
   fp->threequarter_fs                    = 0;
 

openair1/PHY/NR_TRANSPORT/nr_dci_tools.c

@@ -129,7 +129,7 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
                         dci_alloc->pdcch_params.rnti_type,
                         N_RB,
                         cfg);
-  Assert_Fatal(dci_alloc->size<=64, "DCI sizes above 64 bits not yet supported");
+  AssertFatal(dci_alloc->size<=64, "DCI sizes above 64 bits not yet supported");
   n_shift = (dci_alloc->pdcch_params.config_type == NFAPI_NR_CSET_CONFIG_MIB_SIB1)?
                       cfg->sch_config.physical_cell_id.value : dci_alloc->pdcch_params.shift_index;
   nr_fill_cce_list(dci_alloc, n_shift, cand_idx);

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -179,7 +179,7 @@ void config_common(int Mod_idP,
   cfg->nfapi_config.rf_bands.tl.tag = NFAPI_PHY_RF_BANDS_TAG;
   cfg->num_tlv++;
 
-  cfg->nfapi_config.nrarfcn.value                   = to_nrarfcn(nr_bandP,dl_CarrierFreqP,dl_BandwidthP);
+  cfg->nfapi_config.nrarfcn.value                   = to_earfcn(nr_bandP,dl_CarrierFreqP,dl_BandwidthP);
   cfg->nfapi_config.nrarfcn.tl.tag = NFAPI_NR_NFAPI_NRARFCN_TAG;
   cfg->num_tlv++;
 
@@ -209,7 +209,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
                            int CC_idP,
                            int p_gNB,
                            int nr_bandP,
-                           int dl_CarrierFreqP,
+                           uint32_t dl_CarrierFreqP,
                            int dl_BandwidthP,
                            NR_BCCH_BCH_Message_t *mib,
                            NR_ServingCellConfigCommon_t *servingcellconfigcommon

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -40,7 +40,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
                            int CC_id,
                            int p_gNB,
                            int eutra_bandP,
-                           int dl_CarrierFreqP,
+                           uint32_t dl_CarrierFreqP,
                            int dl_BandwidthP,
                            NR_BCCH_BCH_Message_t *mib,
                            NR_ServingCellConfigCommon_t *servingcellconfigcommon