diff options
| author | Josh Blum <josh@joshknows.com> | 2010-04-12 13:55:57 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-04-12 13:55:57 +0000 |
| commit | 615f7081d8361643031437ac31bb4a44e41839e8 (patch) | |
| tree | f092991d1f3ff97fa53d9373c90e358105c4ff79 /host/lib/usrp/usrp2/dboard_impl.cpp | |
| parent | 50780640a1b9ed6abb2abebbc727ce19711fbcb4 (diff) | |
| parent | 34854116a4fd287fe681222f2b7a881692e418d3 (diff) | |
| download | uhd-615f7081d8361643031437ac31bb4a44e41839e8.tar.gz uhd-615f7081d8361643031437ac31bb4a44e41839e8.tar.bz2 uhd-615f7081d8361643031437ac31bb4a44e41839e8.zip | |
Merge branch 'master' into usrp_e
Diffstat (limited to 'host/lib/usrp/usrp2/dboard_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/dboard_impl.cpp | 8 |
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); } /*********************************************************************** |