diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-17 16:42:27 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-11 18:43:09 -0800 |
| commit | 58d19c5adf7bde9298ad4363c275f72e4bbecd73 (patch) | |
| tree | 5aed8d5b83767058fb7e57c4c6b53f442650ea6c | |
| parent | b621dea91eeebe05c4823bc2da8780fa12997169 (diff) | |
| download | uhd-58d19c5adf7bde9298ad4363c275f72e4bbecd73.tar.gz uhd-58d19c5adf7bde9298ad4363c275f72e4bbecd73.tar.bz2 uhd-58d19c5adf7bde9298ad4363c275f72e4bbecd73.zip | |
usrp2: remove non-relevant buffer pool things from memory map
| -rw-r--r-- | firmware/microblaze/usrp2/memory_map.h | 6 | ||||
| -rw-r--r-- | firmware/microblaze/usrp2p/memory_map.h | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/firmware/microblaze/usrp2/memory_map.h b/firmware/microblaze/usrp2/memory_map.h index 8e2360c93..2b07ff148 100644 --- a/firmware/microblaze/usrp2/memory_map.h +++ b/firmware/microblaze/usrp2/memory_map.h @@ -53,9 +53,7 @@ #define BUFFER_POOL_RAM_BASE 0x8000 -#define NBUFFERS 8 #define BP_NLINES 0x0200 // number of 32-bit lines in a buffer -#define BP_LAST_LINE (BP_NLINES - 1) // last line in a buffer #define buffer_pool_ram \ ((uint32_t *) BUFFER_POOL_RAM_BASE) @@ -173,8 +171,8 @@ typedef struct { #define BUFFER_POOL_STATUS_BASE 0xCC00 typedef struct { - volatile uint32_t last_line[NBUFFERS]; // last line xfer'd in buffer - volatile uint32_t status; // error and done flags + volatile uint32_t _padding[8]; + volatile uint32_t status; volatile uint32_t hw_config; // see below volatile uint32_t dummy[3]; volatile uint32_t irqs; diff --git a/firmware/microblaze/usrp2p/memory_map.h b/firmware/microblaze/usrp2p/memory_map.h index ca2933f6c..431dc19e7 100644 --- a/firmware/microblaze/usrp2p/memory_map.h +++ b/firmware/microblaze/usrp2p/memory_map.h @@ -78,9 +78,7 @@ wb_1master #(.decode_w(8), #define BUFFER_POOL_RAM_BASE 0x4000 -#define NBUFFERS 8 #define BP_NLINES 0x0200 // number of 32-bit lines in a buffer -#define BP_LAST_LINE (BP_NLINES - 1) // last line in a buffer #define buffer_pool_ram \ ((uint32_t *) BUFFER_POOL_RAM_BASE) @@ -198,8 +196,8 @@ typedef struct { #define BUFFER_POOL_STATUS_BASE 0x3300 typedef struct { - volatile uint32_t last_line[NBUFFERS]; // last line xfer'd in buffer - volatile uint32_t status; // error and done flags + volatile uint32_t _padding[8]; + volatile uint32_t status; volatile uint32_t hw_config; // see below volatile uint32_t dummy[3]; volatile uint32_t irqs; |