mirror of
https://github.com/esp8266/Arduino.git
synced 2025-04-21 10:26:06 +03:00
* Add LittleFS as internal flash filesystem Adds a LittleFS object which uses the ARMmbed littlefs embedded filesystem, https://github.com/ARMmbed/littlefs, to enable a new filesystem for onboard flash utilizing the exact same API as the existing SPIFFS filesystem. LittleFS is built for low memory systems that are subject to random power losses, is actively supported by the ARMmbed community, supports directories, and seems to be much faster in the large-ish read-mostly applications I use. LittleFS, however, has a larger minimum file allocation unit and does not do static wear levelling. This means that for systems that need many little files (<4K), have small SPIFFS areas (64K), or which have a large static set of files covering the majority of flash coupled with a frequently updated set of other files, it may not perform as well. Simply replace SPIFFS.begin() with LittleFS.begin() in your sketch, use LittleFS.open in place of SPIFFS.open to open files, and everything else just works thanks to the magic of @igrr's File base class. **LITTLEFS FLASH LAYOUT IS INCOMPATIBLE WITH SPIFFS** Since it is a completely different filesystem, you will need to reformat your flash (and lose any data therein) to use it. Tools to build the flash filesystem and upload are at https://github.com/earlephilhower/arduino-esp8266littlefs-plugin and https://github.com/earlephilhower/mklittlefs/ . The mklittlefs tool is installed as part of the Arduino platform installation, automatically. The included example shows a contrived read-mostly example and demonstrates how the same calls work on either SPIFFS.* or LittleFS.* Host tests are also included as part of CI. Directories are fully supported in LittleFS. This means that LittleFS will have a slight difference vs. SPIFFS when you use LittleFS.openDir()/Dir.next(). On SPIFFS dir.next() will return all filesystem entries, including ones in "subdirs" (because in SPIFFS there are no subdirs and "/" is the same as any other character in a filename). On LittleFS, dir.next() will only return entries in the directory specified, not subdirs. So to list files in "/subdir/..." you need to actually openDir("/subdir") and use Dir.next() to parse through just those elements. The returned filenames also only have the filename returned, not full paths. So on a FS with "/a/1", "/a/2" when you do openDir("/a"); dir.next().getName(); you get "1" and "2" and not "/a/1" and "/a/2" like in SPIFFS. This is consistent with POSIX ideas about reading directories and more natural for a FS. Most code will not be affected by this, but if you depend on openDir/Dir.next() you need to be aware of it. Corresponding ::mkdir, ::rmdir, ::isDirectory, ::isFile, ::openNextFile, and ::rewind methods added to Filesystem objects. Documentation has been updated with this and other LittleFS information. Subdirectories are made silently when they do not exist when you try and create a file in a subdir. They are silently removed when the last file in them is deleted. This is consistent with what SPIFFS does but is obviously not normal POSIX behavior. Since there has never been a "FS.mkdir()" method this is the only way to be compatible with legacy SPIFFS code. SPIFFS code has been refactored to pull out common flash_hal_* ops and placed in its own namespace, like LittleFS. * Fix up merge blank line issue * Merge in the FSConfig changs from SDFS PR Enable setConfig for LittleFS as well plys merge the SPIFFS changes done in the SDFS PR. * Fix merge errors * Update to use v2-alpha branch The V2-alpha branch supports small file optimizations which can help increase the utilization of flash when small files are prevalent. It also adds support for metadata, which means we can start adding things like file creation times, if desired (not yet). * V2 of littlefs is now in upstream/master * Update test to support non-creation-ordered files In a directory, the order in which "readNextFile()" will return a name is undefined. SPIFFS may return it in order, but LittleFS does not as of V2. Update the test to look for files by name when doing readNextFile() testing. * Fix LittleFS.truncate implementation * Fix SDFS tests SDFS, SPIFFS, and LittleFS now all share the same common set of tests, greatly increasing the SDFS test coverage. * Update to point to mklittlefs v2 Upgrade mklittlefs to V2 format support * Remove extra FS::write(const char *s) method This was removed in #5861 and erroneously re-introduced here. * Minimize spurious differences from master * Dramatically reduce memory usage Reduce the program and read chunk sizes which impacts performance minimally but reduces per-file RAM usage of 16KB to <1KB. * Add @d-a-v's host emulation for LittleFS * Fix SW Serial library version * Fix free space reporting Thanks to @TD-er for discovering the issue * Update littlefs to latest upstream * Remove sdfat version included by accident * Update SDFAT to include MOCK changes required * Update to include SD.h test of file append
185 lines
6.6 KiB
C++
185 lines
6.6 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"
|
|
}
|
|
/*
|
|
spi_flash_read function requires flash address to be aligned on word boundary.
|
|
We take care of this by reading first and last words separately and memcpy
|
|
relevant bytes into result buffer.
|
|
|
|
alignment: 012301230123012301230123
|
|
bytes requested: -------***********------
|
|
read directly: --------xxxxxxxx--------
|
|
read pre: ----aaaa----------------
|
|
read post: ----------------bbbb----
|
|
alignedBegin: ^
|
|
alignedEnd: ^
|
|
*/
|
|
|
|
int32_t flash_hal_read(uint32_t addr, uint32_t size, uint8_t *dst) {
|
|
optimistic_yield(10000);
|
|
|
|
uint32_t result = FLASH_HAL_OK;
|
|
uint32_t alignedBegin = (addr + 3) & (~3);
|
|
uint32_t alignedEnd = (addr + size) & (~3);
|
|
if (alignedEnd < alignedBegin) {
|
|
alignedEnd = alignedBegin;
|
|
}
|
|
|
|
if (addr < alignedBegin) {
|
|
uint32_t nb = alignedBegin - addr;
|
|
uint32_t tmp;
|
|
if (!ESP.flashRead(alignedBegin - 4, &tmp, 4)) {
|
|
DEBUGV("_spif_read(%d) addr=%x size=%x ab=%x ae=%x\r\n",
|
|
__LINE__, addr, size, alignedBegin, alignedEnd);
|
|
return FLASH_HAL_READ_ERROR;
|
|
}
|
|
memcpy(dst, ((uint8_t*) &tmp) + 4 - nb, nb);
|
|
}
|
|
|
|
if (alignedEnd != alignedBegin) {
|
|
if (!ESP.flashRead(alignedBegin, (uint32_t*) (dst + alignedBegin - addr),
|
|
alignedEnd - alignedBegin)) {
|
|
DEBUGV("_spif_read(%d) addr=%x size=%x ab=%x ae=%x\r\n",
|
|
__LINE__, addr, size, alignedBegin, alignedEnd);
|
|
return FLASH_HAL_READ_ERROR;
|
|
}
|
|
}
|
|
|
|
if (addr + size > alignedEnd) {
|
|
uint32_t nb = addr + size - alignedEnd;
|
|
uint32_t tmp;
|
|
if (!ESP.flashRead(alignedEnd, &tmp, 4)) {
|
|
DEBUGV("_spif_read(%d) addr=%x size=%x ab=%x ae=%x\r\n",
|
|
__LINE__, addr, size, alignedBegin, alignedEnd);
|
|
return FLASH_HAL_READ_ERROR;
|
|
}
|
|
|
|
memcpy(dst + size - nb, &tmp, nb);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/*
|
|
Like spi_flash_read, spi_flash_write has a requirement for flash address to be
|
|
aligned. However it also requires RAM address to be aligned as it reads data
|
|
in 32-bit words. Flash address (mis-)alignment is handled much the same way
|
|
as for reads, but for RAM alignment we have to copy data into a temporary
|
|
buffer. The size of this buffer is a tradeoff between number of writes required
|
|
and amount of stack required. This is chosen to be 512 bytes here, but might
|
|
be adjusted in the future if there are good reasons to do so.
|
|
*/
|
|
|
|
static const int UNALIGNED_WRITE_BUFFER_SIZE = 512;
|
|
|
|
int32_t flash_hal_write(uint32_t addr, uint32_t size, const uint8_t *src) {
|
|
optimistic_yield(10000);
|
|
|
|
uint32_t alignedBegin = (addr + 3) & (~3);
|
|
uint32_t alignedEnd = (addr + size) & (~3);
|
|
if (alignedEnd < alignedBegin) {
|
|
alignedEnd = alignedBegin;
|
|
}
|
|
|
|
if (addr < alignedBegin) {
|
|
uint32_t ofs = alignedBegin - addr;
|
|
uint32_t nb = (size < ofs) ? size : ofs;
|
|
uint8_t tmp[4] __attribute__((aligned(4))) = {0xff, 0xff, 0xff, 0xff};
|
|
memcpy(tmp + 4 - ofs, src, nb);
|
|
if (!ESP.flashWrite(alignedBegin - 4, (uint32_t*) tmp, 4)) {
|
|
DEBUGV("_spif_write(%d) addr=%x size=%x ab=%x ae=%x\r\n",
|
|
__LINE__, addr, size, alignedBegin, alignedEnd);
|
|
return FLASH_HAL_WRITE_ERROR;
|
|
}
|
|
}
|
|
|
|
if (alignedEnd != alignedBegin) {
|
|
uint32_t* srcLeftover = (uint32_t*) (src + alignedBegin - addr);
|
|
uint32_t srcAlign = ((uint32_t) srcLeftover) & 3;
|
|
if (!srcAlign) {
|
|
if (!ESP.flashWrite(alignedBegin, (uint32_t*) srcLeftover,
|
|
alignedEnd - alignedBegin)) {
|
|
DEBUGV("_spif_write(%d) addr=%x size=%x ab=%x ae=%x\r\n",
|
|
__LINE__, addr, size, alignedBegin, alignedEnd);
|
|
return FLASH_HAL_WRITE_ERROR;
|
|
}
|
|
}
|
|
else {
|
|
uint8_t buf[UNALIGNED_WRITE_BUFFER_SIZE];
|
|
for (uint32_t sizeLeft = alignedEnd - alignedBegin; sizeLeft; ) {
|
|
size_t willCopy = std::min(sizeLeft, sizeof(buf));
|
|
memcpy(buf, srcLeftover, willCopy);
|
|
|
|
if (!ESP.flashWrite(alignedBegin, (uint32_t*) buf, willCopy)) {
|
|
DEBUGV("_spif_write(%d) addr=%x size=%x ab=%x ae=%x\r\n",
|
|
__LINE__, addr, size, alignedBegin, alignedEnd);
|
|
return FLASH_HAL_WRITE_ERROR;
|
|
}
|
|
|
|
sizeLeft -= willCopy;
|
|
srcLeftover += willCopy;
|
|
alignedBegin += willCopy;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (addr + size > alignedEnd) {
|
|
uint32_t nb = addr + size - alignedEnd;
|
|
uint32_t tmp = 0xffffffff;
|
|
memcpy(&tmp, src + size - nb, nb);
|
|
|
|
if (!ESP.flashWrite(alignedEnd, &tmp, 4)) {
|
|
DEBUGV("_spif_write(%d) addr=%x size=%x ab=%x ae=%x\r\n",
|
|
__LINE__, addr, size, alignedBegin, alignedEnd);
|
|
return FLASH_HAL_WRITE_ERROR;
|
|
}
|
|
}
|
|
|
|
return FLASH_HAL_OK;
|
|
}
|
|
|
|
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;
|
|
}
|