X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffs%2Fbattfs.h;h=29cdde48a4eb202d83baf8c21a43ef75b5ba5450;hb=a9763b6cf65938440e924653cdbb9c65a9a91297;hp=9c60b9d506e6c274c101e280eceac3d3bf51a467;hpb=9563ce4c778bc517a8439000df985271f6967e21;p=bertos.git

diff --git a/bertos/fs/battfs.h b/bertos/fs/battfs.h
index 9c60b9d5..29cdde48 100644
--- a/bertos/fs/battfs.h
+++ b/bertos/fs/battfs.h
@@ -52,14 +52,9 @@ typedef fill_t   pgaddr_t;  ///< Type for addressing space inside a page
 typedef uint16_t pgcnt_t;   ///< Type for counting pages on disk
 typedef pgcnt_t  pgoff_t;   ///< Type for counting pages inside a file
 typedef uint8_t  inode_t;   ///< Type for file inodes
-typedef uint32_t  seq_t;     ///< Type for page seq number
+typedef uint64_t  seq_t;    ///< Type for page seq number, at least 40bits wide.
 typedef rotating_t fcs_t;   ///< Type for header FCS.
 
-/**
- * Size required for free block allocation is at least 1 bit more
- * than page addressing.
- */
-STATIC_ASSERT(sizeof(seq_t) > sizeof(pgcnt_t));
 
 /**
  * BattFS page header, used to represent a page
@@ -73,7 +68,16 @@ typedef struct BattFsPageHeader
 	inode_t  inode; ///< File inode (file identifier).
 	fill_t   fill;  ///< Filled bytes in page.
 	pgoff_t  pgoff; ///< Page offset inside file.
-	seq_t    seq;   ///< Page sequence number.
+
+	/**
+	 * Page sequence number.
+	 * Every time a page is rewritten the seq number is
+	 * increased by 1. seq_t is wide enough to not to perform
+	 * a wrap around before the memory death.
+	 * So it can be kept as it would be
+	 * monotonically increasing for our needs.
+	 */
+	seq_t    seq;
 
 	/**
 	 * FCS (Frame Check Sequence) of the page header.
@@ -86,18 +90,7 @@ typedef struct BattFsPageHeader
  * \see battfs_to_disk
  * \see disk_to_battfs
  */
-#define BATTFS_HEADER_LEN 10
-
-/**
- * Half-size of page sequence numer.
- */
-#define HALF_SEQ (1 << (CPU_BITS_PER_CHAR * sizeof(pgcnt_t)))
-
-/**
- * Max sequence number.
- */
-#define MAX_SEQ ((1 << (CPU_BITS_PER_CHAR * sizeof(pgcnt_t) + 1)) - 1)
-
+#define BATTFS_HEADER_LEN 12
 
 /**
  * Maximum page address.
@@ -117,9 +110,6 @@ struct BattFsSuper;
  */
 #define PAGE_UNSET_SENTINEL ((1 << (CPU_BITS_PER_CHAR * sizeof(pgcnt_t))) - 1)
 
-/** Also used as an error marker sometimes */
-#define PAGE_ERROR PAGE_UNSET_SENTINEL
-
 /**
  * Type interface for disk init function.
  * \return true if all is ok, false otherwise.
@@ -134,13 +124,41 @@ typedef bool (*disk_open_t) (struct BattFsSuper *d);
  */
 typedef size_t (*disk_page_read_t) (struct BattFsSuper *d, pgcnt_t page, pgaddr_t addr, void *buf, size_t);
 
+
 /**
- * Type interface for disk page write function.
- * \a page is the page address, \a addr the address inside the page,
+ * Type interface for disk page load function.
+ * The disk should supply a buffer used for loading/saving pages.
+ * This has to be done by the disk driver because it knows memory details
+ * (e.g. some memories can have the buffer inside the memory itself).
+ * \a page is the page to be loaded from the disk in the buffer.
+ * \return true if ok, false on errors.
+ */
+typedef bool (*disk_page_load_t) (struct BattFsSuper *d, pgcnt_t page);
+
+/**
+ * Type interface for disk pagebuffer write function.
+ * \a addr is the address inside the current loaded page,
  * \a size the lenght to be written.
  * \return the number of bytes written.
  */
-typedef size_t	(*disk_page_write_t) (struct BattFsSuper *d, pgcnt_t page, pgaddr_t addr, const void *buf, size_t);
+typedef size_t	(*disk_buffer_write_t) (struct BattFsSuper *d, pgaddr_t addr, const void *buf, size_t);
+
+/**
+ * Type interface for disk pagebuffer read function.
+ * \a addr is the address inside the current loaded page,
+ * \a size the lenght to be read.
+ * \return the number of bytes read.
+ */
+typedef size_t	(*disk_buffer_read_t) (struct BattFsSuper *d, pgaddr_t addr, void *buf, size_t);
+
+/**
+ * Type interface for disk page save function.
+ * The disk should supply a buffer used for loading/saving pages.
+ * For details \see disk_page_load_t.
+ * \a page is the page where the buffer will be written.
+ * \return true if ok, false on errors.
+ */
+typedef bool (*disk_page_save_t) (struct BattFsSuper *d, pgcnt_t page);
 
 /**
  * Type interface for disk page erase function.
@@ -167,11 +185,15 @@ typedef struct BattFsSuper
 {
 	disk_open_t open;        ///< Disk init.
 	disk_page_read_t  read;  ///< Page read.
-	disk_page_write_t write; ///< Page write.
+	disk_page_load_t  load;  ///< Page load.
+	disk_buffer_write_t bufferWrite; ///< Buffer write.
+	disk_buffer_read_t bufferRead; ///< Buffer read.
+	disk_page_save_t  save;  ///< Page save.
 	disk_page_erase_t erase; ///< Page erase.
 	disk_close_t close;      ///< Disk deinit.
 
-	pgaddr_t page_size;      ///< Size of a disk page, in bytes.
+	pgaddr_t page_size;      ///< Size of a memory page, in bytes. Used by disk low level driver.
+	pgaddr_t data_size;      ///< Size of space usable for data in a disk page, in bytes. The rest is used by the page header.
 	pgcnt_t page_count;      ///< Number of pages on disk.
 
 	/**
@@ -182,6 +204,8 @@ typedef struct BattFsSuper
 	 * the entire disk in memory.
 	 */
 	pgcnt_t *page_array;
+	pgcnt_t curr_page;  ///< Current page loaded in disk buffer.
+	bool cache_dirty;   ///< True if current cache is dirty (nneds to be flushed).
 
 	/**
 	 * Lowest address, in page array, for free pages.
@@ -196,7 +220,7 @@ typedef struct BattFsSuper
 	/* TODO add other fields. */
 } BattFsSuper;
 
-typedef uint8_t filemode_t; ///< Type for file open modes.
+typedef uint8_t filemode_t;  ///< Type for file open modes.
 typedef int32_t file_size_t; ///< Type for file sizes.
 
 /**
@@ -220,6 +244,7 @@ typedef struct BattFs
 	BattFsSuper *disk;  ///< Disk context
 	filemode_t mode;    ///< File open mode
 	pgcnt_t *start;     ///< Pointer to page_array file start position.
+	pgcnt_t max_off;    ///< Max page offset allocated for the file.
 } BattFs;
 
 /**