From 469427c7466d0ba6b357dd73e639cc3b12b73b2a Mon Sep 17 00:00:00 2001 From: ficeto Date: Mon, 18 May 2015 21:45:00 +0300 Subject: [PATCH] fix buffer and block size --- hardware/esp8266com/esp8266/cores/esp8266/Esp.cpp | 6 ++++++ hardware/esp8266com/esp8266/cores/esp8266/FileSystem.cpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hardware/esp8266com/esp8266/cores/esp8266/Esp.cpp b/hardware/esp8266com/esp8266/cores/esp8266/Esp.cpp index af6d99468..cb5533690 100644 --- a/hardware/esp8266com/esp8266/cores/esp8266/Esp.cpp +++ b/hardware/esp8266com/esp8266/cores/esp8266/Esp.cpp @@ -175,6 +175,12 @@ uint32_t EspClass::getFlashChipSize(void) return (2_MB); case 0x4: // 32 MBit (4MB) return (4_MB); + case 0x5: // 64 MBit (8MB) + return (8_MB); + case 0x6: // 128 MBit (16MB) + return (16_MB); + case 0x7: // 256 MBit (32MB) + return (32_MB); default: // fail? return 0; } diff --git a/hardware/esp8266com/esp8266/cores/esp8266/FileSystem.cpp b/hardware/esp8266com/esp8266/cores/esp8266/FileSystem.cpp index 0399e4fce..34c4b43fa 100644 --- a/hardware/esp8266com/esp8266/cores/esp8266/FileSystem.cpp +++ b/hardware/esp8266com/esp8266/cores/esp8266/FileSystem.cpp @@ -23,7 +23,7 @@ #include "spiffs/spiffs_esp8266.h" #define LOGICAL_PAGE_SIZE 256 -#define LOGICAL_BLOCK_SIZE 512 +#define LOGICAL_BLOCK_SIZE (INTERNAL_FLASH_SECTOR_SIZE * 1) // These addresses are defined in the linker script. @@ -64,7 +64,7 @@ int FSClass::_mountInternal(){ SPIFFS_API_DBG_V("FSClass::_mountInternal: start:%x, size:%d Kb\n", cfg.phys_addr, cfg.phys_size / 1024); - _work.reset(new uint8_t[LOGICAL_BLOCK_SIZE]); + _work.reset(new uint8_t[2*LOGICAL_PAGE_SIZE]); _fdsSize = 32 * _maxOpenFiles; _fds.reset(new uint8_t[_fdsSize]); _cacheSize = (32 + LOGICAL_PAGE_SIZE) * _maxOpenFiles;