【同步】代码至最新版

Signed-off-by: armink <[email protected]>
armink-rtt-pkgs · Dec 23, 2020 · 7a14557 · 7a14557
1 parent 94c6240
commit 7a14557
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/inc/fdb_def.h b/inc/fdb_def.h
@@ -43,6 +43,10 @@ extern "C" {
 #define FDB_USING_FILE_MODE
 #endif
 
+#ifndef FDB_WRITE_GRAN
+#define FDB_WRITE_GRAN 1
+#endif
+
 /* log function. default FDB_PRINT macro is printf() */
 #ifndef FDB_PRINT
 #define FDB_PRINT(...)                 printf(__VA_ARGS__)

diff --git a/src/fdb.c b/src/fdb.c
@@ -22,8 +22,6 @@
 
 fdb_err_t _fdb_init_ex(fdb_db_t db, const char *name, const char *part_name, fdb_db_type type, void *user_data)
 {
-    size_t block_size;
-
     FDB_ASSERT(db);
     FDB_ASSERT(name);
     FDB_ASSERT(part_name);
@@ -51,6 +49,8 @@ fdb_err_t _fdb_init_ex(fdb_db_t db, const char *name, const char *part_name, fdb
 #endif
     } else {
 #ifdef FDB_USING_FAL_MODE
+        size_t block_size;
+
         /* FAL (Flash Abstraction Layer) initialization */
         fal_init();
         /* check the flash partition */