diff options
| author | Josh Blum <josh@joshknows.com> | 2010-07-07 18:32:44 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-07-07 18:32:44 +0000 |
| commit | ed29bc87996972ee7257b9e186f125efe5b0294b (patch) | |
| tree | 342d4c9c815b1bd08eeddc55d94f50942ac5034e /host/lib | |
| parent | aff6a7146145a9cf9398a06d519775fae91d1930 (diff) | |
| parent | c48f029971a879b367e8876351b4795d90346208 (diff) | |
| download | uhd-ed29bc87996972ee7257b9e186f125efe5b0294b.tar.gz uhd-ed29bc87996972ee7257b9e186f125efe5b0294b.tar.bz2 uhd-ed29bc87996972ee7257b9e186f125efe5b0294b.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e_wip
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_regs.hpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_regs.hpp b/host/lib/usrp/usrp2/usrp2_regs.hpp index c859d3603..1a5864c85 100644 --- a/host/lib/usrp/usrp2/usrp2_regs.hpp +++ b/host/lib/usrp/usrp2/usrp2_regs.hpp @@ -241,9 +241,4 @@ #define U2_REG_RX_CTRL_NSAMPS_PER_PKT _SR_ADDR(SR_RX_CTRL + 7) #define U2_REG_RX_CTRL_NCHANNELS _SR_ADDR(SR_RX_CTRL + 8) // 1 in basic case, up to 4 for vector sources -//helpful macros for dealing with stream cmd -#define U2_REG_RX_CTRL_MAX_SAMPS_PER_CMD 0x1fffffff -#define U2_REG_RX_CTRL_MAKE_CMD(nsamples, now, chain, reload) \ - ((((now) & 0x1) << 31) | (((chain) & 0x1) << 30) | (((reload) & 0x1) << 29) | ((nsamples) & 0x1fffffff)) - #endif /* INCLUDED_USRP2_REGS_HPP */ |