diff options
| author | Philip Balister <philip@opensdr.com> | 2010-04-01 12:44:19 +0000 |
|---|---|---|
| committer | Philip Balister <philip@opensdr.com> | 2010-04-01 12:44:19 +0000 |
| commit | 93572731923e43bbb34a12db41170e56376ab03b (patch) | |
| tree | a46c53d1695a211dac39e46abf60a8f517e8d287 /firmware/microblaze/lib | |
| parent | 930755fce1e5d22a5ede0459dccd6c9501fc642c (diff) | |
| parent | 03be4d0673c5e0f597db7d27f535956a591bbeb7 (diff) | |
| download | uhd-93572731923e43bbb34a12db41170e56376ab03b.tar.gz uhd-93572731923e43bbb34a12db41170e56376ab03b.tar.bz2 uhd-93572731923e43bbb34a12db41170e56376ab03b.zip | |
Merge branch 'usrp_e' of git@ettus.sourcerepo.com:ettus/uhd into usrp_e
Diffstat (limited to 'firmware/microblaze/lib')
| -rw-r--r-- | firmware/microblaze/lib/memory_map.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/firmware/microblaze/lib/memory_map.h b/firmware/microblaze/lib/memory_map.h index bb6a1036d..fed1e5259 100644 --- a/firmware/microblaze/lib/memory_map.h +++ b/firmware/microblaze/lib/memory_map.h @@ -525,8 +525,9 @@ 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)) + ((((now) & 0x1) << 31) | (((chain) & 0x1) << 30) | ((nsamples) & 0x3fffffff)) #define sr_rx_ctrl ((sr_rx_ctrl_t *) _SR_ADDR(SR_RX_CTRL)) |