maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding 46.08MHz sampling to USRP B210 (to use e.g. with 40MHz 5G-NR)

Browse Source
This commit is contained in:
Florian Kaltenberger (Italie)
2019-07-08 12:42:02 +02:00
committed by Florian Kaltenberger
parent 1ce0700e5d
commit 77491ec57d
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-ru.c
+12 -4
View File
@@ -1076,10 +1076,18 @@ void fill_rf_config(RU_t *ru, char *rf_config_file) {
cfg->rx_bw = 40e6; cfg->rx_bw = 40e6;
} }
} else if(N_RB == 106) { } else if(N_RB == 106) {
cfg->sample_rate=61.44e6; if (fp->threequarter_fs) {
cfg->samples_per_frame = 614400; cfg->sample_rate=46.08e6;
cfg->tx_bw = 20e6; cfg->samples_per_frame = 460800;
cfg->rx_bw = 20e6; 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 { } else {
AssertFatal(0==1,"N_RB %d not yet supported for numerology %d\n",N_RB,mu); AssertFatal(0==1,"N_RB %d not yet supported for numerology %d\n",N_RB,mu);
} }
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+10 -2
View File
@@ -870,7 +870,7 @@ void set_rx_gain_offset(openair0_config_t *openair0_cfg, int chain_index,int bw_
default: default:
LOG_E(PHY,"unknown sampling rate %d\n",(int)openair0_cfg[0].sample_rate); LOG_E(PHY,"unknown sampling rate %d\n",(int)openair0_cfg[0].sample_rate);
exit(-1); //exit(-1);
break; break;
} }
} }
@@ -1210,7 +1210,15 @@ extern "C" {
} }
switch ((int)openair0_cfg[0].sample_rate) { 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); s->usrp->set_master_clock_rate(30.72e6);
//openair0_cfg[0].samples_per_packet = 1024; //openair0_cfg[0].samples_per_packet = 1024;
openair0_cfg[0].tx_sample_advance = 115; openair0_cfg[0].tx_sample_advance = 115;