additional fixes

openair1/PHY/INIT/nr_init.c

@@ -439,7 +439,7 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config)
   get_band(fp->dl_CarrierFreq, &gNB_config->nfapi_config.rf_bands.rf_band[0], &uplink_frequency_offset[CC_id][0], &fp->frame_type);
   fp->ul_CarrierFreq = fp->dl_CarrierFreq + uplink_frequency_offset[CC_id][0];
   fp->threequarter_fs                    = openair0_cfg[0].threequarter_fs;
-  LOG_I(PHY,"Configuring MIB for instance %d, CCid %d : (band %d,N_RB_DL %d, N_RB_UL %d, Nid_cell %d,DL freq %u, UL freq %u)\n",
+  LOG_I(PHY,"Configuring MIB for instance %d, CCid %d : (band %d,N_RB_DL %d, N_RB_UL %d, Nid_cell %d,DL freq %llu, UL freq %llu)\n",
         Mod_id,
         CC_id,
         gNB_config->nfapi_config.rf_bands.rf_band[0],

openair2/LAYER2/NR_MAC_gNB/config.c

@@ -106,7 +106,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*180000*(1+mu));
+  cfg->nfapi_config.nrarfcn.value                   = to_nrarfcn(nr_bandP,dl_CarrierFreqP,dl_BandwidthP*180000*(1<<mu));
   cfg->nfapi_config.nrarfcn.tl.tag = NFAPI_NR_NFAPI_NRARFCN_TAG;
   cfg->num_tlv++;
 

openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c

@@ -76,7 +76,7 @@ void get_band(uint64_t downlink_frequency,                     /////   -----src5
               lte_frame_type_t *current_type)
 {
     int ind;
-    int64_t dl_freq_khz = downlink_frequency/1000;
+    uint64_t dl_freq_khz = downlink_frequency/1000;
     fprintf(stderr, "The value of dl_freq_khz in get_band() is %llu size of nr_bandtable = %d \n",(long long unsigned int)dl_freq_khz,sizeof(nr_bandtable) / sizeof(nr_bandtable[0]));
     for ( ind=0;
           ind < sizeof(nr_bandtable) / sizeof(nr_bandtable[0]);
@@ -102,7 +102,7 @@ void get_band(uint64_t downlink_frequency,                     /////   -----src5
     }
 
     AssertFatal(ind != (sizeof(nr_bandtable) / sizeof(nr_bandtable[0])),
-	    "Can't find EUTRA band for frequency %u\n", downlink_frequency);
+	    "Can't find EUTRA band for frequency %llu\n", downlink_frequency);
 
 }