summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp2
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-07-16 16:43:06 -0700
committerJosh Blum <josh@joshknows.com>2010-07-16 16:51:30 -0700
commit9a9ca6dfad4b81c42f3cda6a44b018358999d701 (patch)
tree8e14ee690aa0fb13db9581415492ef889e73e656 /host/lib/usrp/usrp2
parent2a3d0e653e9d38dc3eed729d1442f3d98aadb1e5 (diff)
downloaduhd-9a9ca6dfad4b81c42f3cda6a44b018358999d701.tar.gz
uhd-9a9ca6dfad4b81c42f3cda6a44b018358999d701.tar.bz2
uhd-9a9ca6dfad4b81c42f3cda6a44b018358999d701.zip
uhd: work on tune logic, and subdev connection logic
Diffstat (limited to 'host/lib/usrp/usrp2')
-rw-r--r--host/lib/usrp/usrp2/dboard_impl.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp
index fa8d1a674..8942f9d31 100644
--- a/host/lib/usrp/usrp2/dboard_impl.cpp
+++ b/host/lib/usrp/usrp2/dboard_impl.cpp
@@ -104,8 +104,7 @@ void usrp2_mboard_impl::rx_dboard_set(const wax::obj &key, const wax::obj &val){
wax::obj rx_subdev = _dboard_manager->get_rx_subdev(_rx_subdevs_in_use.at(0));
std::cout << "Using: " << rx_subdev[SUBDEV_PROP_NAME].as<std::string>() << std::endl;
_iface->poke32(U2_REG_DSP_RX_MUX, dsp_type1::calc_rx_mux_word(
- rx_subdev[SUBDEV_PROP_QUADRATURE].as<bool>(),
- rx_subdev[SUBDEV_PROP_IQ_SWAPPED].as<bool>()
+ rx_subdev[SUBDEV_PROP_CONNECTION].as<subdev_conn_t>()
));
}
return;
@@ -164,7 +163,7 @@ void usrp2_mboard_impl::tx_dboard_set(const wax::obj &key, const wax::obj &val){
wax::obj tx_subdev = _dboard_manager->get_tx_subdev(_tx_subdevs_in_use.at(0));
std::cout << "Using: " << tx_subdev[SUBDEV_PROP_NAME].as<std::string>() << std::endl;
_iface->poke32(U2_REG_DSP_TX_MUX, dsp_type1::calc_tx_mux_word(
- tx_subdev[SUBDEV_PROP_IQ_SWAPPED].as<bool>()
+ tx_subdev[SUBDEV_PROP_CONNECTION].as<subdev_conn_t>()
));
}
return;