timer: check for initialization of irq module when it is enabled

[bertos.git] / bertos / fs / battfs.h

diff --git a/bertos/fs/battfs.h b/bertos/fs/battfs.h
index afe69f5e74ea0aa84d74d632e2db97a0b18c29e9..d75bd6452fc941c26e74c1f2aa6d4a248d4e56bf 100644 (file)
--- a/bertos/fs/battfs.h
+++ b/bertos/fs/battfs.h
@@ -44,7 +44,7 @@
 #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 <struct/list.h>
 #include <kern/kfile.h>
 
 typedef uint16_t fill_t;    ///< Type for keeping trace of space filled inside a page
@@ -228,7 +228,7 @@ typedef uint32_t file_size_t; ///< Type for file sizes.
 /**
  * Describe a BattFs file usign a KFile.
  */
-typedef struct BattFsKFile
+typedef struct BattFS
 {
        KFile fd;           ///< KFile context
        Node link;          ///< Link for inserting in opened file list
@@ -236,7 +236,7 @@ typedef struct BattFsKFile
        BattFsSuper *disk;  ///< Disk context
        filemode_t mode;    ///< File open mode
        pgcnt_t *start;     ///< Pointer to page_array file start position.
-} BattFsKFile;
+} BattFS;
 
 /**
  * Id for battfs file descriptors.
@@ -244,20 +244,20 @@ typedef struct BattFsKFile
 #define KFT_BATTFS MAKE_ID('B', 'T', 'F', 'S')
 
 /**
- * Macro used to cast a KFile to a BattFsKFile.
+ * Macro used to cast a KFile to a BattFS.
  * Also perform dynamic type check.
  */
-INLINE BattFsKFile * BATTFSKFILE(KFile *fd)
+INLINE BattFS * BATTFSKFILE(KFile *fd)
 {
        ASSERT(fd->_type == KFT_BATTFS);
-       return (BattFsKFile *)fd;
+       return (BattFS *)fd;
 }
 
 bool battfs_init(struct BattFsSuper *d);
 bool battfs_close(struct BattFsSuper *disk);
 
 bool battfs_fileExists(BattFsSuper *disk, inode_t inode);
-bool battfs_fileopen(BattFsSuper *disk, BattFsKFile *fd, inode_t inode, filemode_t mode);
+bool battfs_fileopen(BattFsSuper *disk, BattFS *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);