mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-13 16:55:08 +00:00
e1aaafb77a
* add more locking for shared SPI devices (#5595) * add more locking for shared SPI devices * call initSPI before the lock is used * remove old one * don't double lock * Add missing unlock * More missing unlocks * Add locks to SafeFile, remove from `readcb`, introduce some LockGuards * fix lock in setupSDCard() * pull radiolib trunk with SPI-CS fixes * change ContentHandler to Constructor type locks, where applicable --------- Co-authored-by: mverch67 <manuel.verch@gmx.de> Co-authored-by: GUVWAF <thijs@havinga.eu> Co-authored-by: Manuel <71137295+mverch67@users.noreply.github.com> * mesh-tab: lower I2C touch frequency --------- Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com> Co-authored-by: mverch67 <manuel.verch@gmx.de> Co-authored-by: GUVWAF <thijs@havinga.eu> Co-authored-by: Manuel <71137295+mverch67@users.noreply.github.com>
112 lines
2.6 KiB
C++
112 lines
2.6 KiB
C++
#include "SafeFile.h"
|
|
|
|
#ifdef FSCom
|
|
|
|
// Only way to work on both esp32 and nrf52
|
|
static File openFile(const char *filename, bool fullAtomic)
|
|
{
|
|
concurrency::LockGuard g(spiLock);
|
|
if (!fullAtomic)
|
|
FSCom.remove(filename); // Nuke the old file to make space (ignore if it !exists)
|
|
|
|
String filenameTmp = filename;
|
|
filenameTmp += ".tmp";
|
|
|
|
// clear any previous LFS errors
|
|
lfs_assert_failed = false;
|
|
|
|
return FSCom.open(filenameTmp.c_str(), FILE_O_WRITE);
|
|
}
|
|
|
|
SafeFile::SafeFile(const char *_filename, bool fullAtomic)
|
|
: filename(_filename), f(openFile(_filename, fullAtomic)), fullAtomic(fullAtomic)
|
|
{
|
|
}
|
|
|
|
size_t SafeFile::write(uint8_t ch)
|
|
{
|
|
if (!f)
|
|
return 0;
|
|
|
|
hash ^= ch;
|
|
return f.write(ch);
|
|
}
|
|
|
|
size_t SafeFile::write(const uint8_t *buffer, size_t size)
|
|
{
|
|
if (!f)
|
|
return 0;
|
|
|
|
for (size_t i = 0; i < size; i++) {
|
|
hash ^= buffer[i];
|
|
}
|
|
return f.write((uint8_t const *)buffer, size); // This nasty cast is _IMPORTANT_ otherwise the correct adafruit method does
|
|
// not get used (they made a mistake in their typing)
|
|
}
|
|
|
|
/**
|
|
* Atomically close the file (deleting any old versions) and readback the contents to confirm the hash matches
|
|
*
|
|
* @return false for failure
|
|
*/
|
|
bool SafeFile::close()
|
|
{
|
|
if (!f)
|
|
return false;
|
|
|
|
spiLock->lock();
|
|
f.close();
|
|
spiLock->unlock();
|
|
if (!testReadback())
|
|
return false;
|
|
|
|
{ // Scope for lock
|
|
concurrency::LockGuard g(spiLock);
|
|
// brief window of risk here ;-)
|
|
if (fullAtomic && FSCom.exists(filename.c_str()) && !FSCom.remove(filename.c_str())) {
|
|
LOG_ERROR("Can't remove old pref file");
|
|
return false;
|
|
}
|
|
}
|
|
|
|
String filenameTmp = filename;
|
|
filenameTmp += ".tmp";
|
|
if (!renameFile(filenameTmp.c_str(), filename.c_str())) {
|
|
LOG_ERROR("Error: can't rename new pref file");
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/// Read our (closed) tempfile back in and compare the hash
|
|
bool SafeFile::testReadback()
|
|
{
|
|
concurrency::LockGuard g(spiLock);
|
|
bool lfs_failed = lfs_assert_failed;
|
|
lfs_assert_failed = false;
|
|
|
|
String filenameTmp = filename;
|
|
filenameTmp += ".tmp";
|
|
auto f2 = FSCom.open(filenameTmp.c_str(), FILE_O_READ);
|
|
if (!f2) {
|
|
LOG_ERROR("Can't open tmp file for readback");
|
|
return false;
|
|
}
|
|
|
|
int c = 0;
|
|
uint8_t test_hash = 0;
|
|
while ((c = f2.read()) >= 0) {
|
|
test_hash ^= (uint8_t)c;
|
|
}
|
|
f2.close();
|
|
|
|
if (test_hash != hash) {
|
|
LOG_ERROR("Readback failed hash mismatch");
|
|
return false;
|
|
}
|
|
|
|
return !lfs_failed;
|
|
}
|
|
|
|
#endif |