sync spiffs with arduino and fix file write and FS byte alignment

ficeto · ficeto · commit a958f2ec28eb · 2015-05-20T23:16:53.000+03:00
diff --git a/main.cpp b/main.cpp
@@ -39,31 +39,25 @@ static std::vector<uint8_t> s_spiffsFds;
 static std::vector<uint8_t> s_spiffsCache;
 
 
-static s32_t api_spiffs_read(u32_t addr, u32_t size, u8_t *dst)
-{
+static s32_t api_spiffs_read(u32_t addr, u32_t size, u8_t *dst){
     memcpy(dst, &s_flashmem[0] + addr, size);
     return SPIFFS_OK;
 }
 
-static s32_t api_spiffs_write(u32_t addr, u32_t size, u8_t *src)
-{
+static s32_t api_spiffs_write(u32_t addr, u32_t size, u8_t *src){
     memcpy(&s_flashmem[0] + addr, src, size);
     return SPIFFS_OK;
 }
 
-static s32_t api_spiffs_erase(u32_t addr, u32_t size)
-{
+static s32_t api_spiffs_erase(u32_t addr, u32_t size){
     memset(&s_flashmem[0] + addr, 0xff, size);
     return SPIFFS_OK;
 } 
 
-void checkCallback(spiffs_check_type type, spiffs_check_report report,
-                                   u32_t arg1, u32_t arg2)
-{
-}
 
-void spiffsMount(bool init)
-{
+//implementation
+
+int spiffsTryMount(){
     spiffs_config cfg = {0};
     
     cfg.phys_addr = 0x0000;
@@ -82,35 +76,35 @@ void spiffsMount(bool init)
     s_spiffsFds.resize(32 * maxOpenFiles);
     s_spiffsCache.resize((32 + s_pageSize) * maxOpenFiles);
 
-
-    SPIFFS_mount(&s_fs, &cfg, 
+    return SPIFFS_mount(&s_fs, &cfg, 
         &s_spiffsWorkBuf[0], 
         &s_spiffsFds[0], s_spiffsFds.size(),
         &s_spiffsCache[0], s_spiffsCache.size(),
         NULL);
-    
-//    debugf("mount res: %d\n", res);
-    if (init) {
-        spiffs_file fd = SPIFFS_open(&s_fs, (char*) "tmp", SPIFFS_CREAT | SPIFFS_TRUNC | SPIFFS_RDWR, 0);
-        uint8_t tmp = 0xff;
-        SPIFFS_write(&s_fs, fd, &tmp, 1);
-        SPIFFS_fremove(&s_fs, fd);
-        SPIFFS_close(&s_fs, fd);
-    } else {
-        s_fs.check_cb_f = &checkCallback;
-        //SPIFFS_check(&s_fs);
-    }
 }
 
-void spiffsUnmount()
-{
+bool spiffsMount(){
+  if(SPIFFS_mounted(&s_fs)) 
+    return true;
+  int res = spiffsTryMount();
+  return (res == SPIFFS_OK);
+}
+
+bool spiffsFormat(){
+  spiffsMount();
+  SPIFFS_unmount(&s_fs);
+  int formated = SPIFFS_format(&s_fs);
+  if(formated != SPIFFS_OK) 
+    return false;
+  return (spiffsTryMount() == SPIFFS_OK);
+}
+
+void spiffsUnmount(){
+  if(SPIFFS_mounted(&s_fs))
     SPIFFS_unmount(&s_fs);
 }
 
 int addFile(char* name, const char* path) {
-    const size_t write_size = 512;
-    uint8_t write_block[write_size];
-    
     FILE* src = fopen(path, "rb");
     if (!src) {
         std::cerr << "error: failed to open " << path << " for reading" << std::endl;
@@ -124,30 +118,28 @@ int addFile(char* name, const char* path) {
     fseek(src, 0, SEEK_SET);
     
     size_t left = size;
-    while (left > 0)
-    {
-        size_t will_write = std::min(left, write_size);
-        if (will_write != fread(write_block, 1, will_write, src)) {
+    uint8_t data_byte;
+    while (left > 0){
+        if (1 != fread(&data_byte, 1, 1, src)) {
             fclose(src);
             SPIFFS_close(&s_fs, dst);
             return 1;
         }
-        int res = SPIFFS_write(&s_fs, dst, write_block, write_size);
+        int res = SPIFFS_write(&s_fs, dst, &data_byte, 1);
         if (res < 0) {
             fclose(src);
             SPIFFS_close(&s_fs, dst);
             return 1;
         }
-        left -= will_write;
+        left -= 1;
     }
     
     SPIFFS_close(&s_fs, dst);
     fclose(src);
     return 0;
 }
 
-int addFiles(const char* dirname)
-{
+int addFiles(const char* dirname){
     DIR *dir;
     struct dirent *ent;
     bool error = false;
@@ -198,7 +190,7 @@ void listFiles() {
     SPIFFS_closedir(&dir);
 }
 
-
+// Actions
 
 int actionPack() {
     s_flashmem.resize(s_imageSize, 0xff);
@@ -209,7 +201,7 @@ int actionPack() {
         return 1;
     }
     
-    spiffsMount(true);
+    spiffsFormat();
     int result = addFiles(s_dirName.c_str());
     spiffsUnmount();
     
@@ -231,11 +223,9 @@ int actionList() {
     
     fread(&s_flashmem[0], 4, s_flashmem.size()/4, fdsrc);
     fclose(fdsrc);
-    
-    spiffsMount(false);
+    spiffsMount();
     listFiles();
     spiffsUnmount();
-    
     return 0;
 }
 
@@ -251,7 +241,7 @@ int actionVisualize() {
     fread(&s_flashmem[0], 4, s_flashmem.size()/4, fdsrc);
     fclose(fdsrc);
     
-    spiffsMount(false);
+    spiffsMount();
     SPIFFS_vis(&s_fs);
     uint32_t total, used;
     SPIFFS_info(&s_fs, &total, &used);
@@ -262,7 +252,6 @@ int actionVisualize() {
 }
 
 void processArgs(int argc, const char** argv) {
-    
     TCLAP::CmdLine cmd("", ' ', VERSION);
     TCLAP::ValueArg<std::string> packArg( "c", "create", "create spiffs image from a directory", true, "", "pack_dir");
     TCLAP::SwitchArg listArg( "l", "list", "list files in spiffs image", false);
@@ -301,13 +290,11 @@ int main(int argc, const char * argv[]) {
     
     try {
         processArgs(argc, argv);
-    }
-    catch(...) {
+    } catch(...) {
         std::cerr << "Invalid arguments" << std::endl;
         return 1;
     }
     
-    
     switch (s_action) {
         case ACTION_PACK: return actionPack();
         case ACTION_LIST: return actionList();
diff --git a/spiffs/spiffs.h b/spiffs/spiffs.h
@@ -473,6 +473,20 @@ s32_t SPIFFS_format(spiffs *fs);
  */
 u8_t SPIFFS_mounted(spiffs *fs);
 
+/**
+ * Check if EOF reached.
+ * @param fs            the file system struct
+ * @param fh            the filehandle of the file to check
+ */
+s32_t SPIFFS_eof(spiffs *fs, spiffs_file fh);
+
+/**
+ * Get the current position of the data pointer.
+ * @param fs            the file system struct
+ * @param fh            the filehandle of the open file
+ */
+s32_t SPIFFS_tell(spiffs *fs, spiffs_file fh);
+
 #if SPIFFS_TEST_VISUALISATION
 /**
  * Prints out a visualization of the filesystem.
diff --git a/spiffs/spiffs_config.h b/spiffs/spiffs_config.h
@@ -14,14 +14,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#define IRAM_ATTR
-#define STORE_TYPEDEF_ATTR __attribute__((aligned(4),packed))
-#define STORE_ATTR __attribute__((aligned(4)))
-
-#define c_memcpy memcpy
-#define c_printf printf
-#define c_memset memset
-
 typedef int16_t file_t;
 typedef int32_t s32_t;
 typedef uint32_t u32_t;
@@ -47,24 +39,22 @@ typedef uint8_t u8_t;
 #endif
 
 // compile time switches
-#define debugf(fmt, ...) //os_printf(fmt"\r\n", ##__VA_ARGS__)
-#define SYSTEM_ERROR(fmt, ...) //os_printf("ERROR: " fmt "\r\n", ##__VA_ARGS__)
 
 // Set generic spiffs debug output call.
 #ifndef SPIFFS_DGB
-#define SPIFFS_DBG(...) //os_printf(__VA_ARGS__)
+#define SPIFFS_DBG(...) //printf(__VA_ARGS__)
 #endif
 // Set spiffs debug output call for garbage collecting.
 #ifndef SPIFFS_GC_DGB
-#define SPIFFS_GC_DBG(...) //os_printf(__VA_ARGS__)
+#define SPIFFS_GC_DBG(...) //printf(__VA_ARGS__)
 #endif
 // Set spiffs debug output call for caching.
 #ifndef SPIFFS_CACHE_DGB
-#define SPIFFS_CACHE_DBG(...) //os_printf(__VA_ARGS__)
+#define SPIFFS_CACHE_DBG(...) //printf(__VA_ARGS__)
 #endif
 // Set spiffs debug output call for system consistency checks.
 #ifndef SPIFFS_CHECK_DGB
-#define SPIFFS_CHECK_DBG(...) //os_printf(__VA_ARGS__)
+#define SPIFFS_CHECK_DBG(...) //printf(__VA_ARGS__)
 #endif
 
 // Enable/disable API functions to determine exact number of bytes
@@ -99,7 +89,7 @@ typedef uint8_t u8_t;
 
 // Define maximum number of gc runs to perform to reach desired free pages.
 #ifndef SPIFFS_GC_MAX_RUNS
-#define SPIFFS_GC_MAX_RUNS              3
+#define SPIFFS_GC_MAX_RUNS              5
 #endif
 
 // Enable/disable statistics on gc. Debug/test purpose only.
@@ -141,6 +131,14 @@ typedef uint8_t u8_t;
 #define SPIFFS_COPY_BUFFER_STACK        (64)
 #endif
 
+// Enable this to have an identifiable spiffs filesystem. This will look for
+// a magic in all sectors to determine if this is a valid spiffs system or
+// not on mount point. If not, SPIFFS_format must be called prior to mounting
+// again.
+#ifndef SPIFFS_USE_MAGIC
+#define SPIFFS_USE_MAGIC                (0)
+#endif
+
 // SPIFFS_LOCK and SPIFFS_UNLOCK protects spiffs from reentrancy on api level
 // These should be defined on a multithreaded system
 
@@ -181,6 +179,11 @@ typedef uint8_t u8_t;
 #endif
 #endif
 
+// Enable this if your target needs aligned data for index tables
+#ifndef SPIFFS_ALIGNED_OBJECT_INDEX_TABLES
+#define SPIFFS_ALIGNED_OBJECT_INDEX_TABLES       1
+#endif
+
 // Set SPFIFS_TEST_VISUALISATION to non-zero to enable SPIFFS_vis function
 // in the api. This function will visualize all filesystem using given printf
 // function.
@@ -189,7 +192,7 @@ typedef uint8_t u8_t;
 #endif
 #if SPIFFS_TEST_VISUALISATION
 #ifndef spiffs_printf
-#define spiffs_printf(...)                c_printf(__VA_ARGS__)
+#define spiffs_printf(...)                printf(__VA_ARGS__)
 #endif
 // spiffs_printf argument for a free page
 #ifndef SPIFFS_TEST_VIS_FREE_STR
diff --git a/spiffs/spiffs_hydrogen.c b/spiffs/spiffs_hydrogen.c
@@ -856,6 +856,46 @@ s32_t SPIFFS_info(spiffs *fs, u32_t *total, u32_t *used) {
   return res;
 }
 
+s32_t SPIFFS_eof(spiffs *fs, spiffs_file fh) {
+  SPIFFS_API_CHECK_CFG(fs);
+  SPIFFS_API_CHECK_MOUNT(fs);
+  SPIFFS_LOCK(fs);
+
+  spiffs_fd *fd;
+  s32_t res;
+  res = spiffs_fd_get(fs, fh, &fd);
+  SPIFFS_API_CHECK_RES(fs, res);
+
+#if SPIFFS_CACHE_WR
+  spiffs_fflush_cache(fs, fh);
+#endif
+
+  res = (fd->fdoffset == fd->size);
+
+  SPIFFS_UNLOCK(fs);
+  return res;
+}
+
+s32_t SPIFFS_tell(spiffs *fs, spiffs_file fh) {
+  SPIFFS_API_CHECK_CFG(fs);
+  SPIFFS_API_CHECK_MOUNT(fs);
+  SPIFFS_LOCK(fs);
+
+  spiffs_fd *fd;
+  s32_t res;
+  res = spiffs_fd_get(fs, fh, &fd);
+  SPIFFS_API_CHECK_RES(fs, res);
+
+#if SPIFFS_CACHE_WR
+  spiffs_fflush_cache(fs, fh);
+#endif
+
+  res = fd->fdoffset;
+
+  SPIFFS_UNLOCK(fs);
+  return res;
+}
+
 #if SPIFFS_TEST_VISUALISATION
 s32_t SPIFFS_vis(spiffs *fs) {
   s32_t res = SPIFFS_OK;
