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

bug fix for subdev selection

Browse Source
This commit is contained in:
Sagar Parsawar
2022-05-19 16:28:50 +02:00
parent 68dd4fa20b
commit f2e1a4a1a8
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+12 -7
View File
@@ -1324,6 +1324,18 @@ extern "C" {
openair0_cfg[0].iq_txshift = 4;//shift openair0_cfg[0].iq_txshift = 4;//shift
openair0_cfg[0].iq_rxrescale = 15;//rescale iqs openair0_cfg[0].iq_rxrescale = 15;//rescale iqs
if(openair0_cfg[0].tx_subdev!=NULL){
LOG_I(HW, "openair0_cfg[0].tx_subdev == %s\n", openair0_cfg[0].tx_subdev);
tx_subdev = openair0_cfg[0].tx_subdev;
s->usrp->set_tx_subdev_spec(tx_subdev);
}
if(openair0_cfg[0].rx_subdev!=NULL){
LOG_I(HW, "openair0_cfg[0].rx_subdev == %s\n", openair0_cfg[0].rx_subdev);
rx_subdev = openair0_cfg[0].rx_subdev;
s->usrp->set_rx_subdev_spec(rx_subdev);
}
for(int i=0; i<((int) s->usrp->get_rx_num_channels()); i++) { for(int i=0; i<((int) s->usrp->get_rx_num_channels()); i++) {
if (i<openair0_cfg[0].rx_num_channels) { if (i<openair0_cfg[0].rx_num_channels) {
s->usrp->set_rx_rate(openair0_cfg[0].sample_rate,i+choffset); s->usrp->set_rx_rate(openair0_cfg[0].sample_rate,i+choffset);
@@ -1347,13 +1359,6 @@ extern "C" {
LOG_D(HW, "usrp->get_tx_num_channels() == %zd\n", s->usrp->get_tx_num_channels()); LOG_D(HW, "usrp->get_tx_num_channels() == %zd\n", s->usrp->get_tx_num_channels());
LOG_D(HW, "openair0_cfg[0].tx_num_channels == %d\n", openair0_cfg[0].tx_num_channels); LOG_D(HW, "openair0_cfg[0].tx_num_channels == %d\n", openair0_cfg[0].tx_num_channels);
LOG_I(HW, "openair0_cfg[0].tx_subdev == %s\n", openair0_cfg[0].tx_subdev);
LOG_I(HW, "openair0_cfg[0].rx_subdev == %s\n", openair0_cfg[0].rx_subdev);
tx_subdev = openair0_cfg[0].tx_subdev;
rx_subdev = openair0_cfg[0].rx_subdev;
s->usrp->set_tx_subdev_spec(tx_subdev);
s->usrp->set_rx_subdev_spec(rx_subdev);
for(int i=0; i<((int) s->usrp->get_tx_num_channels()); i++) { for(int i=0; i<((int) s->usrp->get_tx_num_channels()); i++) {
::uhd::gain_range_t gain_range_tx = s->usrp->get_tx_gain_range(i); ::uhd::gain_range_t gain_range_tx = s->usrp->get_tx_gain_range(i);