Skip to content

Commit 028e3d8

Browse files
author
ficeto
committed
fix FS variables
1 parent 06f9871 commit 028e3d8

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

hardware/esp8266com/esp8266/cores/esp8266/FileSystem.cpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@ static s32_t api_spiffs_read(u32_t addr, u32_t size, u8_t *dst);
3434
static s32_t api_spiffs_write(u32_t addr, u32_t size, u8_t *src);
3535
static s32_t api_spiffs_erase(u32_t addr, u32_t size);
3636

37-
FSClass FS((uint32_t) &_SPIFFS_start, (uint32_t) &_SPIFFS_end, 4);
37+
FSClass FS((uint32_t) &_SPIFFS_start, (uint32_t) &_SPIFFS_end, (uint32_t) &_SPIFFS_page, (uint32_t) &_SPIFFS_block, 4);
3838

39-
FSClass::FSClass(uint32_t beginAddress, uint32_t endAddress, uint32_t maxOpenFiles)
39+
FSClass::FSClass(uint32_t beginAddress, uint32_t endAddress, uint32_t pageSize, uint32_t blockSize, uint32_t maxOpenFiles)
4040
: _beginAddress(beginAddress)
4141
, _endAddress(endAddress)
42+
, _pageSize(pageSize)
43+
, _blockSize(blockSize)
4244
, _maxOpenFiles(maxOpenFiles)
4345
, _fs({0})
4446
{
@@ -56,8 +58,8 @@ int FSClass::_mountInternal(){
5658
cfg.phys_addr = _beginAddress;
5759
cfg.phys_size = _endAddress - _beginAddress;
5860
cfg.phys_erase_block = INTERNAL_FLASH_SECTOR_SIZE;
59-
cfg.log_block_size = _SPIFFS_block;
60-
cfg.log_page_size = _SPIFFS_page;
61+
cfg.log_block_size = _blockSize;
62+
cfg.log_page_size = _pageSize;
6163
cfg.hal_read_f = api_spiffs_read;
6264
cfg.hal_write_f = api_spiffs_write;
6365
cfg.hal_erase_f = api_spiffs_erase;

hardware/esp8266com/esp8266/cores/esp8266/FileSystem.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class FSFile : public Stream {
8585

8686
class FSClass {
8787
public:
88-
FSClass(uint32_t beginAddress, uint32_t endAddress, uint32_t maxOpenFiles);
88+
FSClass(uint32_t beginAddress, uint32_t endAddress, uint32_t pageSize, uint32_t blockSize, uint32_t maxOpenFiles);
8989

9090
bool mount();
9191
void unmount();
@@ -117,6 +117,8 @@ class FSClass {
117117
size_t _cacheSize;
118118
uint32_t _beginAddress;
119119
uint32_t _endAddress;
120+
uint32_t _pageSize;
121+
uint32_t _blockSize;
120122
uint32_t _maxOpenFiles;
121123
spiffs _fs;
122124

0 commit comments

Comments
 (0)