diff --git a/executables/nr-ru.c b/executables/nr-ru.c index f39449ddb62c83db185e1eacfcde40a2493d18d1..57c084de5f8aaa753e10bbe317c539eb6c0a6972 100644 --- a/executables/nr-ru.c +++ b/executables/nr-ru.c @@ -1076,10 +1076,18 @@ void fill_rf_config(RU_t *ru, char *rf_config_file) { cfg->rx_bw = 40e6; } } else if(N_RB == 106) { - cfg->sample_rate=61.44e6; - cfg->samples_per_frame = 614400; - cfg->tx_bw = 20e6; - cfg->rx_bw = 20e6; + if (fp->threequarter_fs) { + cfg->sample_rate=46.08e6; + cfg->samples_per_frame = 460800; + cfg->tx_bw = 20e6; + cfg->rx_bw = 20e6; + } + else { + cfg->sample_rate=61.44e6; + cfg->samples_per_frame = 614400; + cfg->tx_bw = 20e6; + cfg->rx_bw = 20e6; + } } else { AssertFatal(0==1,"N_RB %d not yet supported for numerology %d\n",N_RB,mu); } diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp index b9c08938e3c2f347c8901441e1f2943c17b0ab12..5e99e1ba2732258b3370227edaea16da7a5eebe0 100644 --- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp +++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp @@ -870,7 +870,7 @@ void set_rx_gain_offset(openair0_config_t *openair0_cfg, int chain_index,int bw_ default: LOG_E(PHY,"unknown sampling rate %d\n",(int)openair0_cfg[0].sample_rate); - exit(-1); + //exit(-1); break; } } @@ -1210,7 +1210,15 @@ extern "C" { } switch ((int)openair0_cfg[0].sample_rate) { - case 30720000: + case 46080000: + s->usrp->set_master_clock_rate(46.08e6); + //openair0_cfg[0].samples_per_packet = 1024; + openair0_cfg[0].tx_sample_advance = 115; + openair0_cfg[0].tx_bw = 40e6; + openair0_cfg[0].rx_bw = 40e6; + break; + + case 30720000: s->usrp->set_master_clock_rate(30.72e6); //openair0_cfg[0].samples_per_packet = 1024; openair0_cfg[0].tx_sample_advance = 115;