arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-25 20:02:37 +03:00
Code

SdFat -> FS HAL mode fixes & test (#8833)

Browse Source 
* re-use SdFat access mode through static const, no need to hard-code our own value w/ cast in the macro
* separate read-modes from flags; read, write and rw are distinct numbers
* simple compile-time tests in .cpp

resolve #8831
This commit is contained in:
Max Prokhorov 2023-01-31 22:28:37 +03:00 committed by GitHub
parent d7da591ed8
commit 6dfebec8c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/SD/src/SD.cpp
View File

@ -1,5 +1,14 @@
#include "SD.h" #include "SD.h"
static_assert(__builtin_strcmp(SDClassFileMode(FILE_READ), "r") == 0, "");
static_assert(__builtin_strcmp(SDClassFileMode(FILE_WRITE), "a+") == 0, "");
static_assert(__builtin_strcmp(SDClassFileMode(O_RDONLY), "r") == 0, "");
static_assert(__builtin_strcmp(SDClassFileMode(O_WRONLY), "w+") == 0, "");
static_assert(__builtin_strcmp(SDClassFileMode(O_RDWR), "w+") == 0, "");
static_assert(__builtin_strcmp(SDClassFileMode(O_WRONLY | O_APPEND), "a") == 0, "");
static_assert(__builtin_strcmp(SDClassFileMode(O_RDWR | O_APPEND), "a+") == 0, "");
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SD) #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SD)
SDClass SD; SDClass SD;
#endif #endif

55
libraries/SD/src/SD.h
View File

@ -24,11 +24,44 @@
#include <FS.h> #include <FS.h>
#include <SDFS.h> #include <SDFS.h>
#undef FILE_READ // Avoid type ambiguity, force u8 instead of untyped literal
#define FILE_READ ((uint8_t)O_READ) // ref. #6106 as to why we add APPEND to WRITE
#undef FILE_WRITE
#define FILE_WRITE ((uint8_t)(O_READ | O_WRITE | O_CREAT | O_APPEND))
inline constexpr uint8_t SDClassFileRead { FILE_READ };
#undef FILE_READ
#define FILE_READ SDClassFileRead
inline constexpr uint8_t SDClassFileWrite { FILE_WRITE | O_APPEND };
#undef FILE_WRITE
#define FILE_WRITE SDClassFileWrite
static inline constexpr const char* SDClassFileMode(uint8_t mode) {
bool read = false;
bool write = false;
switch (mode & O_ACCMODE) {
case O_RDONLY:
read = true;
break;
case O_WRONLY:
write = true;
break;
case O_RDWR:
read = true;
write = true;
break;
}
const bool append = (mode & O_APPEND) > 0;
if ( read && !write ) { return "r"; }
else if ( !read && write && !append ) { return "w+"; }
else if ( !read && write && append ) { return "a"; }
else if ( read && write && !append ) { return "w+"; } // may be a bug in FS::mode interpretation, "r+" seems proper
else if ( read && write && append ) { return "a+"; }
return "r";
}
class SDClass { class SDClass {
public: public:
@ -45,7 +78,7 @@ public:
} }
fs::File open(const char *filename, uint8_t mode = FILE_READ) { fs::File open(const char *filename, uint8_t mode = FILE_READ) {
return SDFS.open(filename, getMode(mode)); return SDFS.open(filename, SDClassFileMode(mode));
} }
fs::File open(const char *filename, const char *mode) { fs::File open(const char *filename, const char *mode) {
@ -158,18 +191,6 @@ public:
} }
private: private:
const char *getMode(uint8_t mode) {
bool read = (mode & O_READ) ? true : false;
bool write = (mode & O_WRITE) ? true : false;
bool append = (mode & O_APPEND) ? true : false;
if ( read & !write ) { return "r"; }
else if ( !read & write & !append ) { return "w+"; }
else if ( !read & write & append ) { return "a"; }
else if ( read & write & !append ) { return "w+"; } // may be a bug in FS::mode interpretation, "r+" seems proper
else if ( read & write & append ) { return "a+"; }
else { return "r"; }
}
static time_t wrapperTimeCB(void) { static time_t wrapperTimeCB(void) {
extern void (*__SD__userDateTimeCB)(uint16_t*, uint16_t*); extern void (*__SD__userDateTimeCB)(uint16_t*, uint16_t*);
if (__SD__userDateTimeCB) { if (__SD__userDateTimeCB) {