diff options
| author | Josh Blum <josh@joshknows.com> | 2011-01-04 16:49:34 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-01-04 16:49:34 -0800 |
| commit | fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda (patch) | |
| tree | 107e43e35008e6df0d33b0e8a8f5f52d28a91493 /host/lib/usrp/usrp2/usrp2_regs.cpp | |
| parent | 4711829f03ee2fcd1c4e9dc2a353af0e35497180 (diff) | |
| parent | 7b0b2924d52bbbcb4660cad5d8070074426011ce (diff) | |
| download | uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.tar.gz uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.tar.bz2 uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.zip | |
Merge branch 'cordic_policy' into next
Conflicts:
host/lib/usrp/usrp2/usrp2_regs.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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_regs.cpp b/host/lib/usrp/usrp2/usrp2_regs.cpp index 82ad30f08..13f475413 100644 --- a/host/lib/usrp/usrp2/usrp2_regs.cpp +++ b/host/lib/usrp/usrp2/usrp2_regs.cpp @@ -59,9 +59,11 @@ usrp2_regs_t usrp2_get_regs(bool use_n2xx_map) { x.time64_tps = sr_addr(misc_output_base, x.sr_time64 + 4); x.time64_mimo_sync = sr_addr(misc_output_base, x.sr_time64 + 5); x.status = bp_base + 4*8; - x.time64_secs_rb = bp_base + 4*10; - x.time64_ticks_rb = bp_base + 4*11; + x.time64_secs_rb_imm = bp_base + 4*10; + x.time64_ticks_rb_imm = bp_base + 4*11; x.compat_num_rb = bp_base + 4*12; + x.time64_secs_rb_pps = bp_base + 4*14; + x.time64_ticks_rb_pps = bp_base + 4*15; x.dsp_tx_freq = sr_addr(misc_output_base, x.sr_tx_dsp + 0); x.dsp_tx_scale_iq = sr_addr(misc_output_base, x.sr_tx_dsp + 1); x.dsp_tx_interp_rate = sr_addr(misc_output_base, x.sr_tx_dsp + 2); |