mirror of
https://github.com/esp8266/Arduino.git
synced 2025-04-21 10:26:06 +03:00
79ea883fb3
* Do not write more data than requested on PUYA flashes * Always align flash reads/writes to 4 bytes * fixup! Always align flash reads/writes to 4 bytes This commit simplifies the code a bit and fixes a bug that caused wrong number of bytes to be written * fixup! Always align flash reads/writes to 4 bytes * fixup! Always align flash reads/writes to 4 bytes * Check for result before additional read/write * Add overloads for unaligned reads/writes * fixup! Add overloads for unaligned reads/writes * fixup! Add overloads for unaligned reads/writes * fixup! Add overloads for unaligned reads/writes * fixup! Add overloads for unaligned reads/writes * fixup! Add overloads for unaligned reads/writes * fixup! Add overloads for unaligned reads/writes * fixup! Add overloads for unaligned reads/writes * Add tests for flashRead/flashWrite * fixup! Add overloads for unaligned reads/writes * fixup! Add tests for flashRead/flashWrite * fixup! Add tests for flashRead/flashWrite * fixup! Add overloads for unaligned reads/writes
71 lines
2.3 KiB
C++
71 lines
2.3 KiB
C++
/*
|
|
spiffs_hal.cpp - SPI read/write/erase functions for SPIFFS.
|
|
Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
|
|
This file is part of the esp8266 core for Arduino environment.
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this library; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <Arduino.h>
|
|
#include <stdlib.h>
|
|
#include <algorithm>
|
|
#include "debug.h"
|
|
#include "flash_hal.h"
|
|
|
|
extern "C" {
|
|
#include "c_types.h"
|
|
#include "spi_flash.h"
|
|
}
|
|
|
|
int32_t flash_hal_read(uint32_t addr, uint32_t size, uint8_t *dst) {
|
|
optimistic_yield(10000);
|
|
|
|
// We use flashRead overload that handles proper alignment
|
|
if (ESP.flashRead(addr, dst, size)) {
|
|
return FLASH_HAL_OK;
|
|
} else {
|
|
return FLASH_HAL_READ_ERROR;
|
|
}
|
|
}
|
|
|
|
int32_t flash_hal_write(uint32_t addr, uint32_t size, const uint8_t *src) {
|
|
optimistic_yield(10000);
|
|
|
|
// We use flashWrite overload that handles proper alignment
|
|
if (ESP.flashWrite(addr, src, size)) {
|
|
return FLASH_HAL_OK;
|
|
} else {
|
|
return FLASH_HAL_WRITE_ERROR;
|
|
}
|
|
}
|
|
|
|
int32_t flash_hal_erase(uint32_t addr, uint32_t size) {
|
|
if ((size & (SPI_FLASH_SEC_SIZE - 1)) != 0 ||
|
|
(addr & (SPI_FLASH_SEC_SIZE - 1)) != 0) {
|
|
DEBUGV("_spif_erase called with addr=%x, size=%d\r\n", addr, size);
|
|
abort();
|
|
}
|
|
const uint32_t sector = addr / SPI_FLASH_SEC_SIZE;
|
|
const uint32_t sectorCount = size / SPI_FLASH_SEC_SIZE;
|
|
for (uint32_t i = 0; i < sectorCount; ++i) {
|
|
optimistic_yield(10000);
|
|
if (!ESP.flashEraseSector(sector + i)) {
|
|
DEBUGV("_spif_erase addr=%x size=%d i=%d\r\n", addr, size, i);
|
|
return FLASH_HAL_ERASE_ERROR;
|
|
}
|
|
}
|
|
return FLASH_HAL_OK;
|
|
}
|