projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: coding style fixes (structure naming)
[bertos.git]
/
bertos
/
fs
/
battfs.h
diff --git
a/bertos/fs/battfs.h
b/bertos/fs/battfs.h
index 93598fe8be70b637ffade453d48883017018bc78..7f9993e2729d7ed715d7d31bcccc8677d78a8379 100644
(file)
--- a/
bertos/fs/battfs.h
+++ b/
bertos/fs/battfs.h
@@
-30,7
+30,6
@@
*
* -->
*
*
* -->
*
- * \version $Id$
*
* \author Francesco Sacchi <batt@develer.com>
*
*
* \author Francesco Sacchi <batt@develer.com>
*
@@
-49,7
+48,7
@@
#include <cpu/types.h> // CPU_BITS_PER_CHAR
#include <algo/rotating_hash.h>
#include <struct/list.h>
#include <cpu/types.h> // CPU_BITS_PER_CHAR
#include <algo/rotating_hash.h>
#include <struct/list.h>
-#include <
kern
/kfile.h>
+#include <
io
/kfile.h>
#include <io/kblock.h>
typedef uint16_t fill_t; ///< Type for keeping trace of space filled inside a page
#include <io/kblock.h>
typedef uint16_t fill_t; ///< Type for keeping trace of space filled inside a page
@@
-107,9
+106,6
@@
typedef struct BattFsPageHeader
*/
#define BATTFS_MAX_FILES (1 << (CPU_BITS_PER_CHAR * sizeof(inode_t)))
*/
#define BATTFS_MAX_FILES (1 << (CPU_BITS_PER_CHAR * sizeof(inode_t)))
-/* Fwd decl */
-struct BattFsSuper;
-
/**
* Sentinel used to keep trace of unset pages in disk->page_array.
*/
/**
* Sentinel used to keep trace of unset pages in disk->page_array.
*/
@@
-126,9
+122,6
@@
typedef struct BattFsSuper
{
KBlock *dev; ///< Block device context (physical disk).
{
KBlock *dev; ///< Block device context (physical disk).
- pgaddr_t page_size; ///< Size of a memory page, in bytes. Used by disk low level driver.
- pgcnt_t page_count; ///< Number of pages on disk.
-
pgaddr_t data_size; ///< Size of space usable for data in a disk page, in bytes. The rest is used by the page header.
/**
* Page allocation array.
pgaddr_t data_size; ///< Size of space usable for data in a disk page, in bytes. The rest is used by the page header.
/**
* Page allocation array.
@@
-155,7
+148,7
@@
typedef struct BattFsSuper
/**
* True if space on \a disk is over.
*/
/**
* True if space on \a disk is over.
*/
-#define SPACE_OVER(disk) ((disk)->free_page_start >= (disk)->
page_cou
nt)
+#define SPACE_OVER(disk) ((disk)->free_page_start >= (disk)->
dev->blk_c
nt)
typedef uint8_t filemode_t; ///< Type for file open modes.
typedef int32_t file_size_t; ///< Type for file sizes.
typedef uint8_t filemode_t; ///< Type for file open modes.
typedef int32_t file_size_t; ///< Type for file sizes.