1 files changed, 24 insertions, 22 deletions

diff --git a/firmware/zpu/usrp2p/spi_flash_read.c b/firmware/zpu/usrp2p/spi_flash_read.c
index 75721b0f7..c65b8c1a1 100644
--- a/firmware/zpu/usrp2p/spi_flash_read.c
+++ b/firmware/zpu/usrp2p/spi_flash_read.c
@@ -21,42 +21,44 @@
 #include <stdlib.h>		// abort
 #include <nonstdio.h>
 
-//FIXME cannot be zero or it gets optimized out and the get size functions break...
-#define UNINITIALIZED 0xdeadbeef
-
 uint32_t 
 spi_flash_rdid(void)
 {
   return spif_transact(SPI_TXRX, SPI_SS_FLASH, RDID_CMD << 24, 32, FLAGS) & 0xffffff;
 }
 
-size_t 
-spi_flash_log2_sector_size(void)
-{
-  static unsigned char log2_sector_size[3] = {
-    16, /* M25P32  */
-    16, /* M25P64  */
-    18, /* M25P128 */
-  };
-  return log2_sector_size[spi_flash_log2_memory_size() - 22];
-}
+static size_t _spi_flash_log2_memory_size, _spi_flash_log2_sector_size;
 
-size_t
-spi_flash_log2_memory_size(void)
+void spi_flash_init(void)
 {
-  static size_t _spi_flash_log2_memory_size = UNINITIALIZED;
-
-  if (_spi_flash_log2_memory_size == UNINITIALIZED){
     uint32_t id = spi_flash_rdid();
     uint8_t type = (id >> 8) & 0xff;
     uint8_t size = (id >> 0) & 0xff;
     if (type != 0x20 || size < 22 || size > 24)
-      abort();
-
+        abort();
     _spi_flash_log2_memory_size = size;
-  }
 
-  return _spi_flash_log2_memory_size;
+    static unsigned char log2_sector_size[3] = {
+        16, /* M25P32  */
+        16, /* M25P64  */
+        18, /* M25P128 */
+    };
+    _spi_flash_log2_sector_size = log2_sector_size[_spi_flash_log2_memory_size - 22];
+}
+
+size_t spi_flash_log2_sector_size(void)
+{
+  return _spi_flash_log2_sector_size;
+}
+
+size_t spi_flash_sector_size(void)
+{
+  return ((size_t) 1) << _spi_flash_log2_sector_size;
+}
+
+size_t spi_flash_memory_size(void)
+{
+  return ((size_t) 1) << _spi_flash_log2_memory_size;
 }
 
 void