X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffs%2Fbattfs.h;h=846027271b2a484c9f95c915a10bee5ab5828f00;hb=ffea13d5f49cb87705f3bcc3b245cc4c68566296;hp=b14cb1c659ec2de231a6501dfddc6e510730f696;hpb=c50659ae6bda45fcfb3ea68f1be0a44b487ae1a4;p=bertos.git

diff --git a/bertos/fs/battfs.h b/bertos/fs/battfs.h
index b14cb1c6..84602727 100644
--- a/bertos/fs/battfs.h
+++ b/bertos/fs/battfs.h
@@ -192,7 +192,8 @@ typedef struct BattFsSuper
 	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.
 
 	/**
@@ -203,7 +204,6 @@ typedef struct BattFsSuper
 	 * the entire disk in memory.
 	 */
 	pgcnt_t *page_array;
-	struct BattFsPageHeader curr_hdr; ///< Current page header (cached)-
 	pgcnt_t curr_page;  ///< Current page loaded in disk buffer.
 	bool cache_dirty;   ///< True if current cache is dirty (nneds to be flushed).
 
@@ -220,6 +220,11 @@ typedef struct BattFsSuper
 	/* TODO add other fields. */
 } BattFsSuper;
 
+/**
+ * True if space on \a disk is over.
+ */
+#define SPACE_OVER(disk) ((disk)->free_page_start >= (disk)->page_count)
+
 typedef uint8_t filemode_t;  ///< Type for file open modes.
 typedef int32_t file_size_t; ///< Type for file sizes.
 
@@ -233,6 +238,21 @@ typedef int32_t file_size_t; ///< Type for file sizes.
 /*/}*/
 
 
+/**
+ * File errors.
+ * \{
+ */
+#define BATTFS_NEGATIVE_SEEK_ERR   BV(0) ///< Trying to read/write before file start.
+#define BATTFS_DISK_READ_ERR       BV(1) ///< Error reading from disk driver.
+#define BATTFS_DISK_LOADPAGE_ERR   BV(2) ///< Error loading a disk page in the buffer.
+#define BATTFS_DISK_BUFFERWR_ERR   BV(3) ///< Error writing in the disk page buffer.
+#define BATTFS_DISK_GETNEWPAGE_ERR BV(4) ///< Error getting a free page.
+#define BATTFS_DISK_BUFFERRD_ERR   BV(6) ///< Error reading from the disk page buffer.
+#define BATTFS_DISK_SPACEOVER_ERR  BV(7) ///< No more disk space available.
+#define BATTFS_DISK_FLUSHBUF_ERR   BV(8) ///< Error flushing (writing) the current page to disk.
+#define BATTFS_FILE_NOT_FOUND_ERR  BV(9) ///< File not found on disk.
+/*/}*/
+
 /**
  * Describe a BattFs file usign a KFile.
  */
@@ -244,6 +264,8 @@ 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.
+	int errors;         ///< File status/errors
 } BattFs;
 
 /**
@@ -261,8 +283,9 @@ INLINE BattFs * BATTFS_CAST(KFile *fd)
 	return (BattFs *)fd;
 }
 
-bool battfs_init(struct BattFsSuper *d);
-bool battfs_close(struct BattFsSuper *disk);
+bool battfs_mount(struct BattFsSuper *d);
+bool battfs_fsck(struct BattFsSuper *disk);
+bool battfs_umount(struct BattFsSuper *disk);
 
 bool battfs_fileExists(BattFsSuper *disk, inode_t inode);
 bool battfs_fileopen(BattFsSuper *disk, BattFs *fd, inode_t inode, filemode_t mode);