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/usrp2_regs.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/usrp2_regs.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_regs.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_regs.cpp b/host/lib/usrp/usrp2/usrp2_regs.cpp index 071ba0cd2..e40407f99 100644 --- a/host/lib/usrp/usrp2/usrp2_regs.cpp +++ b/host/lib/usrp/usrp2/usrp2_regs.cpp @@ -89,6 +89,9 @@ usrp2_regs_t usrp2_get_regs(int hw_rev) { x.rx_ctrl_vrt_trailer = sr_addr(misc_output_base, x.sr_rx_ctrl + 6); x.rx_ctrl_nsamps_per_pkt = sr_addr(misc_output_base, x.sr_rx_ctrl + 7); x.rx_ctrl_nchannels = sr_addr(misc_output_base, x.sr_rx_ctrl + 8); + x.tx_ctrl_num_chan = sr_addr(misc_output_base, x.sr_tx_ctrl + 0); + x.tx_ctrl_clear_state = sr_addr(misc_output_base, x.sr_tx_ctrl + 1); + x.tx_ctrl_report_sid = sr_addr(misc_output_base, x.sr_tx_ctrl + 2); return x; } |