X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Ffs%2Fbattfs.h;h=bcd5c556229b0a336529c0e1e731681670fa66ed;hb=78ba83720d538ac0c32b04bb672101f0cc9bfb14;hp=359dc16aea90582652443d2e11bf58460ec7a01e;hpb=739757a2b118bb2cad650cd2848b471560dc5b8f;p=bertos.git diff --git a/bertos/fs/battfs.h b/bertos/fs/battfs.h index 359dc16a..bcd5c556 100644 --- a/bertos/fs/battfs.h +++ b/bertos/fs/battfs.h @@ -110,12 +110,6 @@ struct BattFsSuper; */ #define PAGE_UNSET_SENTINEL ((1 << (CPU_BITS_PER_CHAR * sizeof(pgcnt_t))) - 1) -/** - * Type interface for disk init function. - * \return true if all is ok, false otherwise. - */ -typedef bool (*disk_open_t) (struct BattFsSuper *d); - /** * Type interface for disk page read function. * \a page is the page address, \a addr the address inside the page, @@ -183,7 +177,7 @@ typedef uint32_t disk_size_t; ///< Type for disk sizes. */ typedef struct BattFsSuper { - disk_open_t open; ///< Disk init. + void *disk_ctx; ///< Disk context used by disk access functions. disk_page_read_t read; ///< Page read. disk_page_load_t load; ///< Page load. disk_buffer_write_t bufferWrite; ///< Buffer write. @@ -242,15 +236,15 @@ typedef int32_t file_size_t; ///< Type for file sizes. * File errors. * \{ */ -#define BATTFS_NEGATIVE_SEEK_ERR BV(0) -#define BATTFS_DISK_READ_ERR BV(1) -#define BATTFS_DISK_LOADPAGE_ERR BV(2) -#define BATTFS_DISK_BUFFERWR_ERR BV(3) -#define BATTFS_DISK_GETNEWPAGE_ERR BV(4) -#define BATTFS_DISK_BUFFERRD_ERR BV(6) -#define BATTFS_DISK_SPACEOVER_ERR BV(7) -#define BATTFS_DISK_FLUSHBUF_ERR BV(8) -#define BATTFS_FILE_NOT_FOUND_ERR BV(9) +#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. /*/}*/ /**