Changes in uspace/srv/fs/fat/fat.h [ffa2c8ef:852b801] in mainline

File:

• uspace/srv/fs/fat/fat.h (modified) (8 diffs)

uspace/srv/fs/fat/fat.h

@@ -35 +35 @@
 
 #include "fat_fat.h"
-#include <fibril_synch.h>
+#include <ipc/ipc.h>
+#include <fibril_sync.h>
 #include <libfs.h>
 #include <atomic.h>
@@ -47 +48 @@
 
 #define min(a, b)               ((a) < (b) ? (a) : (b))
-
-/*
- * Convenience macros for accessing some frequently used boot sector members.
- */
-#define BPS(bs)         uint16_t_le2host((bs)->bps)
-#define SPC(bs)         (bs)->spc
-#define RSCNT(bs)       uint16_t_le2host((bs)->rscnt)
-#define FATCNT(bs)      (bs)->fatcnt
-#define SF(bs)          uint16_t_le2host((bs)->sec_per_fat)
-#define RDE(bs)         uint16_t_le2host((bs)->root_ent_max)
-#define TS(bs)          (uint16_t_le2host((bs)->totsec16) != 0 ? \
-                        uint16_t_le2host((bs)->totsec16) : \
-                        uint32_t_le2host(bs->totsec32))
 
 #define BS_BLOCK                0
@@ -131 +119 @@
                         /** Signature. */
                         uint16_t        signature;
-                } fat32 __attribute__ ((packed));
-        };
+                } __attribute__ ((packed));
+        }; 
 } __attribute__ ((packed)) fat_bs_t;
 
@@ -175 +163 @@
 
         fibril_mutex_t  lock;
-        devmap_handle_t devmap_handle;
+        dev_handle_t    dev_handle;
         fs_index_t      index;
         /**
@@ -206 +194 @@
         /** FAT in-core node free list link. */
         link_t                  ffn_link;
-        aoff64_t                size;
+        size_t                  size;
         unsigned                lnkcnt;
         unsigned                refcnt;
         bool                    dirty;
-
-        /*
-         * Cache of the node's last and "current" cluster to avoid some
-         * unnecessary FAT walks.
-         */
-        /* Node's last cluster in FAT. */
-        bool            lastc_cached_valid;
-        fat_cluster_t   lastc_cached_value;
-        /* Node's "current" cluster, i.e. where the last I/O took place. */
-        bool            currc_cached_valid;
-        aoff64_t        currc_cached_bn;
-        fat_cluster_t   currc_cached_value;
 } fat_node_t;
 
@@ -228 +204 @@
 extern void fat_mounted(ipc_callid_t, ipc_call_t *);
 extern void fat_mount(ipc_callid_t, ipc_call_t *);
-extern void fat_unmounted(ipc_callid_t, ipc_call_t *);
-extern void fat_unmount(ipc_callid_t, ipc_call_t *);
 extern void fat_lookup(ipc_callid_t, ipc_call_t *);
 extern void fat_read(ipc_callid_t, ipc_call_t *);
@@ -241 +215 @@
 extern void fat_sync(ipc_callid_t, ipc_call_t *);
 
-extern int fat_idx_get_new(fat_idx_t **, devmap_handle_t);
-extern fat_idx_t *fat_idx_get_by_pos(devmap_handle_t, fat_cluster_t, unsigned);
-extern fat_idx_t *fat_idx_get_by_index(devmap_handle_t, fs_index_t);
+extern fat_idx_t *fat_idx_get_new(dev_handle_t);
+extern fat_idx_t *fat_idx_get_by_pos(dev_handle_t, fat_cluster_t, unsigned);
+extern fat_idx_t *fat_idx_get_by_index(dev_handle_t, fs_index_t);
 extern void fat_idx_destroy(fat_idx_t *);
 extern void fat_idx_hashin(fat_idx_t *);
@@ -250 +224 @@
 extern int fat_idx_init(void);
 extern void fat_idx_fini(void);
-extern int fat_idx_init_by_devmap_handle(devmap_handle_t);
-extern void fat_idx_fini_by_devmap_handle(devmap_handle_t);
+extern int fat_idx_init_by_dev_handle(dev_handle_t);
+extern void fat_idx_fini_by_dev_handle(dev_handle_t);
 
 #endif