diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-08-18 14:49:52 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-18 14:49:52 -0700 |
| commit | 769b565dbdc3fa1bb0891d4dcdbb74695f1dc875 (patch) | |
| tree | 32ec8c11dd8894a2a6c45f002aab204521bd7948 /firmware/microblaze/usrp2p/spi_flash_read.c | |
| parent | 2da87fa5082c507d324dce743d63667a6d21fd80 (diff) | |
| parent | 42547a0be8e52758d340fd1eba51a2dd5274a652 (diff) | |
| download | uhd-769b565dbdc3fa1bb0891d4dcdbb74695f1dc875.tar.gz uhd-769b565dbdc3fa1bb0891d4dcdbb74695f1dc875.tar.bz2 uhd-769b565dbdc3fa1bb0891d4dcdbb74695f1dc875.zip | |
Merge branch 'usrp2p_udpfw' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Diffstat (limited to 'firmware/microblaze/usrp2p/spi_flash_read.c')
| -rw-r--r-- | firmware/microblaze/usrp2p/spi_flash_read.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/firmware/microblaze/usrp2p/spi_flash_read.c b/firmware/microblaze/usrp2p/spi_flash_read.c index 1c65350f7..4682c5fe6 100644 --- a/firmware/microblaze/usrp2p/spi_flash_read.c +++ b/firmware/microblaze/usrp2p/spi_flash_read.c @@ -20,6 +20,8 @@ #include "spi_flash_private.h" #include <stdlib.h> // abort +static size_t _spi_flash_log2_memory_size; + uint32_t spi_flash_rdid(void) { @@ -48,9 +50,26 @@ spi_flash_log2_sector_size(void) }; _spi_flash_log2_sector_size = log2_sector_size[size - 22]; + _spi_flash_log2_memory_size = size; //while we're at it return _spi_flash_log2_sector_size; } +size_t +spi_flash_log2_memory_size(void) +{ + if (_spi_flash_log2_memory_size != 0) + return _spi_flash_log2_memory_size; + + uint32_t id = spi_flash_rdid(); + int type = (id >> 8) & 0xff; + int size = id & 0xff; + if (type != 0x20 || size < 22 || size > 24) + abort(); + + _spi_flash_log2_memory_size = size; + return _spi_flash_log2_memory_size; +} + void spi_flash_read(uint32_t flash_addr, size_t nbytes, void *buf) { |