aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/usrp2/dboard_impl.cpp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-04-05 17:42:22 -0700
committerJosh Blum <josh@joshknows.com>2010-04-05 17:42:22 -0700
commite4f75a9271cc20702444641a3e8d442e12492c11 (patch)
treea9135bfa9d4ef5b648d861e7de9c7bf989867d2c /host/lib/usrp/usrp2/dboard_impl.cpp
parent9c1e7c5b8804a821e9a48908e7302327e4b9070d (diff)
parent97496ace66842f9d7529793b2b202be9abe156c3 (diff)
downloaduhd-e4f75a9271cc20702444641a3e8d442e12492c11.tar.gz
uhd-e4f75a9271cc20702444641a3e8d442e12492c11.tar.bz2
uhd-e4f75a9271cc20702444641a3e8d442e12492c11.zip
Merge branch 'rework' of git@ettus.sourcerepo.com:ettus/uhd
Diffstat (limited to 'host/lib/usrp/usrp2/dboard_impl.cpp')
-rw-r--r--host/lib/usrp/usrp2/dboard_impl.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp
index 30883cd50..d1515f2d5 100644
--- a/host/lib/usrp/usrp2/dboard_impl.cpp
+++ b/host/lib/usrp/usrp2/dboard_impl.cpp
@@ -49,11 +49,11 @@ void usrp2_impl::dboard_init(void){
);
//load dboards
- _rx_dboards[""] = wax_obj_proxy::make(
+ _rx_dboard_proxy = wax_obj_proxy::make(
boost::bind(&usrp2_impl::rx_dboard_get, this, _1, _2),
boost::bind(&usrp2_impl::rx_dboard_set, this, _1, _2)
);
- _tx_dboards[""] = wax_obj_proxy::make(
+ _tx_dboard_proxy = wax_obj_proxy::make(
boost::bind(&usrp2_impl::tx_dboard_get, this, _1, _2),
boost::bind(&usrp2_impl::tx_dboard_set, this, _1, _2)
);
@@ -81,7 +81,7 @@ void usrp2_impl::update_rx_mux_config(void){
rx_mux = (((rx_mux >> 0) & 0x3) << 2) | (((rx_mux >> 2) & 0x3) << 0);
}
- this->poke(FR_DSP_RX_MUX, rx_mux);
+ this->poke32(FR_DSP_RX_MUX, rx_mux);
}
void usrp2_impl::update_tx_mux_config(void){
@@ -94,7 +94,7 @@ void usrp2_impl::update_tx_mux_config(void){
tx_mux = (((tx_mux >> 0) & 0x1) << 1) | (((tx_mux >> 1) & 0x1) << 0);
}
- this->poke(FR_DSP_TX_MUX, tx_mux);
+ this->poke32(FR_DSP_TX_MUX, tx_mux);
}
/***********************************************************************