diff options
author | Nick Foster <nick@nerdnetworks.org> | 2010-07-29 18:12:20 -0700 |
---|---|---|
committer | Nick Foster <nick@nerdnetworks.org> | 2010-07-29 18:12:20 -0700 |
commit | 90a5d84a18aaa338092e572ff257aab1fdcc8e6b (patch) | |
tree | d31806e064b1b12a21b2245bec2c9251537a6083 /host/lib/usrp/usrp2/usrp2_regs.cpp | |
parent | f39c4538a3ca25c79f6b793ee0b6448051dcd751 (diff) | |
parent | 1cddf89b0ea0b509418ea9a817bd1cebbdfdb118 (diff) | |
download | uhd-90a5d84a18aaa338092e572ff257aab1fdcc8e6b.tar.gz uhd-90a5d84a18aaa338092e572ff257aab1fdcc8e6b.tar.bz2 uhd-90a5d84a18aaa338092e572ff257aab1fdcc8e6b.zip |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Conflicts:
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_regs.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/usrp2_regs.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_regs.cpp b/host/lib/usrp/usrp2/usrp2_regs.cpp index e40407f99..857fbda9c 100644 --- a/host/lib/usrp/usrp2/usrp2_regs.cpp +++ b/host/lib/usrp/usrp2/usrp2_regs.cpp @@ -92,6 +92,7 @@ usrp2_regs_t usrp2_get_regs(int hw_rev) { 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); + x.tx_ctrl_policy = sr_addr(misc_output_base, x.sr_tx_ctrl + 3); return x; } |