diff options
| author | Josh Blum <josh@joshknows.com> | 2010-05-27 23:09:09 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-05-27 23:09:09 +0000 |
| commit | e940d0225944a210584c386d270d09b132b5514b (patch) | |
| tree | 59188c0b162c29c02ed09a59b32ab84010ecf269 /firmware/microblaze/lib/memory_map.h | |
| parent | f113ae17863729f05b6ada815b9817cd16001211 (diff) | |
| parent | 4eff47a4b66eff61feffe6498b9ecebef94dc6b9 (diff) | |
| download | uhd-e940d0225944a210584c386d270d09b132b5514b.tar.gz uhd-e940d0225944a210584c386d270d09b132b5514b.tar.bz2 uhd-e940d0225944a210584c386d270d09b132b5514b.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Conflicts:
host/utils/CMakeLists.txt
Diffstat (limited to 'firmware/microblaze/lib/memory_map.h')
| -rw-r--r-- | firmware/microblaze/lib/memory_map.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/firmware/microblaze/lib/memory_map.h b/firmware/microblaze/lib/memory_map.h index fed1e5259..cdf3dd338 100644 --- a/firmware/microblaze/lib/memory_map.h +++ b/firmware/microblaze/lib/memory_map.h @@ -525,10 +525,6 @@ typedef struct { volatile uint32_t pad[7]; // Make each structure 16 elements long } sr_rx_ctrl_t; -#define MAX_SAMPLES_PER_CMD 0x3fffffff -#define MK_RX_CMD(nsamples, now, chain) \ - ((((now) & 0x1) << 31) | (((chain) & 0x1) << 30) | ((nsamples) & 0x3fffffff)) - #define sr_rx_ctrl ((sr_rx_ctrl_t *) _SR_ADDR(SR_RX_CTRL)) // --- dsp rx regs --- |