Skip to content

Update EEPROM.cpp #6599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 6, 2019
Merged

Update EEPROM.cpp #6599

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c3d8558
Update EEPROM.cpp
devyte Oct 4, 2019
9276450
Update EEPROM.cpp
devyte Oct 4, 2019
c44ab93
Update EEPROM.cpp
devyte Oct 5, 2019
f0fc7c4
Update EEPROM.cpp
devyte Oct 5, 2019
204f3bc
Update EEPROM.cpp
devyte Oct 6, 2019
2c159b8
Merge branch 'master' into devyte-interruptLock
devyte Oct 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions libraries/EEPROM/EEPROM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "Arduino.h"
#include "EEPROM.h"
#include "debug.h"
#include "interrupts.h"

extern "C" {
#include "c_types.h"
Expand Down Expand Up @@ -71,9 +72,12 @@ void EEPROMClass::begin(size_t size) {

_size = size;

noInterrupts();
auto ret = spi_flash_read(_sector * SPI_FLASH_SEC_SIZE, reinterpret_cast<uint32_t*>(_data), _size);
interrupts();
SpiFlashOpResult ret;
{
esp8266::InterruptLock lockAllInterruptsInThisScope;
ret = spi_flash_read(_sector * SPI_FLASH_SEC_SIZE, reinterpret_cast<uint32_t*>(_data), _size);
}

if (ret != SPI_FLASH_RESULT_OK) {
DEBUGV("EEPROMClass::begin spi_flash_read failed, %d\n", (int)ret);
}
Expand Down Expand Up @@ -136,16 +140,19 @@ bool EEPROMClass::commit() {
if(!_data)
return false;

noInterrupts();
auto flashret = spi_flash_erase_sector(_sector);
if (flashret == SPI_FLASH_RESULT_OK) {
flashret = spi_flash_write(_sector * SPI_FLASH_SEC_SIZE, reinterpret_cast<uint32_t*>(_data), _size);
SpiFlashOpResult flashret;
{
esp8266::InterruptLock lockAllInterruptsInThisScope;
flashret = spi_flash_erase_sector(_sector);
if (flashret == SPI_FLASH_RESULT_OK) {
_dirty = false;
ret = true;
flashret = spi_flash_write(_sector * SPI_FLASH_SEC_SIZE, reinterpret_cast<uint32_t*>(_data), _size);
if (flashret == SPI_FLASH_RESULT_OK) {
_dirty = false;
ret = true;
}
}
}
interrupts();


if (flashret != SPI_FLASH_RESULT_OK) {
DEBUGV("EEPROMClass::commit failed, %d\n", (int)flashret);
Expand Down