diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-26 15:31:03 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-26 15:31:03 -0700 |
| commit | 693929a9e6e9234610e756e6d25da58d2171a565 (patch) | |
| tree | e796a386d11ec0d081900a99628ac2ee58f473b7 /host/lib/usrp/usrp2/mboard_impl.cpp | |
| parent | f86c25317b457b280c697fc47905c79bdbbc0c93 (diff) | |
| parent | 19c15883a9054727c13f4eb5471cc961fe54c40d (diff) | |
| download | uhd-693929a9e6e9234610e756e6d25da58d2171a565.tar.gz uhd-693929a9e6e9234610e756e6d25da58d2171a565.tar.bz2 uhd-693929a9e6e9234610e756e6d25da58d2171a565.zip | |
Merge branch 'tx_report'
Conflicts:
host/lib/usrp/usrp2/io_impl.cpp
Diffstat (limited to 'host/lib/usrp/usrp2/mboard_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/mboard_impl.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp index 7518d3114..b3b03c11c 100644 --- a/host/lib/usrp/usrp2/mboard_impl.cpp +++ b/host/lib/usrp/usrp2/mboard_impl.cpp @@ -67,7 +67,7 @@ usrp2_mboard_impl::usrp2_mboard_impl( _allowed_decim_and_interp_rates.push_back(i); } - //setup the vrt rx registers + //init the rx control registers _iface->poke32(U2_REG_RX_CTRL_NSAMPS_PER_PKT, _io_helper.get_max_recv_samps_per_packet()); _iface->poke32(U2_REG_RX_CTRL_NCHANNELS, 1); _iface->poke32(U2_REG_RX_CTRL_CLEAR_OVERRUN, 1); //reset @@ -81,6 +81,11 @@ usrp2_mboard_impl::usrp2_mboard_impl( _iface->poke32(U2_REG_RX_CTRL_VRT_TRAILER, 0); _iface->poke32(U2_REG_TIME64_TPS, size_t(get_master_clock_freq())); + //init the tx control registers + _iface->poke32(U2_REG_TX_CTRL_NUM_CHAN, 0); //1 channel + _iface->poke32(U2_REG_TX_CTRL_CLEAR_STATE, 1); //reset + _iface->poke32(U2_REG_TX_CTRL_REPORT_SID, 1); //sid 1 (different from rx) + //init the ddc init_ddc_config(); |