Changeset 46c20c8 in mainline for uspace/srv/fs/fat/fat.h

Timestamp:

2010-11-26T20:08:10Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/fs/fat/fat.h

@@ -48 +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
@@ -89 +102 @@
                         uint16_t        signature;
                 } __attribute__ ((packed));
-                struct fat32 {
+                struct {
                         /* FAT32 only */
                         /** Sectors per FAT. */
@@ -119 +132 @@
                         /** Signature. */
                         uint16_t        signature;
-                } __attribute__ ((packed));
-        }; 
+                } fat32 __attribute__ ((packed));
+        };
 } __attribute__ ((packed)) fat_bs_t;
 
@@ -163 +176 @@
 
         fibril_mutex_t  lock;
-        dev_handle_t    dev_handle;
+        devmap_handle_t devmap_handle;
         fs_index_t      index;
         /**
@@ -194 +207 @@
         /** FAT in-core node free list link. */
         link_t                  ffn_link;
-        size_t                  size;
+        aoff64_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;
 
@@ -217 +242 @@
 extern void fat_sync(ipc_callid_t, ipc_call_t *);
 
-extern int fat_idx_get_new(fat_idx_t **, 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 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 void fat_idx_destroy(fat_idx_t *);
 extern void fat_idx_hashin(fat_idx_t *);
@@ -226 +251 @@
 extern int fat_idx_init(void);
 extern void fat_idx_fini(void);
-extern int fat_idx_init_by_dev_handle(dev_handle_t);
-extern void fat_idx_fini_by_dev_handle(dev_handle_t);
+extern int fat_idx_init_by_devmap_handle(devmap_handle_t);
+extern void fat_idx_fini_by_devmap_handle(devmap_handle_t);
 
 #endif