diff options
| author | Josh Blum <josh@joshknows.com> | 2010-05-03 11:03:59 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-05-03 11:03:59 -0700 |
| commit | ba9708b786db08e2e3d55cd27f70bfeb31966880 (patch) | |
| tree | 06988b80bba28bc3b7a4356698f24db7054b138a | |
| parent | 48c636ec9d9287303bf5a223b2dd600545933237 (diff) | |
| download | uhd-ba9708b786db08e2e3d55cd27f70bfeb31966880.tar.gz uhd-ba9708b786db08e2e3d55cd27f70bfeb31966880.tar.bz2 uhd-ba9708b786db08e2e3d55cd27f70bfeb31966880.zip | |
minor fix to pass dboard ctor args with correct dbids
| -rw-r--r-- | host/lib/usrp/dboard_manager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp index 4f5d0a473..8161727e5 100644 --- a/host/lib/usrp/dboard_manager.cpp +++ b/host/lib/usrp/dboard_manager.cpp @@ -213,14 +213,14 @@ dboard_manager_impl::dboard_manager_impl( //dboard constructor args dboard_base::ctor_args_impl db_ctor_args; db_ctor_args.db_iface = iface; - db_ctor_args.rx_id = rx_dboard_id; - db_ctor_args.tx_id = tx_dboard_id; //make xcvr subdevs (make one subdev for both rx and tx dboards) if (rx_dboard_ctor == tx_dboard_ctor){ UHD_ASSERT_THROW(rx_subdevs == tx_subdevs); BOOST_FOREACH(const std::string &subdev, rx_subdevs){ db_ctor_args.sd_name = subdev; + db_ctor_args.rx_id = rx_dboard_id; + db_ctor_args.tx_id = tx_dboard_id; dboard_base::sptr xcvr_dboard = rx_dboard_ctor(&db_ctor_args); //create a rx proxy for this xcvr board _rx_dboards[subdev] = subdev_proxy::sptr( @@ -238,6 +238,7 @@ dboard_manager_impl::dboard_manager_impl( //make the rx subdevs BOOST_FOREACH(const std::string &subdev, rx_subdevs){ db_ctor_args.sd_name = subdev; + db_ctor_args.rx_id = rx_dboard_id; db_ctor_args.tx_id = dboard_id_t::none(); dboard_base::sptr rx_dboard = rx_dboard_ctor(&db_ctor_args); //create a rx proxy for this rx board @@ -249,6 +250,7 @@ dboard_manager_impl::dboard_manager_impl( BOOST_FOREACH(const std::string &subdev, tx_subdevs){ db_ctor_args.sd_name = subdev; db_ctor_args.rx_id = dboard_id_t::none(); + db_ctor_args.tx_id = tx_dboard_id; dboard_base::sptr tx_dboard = tx_dboard_ctor(&db_ctor_args); //create a tx proxy for this tx board _tx_dboards[subdev] = subdev_proxy::sptr( |