X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=fs%2Fbattfs.h;h=247e058538752f867fb1aa5461bfd2f8928f7546;hb=f5c60ed7a6e06c258385b69e3d25c624243c43fd;hp=9235263e8efb0915c761b4af0a5e6bd7b9e51854;hpb=4c1f7cd0bcf77994d03cacf2f3cbb5d529cc1ff8;p=bertos.git

diff --git a/fs/battfs.h b/fs/battfs.h
index 9235263e..247e0585 100644
--- a/fs/battfs.h
+++ b/fs/battfs.h
@@ -44,6 +44,8 @@
 #include <cfg/compiler.h> // uintXX_t; STATIC_ASSERT
 #include <cpu/types.h> // CPU_BITS_PER_CHAR
 #include <algo/rotating_hash.h>
+#include <mware/list.h>
+#include <kern/kfile.h>
 
 typedef uint16_t fill_t;
 typedef fill_t   pgaddr_t;
@@ -99,7 +101,7 @@ typedef struct BattFsPageHeader
  * Simply set to 1 all field bits.
  * \{
  */
-#define MARK_PAGE_VALID ((1LL << (CPU_BITS_PER_CHAR * sizeof(mark_t))) - 1)
+#define MARK_PAGE_VALID ((1 << (CPU_BITS_PER_CHAR * sizeof(pgaddr_t) + 1)) - 1)
 #define FCS_FREE_VALID  ((1 << (CPU_BITS_PER_CHAR * sizeof(fcs_t))) - 1)
 /* \} */
 
@@ -153,7 +155,7 @@ typedef size_t (*disk_page_read_t) (struct BattFsSuper *d, pgcnt_t page, pgaddr_
  * \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, void *buf, size_t);
+typedef size_t	(*disk_page_write_t) (struct BattFsSuper *d, pgcnt_t page, pgaddr_t addr, const void *buf, size_t);
 
 /**
  * Type interface for disk page erase function.
@@ -196,13 +198,13 @@ typedef struct BattFsSuper
 	 */
 	pgcnt_t *page_array;
 
-    /**
+        /**
 	 * Lowest free page counter.
 	 * This is the counter of the first availble free page.
 	 */
 	mark_t free_start;
 
-    /**
+        /**
 	 * Highest free page counter.
 	 * This value is the next to be used to mark a block as free.
 	 */
@@ -211,9 +213,35 @@ typedef struct BattFsSuper
 	disk_size_t disk_size;   ///< Size of the disk, in bytes (page_count * page_size).
 	disk_size_t free_bytes;  ///< Free space on the disk.
 	
+	List file_opened_list;       ///< List used to keep trace of open files.
 	/* TODO add other fields. */
 } BattFsSuper;
 
+typedef uint8_t filemode_t; ///< Type for file open.
+
+/**
+ * Describe a BattFs file usign a KFile.
+ */
+typedef struct KFileBattFs
+{
+	KFile fd;           ///< KFile context
+	Node link;          ///< Link for inserting in opened file list
+	inode_t inode;      ///< inode of the opened file
+	BattFsSuper *disk;  ///< Disk context
+	filemode_t mode;    ///< File open mode
+} KFileBattFs;
+
+INLINE KFileBattFs * KFILEBATTFS(KFile *fd)
+{
+	ASSERT(fd->_type == KFT_BATTFS);
+	return (KFileBattFs *)fd;
+}
+
 bool battfs_init(struct BattFsSuper *d);
+bool battfs_close(struct BattFsSuper *disk);
+
+bool battfs_fileopen(BattFsSuper *disk, KFileBattFs *fd, inode_t inode, filemode_t mode);
+
+bool battfs_writeTestBlock(struct BattFsSuper *disk, pgcnt_t page, inode_t inode, seq_t seq, fill_t fill, pgoff_t pgoff, mark_t mark);
 
 #endif /* FS_BATTFS_H */