diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-07-27 16:10:36 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-07-27 16:15:51 -0700 |
| commit | aeedd5a53e017e2c14a86dff521353ff6016a849 (patch) | |
| tree | c32cae63a6c7524210a6f859f0258b7ed1846622 /host/lib/usrp/usrp2/mboard_impl.cpp | |
| parent | d8f3980e45458cf68c8efaa029e492a1b8d08354 (diff) | |
| parent | bbe7dd1c8f1bd8f42a0ae3d28f36c0334b0fd3c8 (diff) | |
| download | uhd-aeedd5a53e017e2c14a86dff521353ff6016a849.tar.gz uhd-aeedd5a53e017e2c14a86dff521353ff6016a849.tar.bz2 uhd-aeedd5a53e017e2c14a86dff521353ff6016a849.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2px
Conflicts:
host/lib/usrp/usrp2/mboard_impl.cpp
Diffstat (limited to 'host/lib/usrp/usrp2/mboard_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/mboard_impl.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp index 938bf8466..133e6f989 100644 --- a/host/lib/usrp/usrp2/mboard_impl.cpp +++ b/host/lib/usrp/usrp2/mboard_impl.cpp @@ -75,6 +75,7 @@ usrp2_mboard_impl::usrp2_mboard_impl( _iface->poke32(_iface->regs.rx_ctrl_nchannels, 1); _iface->poke32(_iface->regs.rx_ctrl_clear_overrun, 1); //reset _iface->poke32(_iface->regs.rx_ctrl_vrt_header, 0 + | (0x1 << 28) //if data with stream id | (0x1 << 26) //has trailer | (0x3 << 22) //integer time other @@ -84,6 +85,11 @@ usrp2_mboard_impl::usrp2_mboard_impl( _iface->poke32(_iface->regs.rx_ctrl_vrt_trailer, 0); _iface->poke32(_iface->regs.time64_tps, size_t(get_master_clock_freq())); + //init the tx control registers + _iface->poke32(_iface->regs.tx_ctrl_num_chan, 0); //1 channel + _iface->poke32(_iface->regs.tx_ctrl_clear_state, 1); //reset + _iface->poke32(_iface->regs.tx_ctrl_report_sid, 1); //sid 1 (different from rx) + //init the ddc init_ddc_config(); |