arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

fix possible problems in EEPROM regarding interrupt handling and SPI flash blocking

Browse Source
This commit is contained in:
Markus Sattler 2015-05-16 23:10:06 +02:00
parent 03da6393d5
commit e50fc0fef8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/EEPROM/EEPROM.cpp
View File

@ -49,7 +49,9 @@ void EEPROMClass::begin(size_t size)
_data = new uint8_t[size]; _data = new uint8_t[size];
_size = size; _size = size;
noInterrupts();
spi_flash_read(CONFIG_ADDR, reinterpret_cast<uint32_t*>(_data), _size); spi_flash_read(CONFIG_ADDR, reinterpret_cast<uint32_t*>(_data), _size);
interrupts();
} }
void EEPROMClass::end() void EEPROMClass::end()
@ -90,19 +92,21 @@ bool EEPROMClass::commit()
if(!_dirty) if(!_dirty)
return true; return true;
ETS_UART_INTR_DISABLE(); noInterrupts();
if(spi_flash_erase_sector(CONFIG_SECTOR) == SPI_FLASH_RESULT_OK) { if(spi_flash_erase_sector(CONFIG_SECTOR) == SPI_FLASH_RESULT_OK) {
if(spi_flash_write(CONFIG_ADDR, reinterpret_cast<uint32_t*>(_data), _size) == SPI_FLASH_RESULT_OK) { if(spi_flash_write(CONFIG_ADDR, reinterpret_cast<uint32_t*>(_data), _size) == SPI_FLASH_RESULT_OK) {
_dirty = false; _dirty = false;
ret = true; ret = true;
} }
} }
ETS_UART_INTR_ENABLE(); interrupts();
return ret; return ret;
} }
uint8_t * EEPROMClass::getDataPtr() uint8_t * EEPROMClass::getDataPtr()
{ {
_dirty = true;
return &_data[0]; return &_data[0];
} }