From 79ac7263077c2338064c6324e14d404beb251246 Mon Sep 17 00:00:00 2001 From: batt Date: Wed, 28 Nov 2007 21:56:07 +0000 Subject: [PATCH] Comply with Vernie's review :-). git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1009 38d2e660-2303-0410-9eaa-f027e97ec537 --- fs/battfs.h | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/fs/battfs.h b/fs/battfs.h index 33f241b3..d2e3b6fc 100644 --- a/fs/battfs.h +++ b/fs/battfs.h @@ -45,12 +45,10 @@ #include typedef uint16_t filled_t; -typedef uint16_t page_off_t; +typedef uint16_t pgoff_t; typedef uint8_t inode_t; typedef uint8_t seqnum_t; -typedef rotating_t battfs_crc_t; - -typedef uint16_t battfs_page_t; +typedef rotating_t fsc_t; /** * BattFS page header. @@ -59,16 +57,16 @@ typedef uint16_t battfs_page_t; */ typedef struct BattFsPageHeader { - inode_t inode; ///< File inode (file identifier). - seqnum_t seqnum; ///< bit[1:0]: Page sequence number; bit[7:2] unused for now, must be set to 1. - filled_t filled; ///< Filled bytes in page. - page_off_t page_off; ///< Page offset inside file. - battfs_crc_t crc; ///< CRC of the page header. + inode_t inode; ///< File inode (file identifier). + seqnum_t seqnum; ///< bit[1:0]: Page sequence number; bit[7:2] unused for now, must be set to 1. + filled_t filled; ///< Filled bytes in page. + pgoff_t pgoff; ///< Page offset inside file. + fsc_t fsc; ///< CRC of the page header. } BattFsPageHeader; /* Ensure structure has no padding added */ -STATIC_ASSERT(sizeof(BattFsPageHeader) == sizeof(filled_t) + sizeof(page_off_t) - + sizeof(inode_t) + sizeof(seqnum_t) + siezof(BattFsDisk)); +STATIC_ASSERT(sizeof(BattFsPageHeader) == sizeof(filled_t) + sizeof(pgoff_t) + + sizeof(inode_t) + sizeof(seqnum_t) + sizeof(fsc_t)); /** * Reset page sequence number of struct \a m to default value (0xFF). @@ -91,34 +89,34 @@ STATIC_ASSERT(sizeof(BattFsPageHeader) == sizeof(filled_t) + sizeof(page_off_t) #define INC_SEQ(m) SET_SEQ((m), SEQ(m) + 1) /* Fwd decl */ -struct BattFsDisk; +struct BattFsSuper; /** * Type interface for disk init function. * \return true if all is ok, false otherwise. */ -typedef bool (*disk_init_t) (struct BattFsDisk *d); +typedef bool (*disk_init_t) (struct BattFsSuper *d); /** * Type interface for disk page read function. * \a page is the page address, \a size the lenght to be read. * \return the number of bytes read. */ -typedef size_t (*disk_page_read_t) (struct BattFsDisk *d, void *buf, battfs_page_t page, size_t size); +typedef size_t (*disk_page_read_t) (struct BattFsSuper *d, void *buf, battfs_page_t page, size_t size); /** * Type interface for disk page write function. * \a page is the page address, \a size the lenght to be written. * \return the number of bytes written. */ -typedef size_t (*disk_page_write_t) (struct BattFsDisk *d, const void *buf, battfs_page_t page, size_t size); +typedef size_t (*disk_page_write_t) (struct BattFsSuper *d, const void *buf, battfs_page_t page, size_t size); /** * Type interface for disk page erase function. * \a page is the page address. * \return true if all is ok, false otherwise. */ -typedef bool (*disk_page_erase_t) (struct BattFsDisk *d, battfs_page_t page); +typedef bool (*disk_page_erase_t) (struct BattFsSuper *d, battfs_page_t page); typedef uint32_t disk_size_t ///< Type for disk sizes. @@ -127,7 +125,7 @@ typedef uint32_t disk_size_t ///< Type for disk sizes. * This context structure will be used to access disk. * Must be initialized by hw memory driver. */ -typedef struct BattFsDisk +typedef struct BattFsSuper { disk_init_t init; ///< Disk init. disk_page_read_t read; ///< Page read. @@ -135,8 +133,8 @@ typedef struct BattFsDisk disk_page_erase_t erase; ///< Page erase. disk_size_t disk_size; ///< Size of the disk, in bytes. - disk_size_t free_space; ///< Free space on the disk, in bytes. + disk_size_t free_bytes; ///< Free space on the disk. /* TODO add other fields. */ -} BattFsDisk; +} BattFsSuper; #endif /* FS_BATTFS_H */ -- 2.25.1