Changes in uspace/srv/fs/fat/fat_fat.h [7ece4247:991f645] in mainline

File:

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

uspace/srv/fs/fat/fat_fat.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Jakub Jermar
- * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -30 +29 @@
 /** @addtogroup fs
  * @{
- */
+ */ 
 
 #ifndef FAT_FAT_FAT_H_
@@ -41 +40 @@
 #define FAT1            0
 
-#define FAT_CLST_RES0     0
-#define FAT_CLST_RES1     1
-#define FAT_CLST_FIRST    2
-
-#define FAT32_CLST_BAD    0x0ffffff7
-#define FAT32_CLST_LAST1  0x0ffffff8
-#define FAT32_CLST_LAST8  0x0fffffff
-
-#define FAT12_MASK        0x0fff
-#define FAT16_MASK        0xffff
-#define FAT32_MASK        0x0fffffff
-
-#define FAT12_CLST_MAX    4085
-#define FAT16_CLST_MAX    65525
-
-/* Size in bytes for cluster value of FAT */
-#define FAT12_CLST_SIZE   2
-#define FAT16_CLST_SIZE   2
-#define FAT32_CLST_SIZE   4
+#define FAT_CLST_RES0   0x0000
+#define FAT_CLST_RES1   0x0001
+#define FAT_CLST_FIRST  0x0002
+#define FAT_CLST_BAD    0xfff7
+#define FAT_CLST_LAST1  0xfff8
+#define FAT_CLST_LAST8  0xffff
 
 /* internally used to mark root directory's parent */
@@ -66 +52 @@
 #define FAT_CLST_ROOT           FAT_CLST_RES1
 
-/*
- * Convenience macros for computing some frequently used values from the
- * primitive boot sector members.
- */
-#define RDS(bs)   ((sizeof(fat_dentry_t) * RDE((bs))) / BPS((bs))) + \
-                   (((sizeof(fat_dentry_t) * RDE((bs))) % BPS((bs))) != 0)
-#define SSA(bs)   (RSCNT((bs)) + FATCNT((bs)) * SF((bs)) + RDS(bs))
-#define DS(bs)    (TS(bs) - SSA(bs))
-#define CC(bs)    (DS(bs) / SPC(bs))
-
-#define CLBN2PBN(bs, cl, bn) \
-        (SSA((bs)) + ((cl) - FAT_CLST_FIRST) * SPC((bs)) + (bn) % SPC((bs)))
-
-#define FAT_IS_FAT12(bs)        (CC(bs) < FAT12_CLST_MAX)
-#define FAT_IS_FAT16(bs) \
-    ((CC(bs) >= FAT12_CLST_MAX) && (CC(bs) < FAT16_CLST_MAX))
-#define FAT_IS_FAT32(bs)        (CC(bs) >= FAT16_CLST_MAX)
-
-#define FAT_CLST_SIZE(bs) \
-    (FAT_IS_FAT32(bs) ? FAT32_CLST_SIZE : FAT16_CLST_SIZE)
-
-#define FAT_MASK(bs) \
-    (FAT_IS_FAT12(bs) ? FAT12_MASK : \
-    (FAT_IS_FAT32(bs) ? FAT32_MASK : FAT16_MASK))
-
-#define FAT_CLST_LAST1(bs)      (FAT32_CLST_LAST1 & FAT_MASK((bs)))
-#define FAT_CLST_LAST8(bs)      (FAT32_CLST_LAST8 & FAT_MASK((bs)))
-#define FAT_CLST_BAD(bs)        (FAT32_CLST_BAD & FAT_MASK((bs)))
-
-#define FAT_ROOT_CLST(bs) \
-    (FAT_IS_FAT32(bs) ? uint32_t_le2host(bs->fat32.root_cluster) : \
-    FAT_CLST_ROOT)
-
 /* forward declarations */
 struct block;
@@ -104 +57 @@
 struct fat_bs;
 
-typedef uint32_t fat_cluster_t;
+typedef uint16_t fat_cluster_t;
 
-#define fat_clusters_get(numc, bs, sid, fc) \
-    fat_cluster_walk((bs), (sid), (fc), NULL, (numc), (uint32_t) -1)
-extern int fat_cluster_walk(struct fat_bs *, service_id_t, fat_cluster_t,
-    fat_cluster_t *, uint32_t *, uint32_t);
+#define fat_clusters_get(numc, bs, dh, fc) \
+    fat_cluster_walk((bs), (dh), (fc), NULL, (numc), (uint16_t) -1)
+extern int fat_cluster_walk(struct fat_bs *, devmap_handle_t, fat_cluster_t,
+    fat_cluster_t *, uint16_t *, uint16_t);
 
 extern int fat_block_get(block_t **, struct fat_bs *, struct fat_node *,
     aoff64_t, int);
-extern int _fat_block_get(block_t **, struct fat_bs *, service_id_t,
+extern int _fat_block_get(block_t **, struct fat_bs *, devmap_handle_t,
     fat_cluster_t, fat_cluster_t *, aoff64_t, int);
 
@@ -120 +73 @@
 extern int fat_chop_clusters(struct fat_bs *, struct fat_node *,
     fat_cluster_t);
-extern int fat_alloc_clusters(struct fat_bs *, service_id_t, unsigned,
+extern int fat_alloc_clusters(struct fat_bs *, devmap_handle_t, unsigned,
     fat_cluster_t *, fat_cluster_t *);
-extern int fat_free_clusters(struct fat_bs *, service_id_t, fat_cluster_t);
-extern int fat_alloc_shadow_clusters(struct fat_bs *, service_id_t,
+extern int fat_free_clusters(struct fat_bs *, devmap_handle_t, fat_cluster_t);
+extern int fat_alloc_shadow_clusters(struct fat_bs *, devmap_handle_t,
     fat_cluster_t *, unsigned);
-extern int fat_get_cluster(struct fat_bs *, service_id_t, unsigned,
+extern int fat_get_cluster(struct fat_bs *, devmap_handle_t, unsigned,
     fat_cluster_t, fat_cluster_t *);
-extern int fat_set_cluster(struct fat_bs *, service_id_t, unsigned,
+extern int fat_set_cluster(struct fat_bs *, devmap_handle_t, unsigned,
     fat_cluster_t, fat_cluster_t);
 extern int fat_fill_gap(struct fat_bs *, struct fat_node *, fat_cluster_t,
     aoff64_t);
-extern int fat_zero_cluster(struct fat_bs *, service_id_t, fat_cluster_t);
-extern int fat_sanity_check(struct fat_bs *, service_id_t);
+extern int fat_zero_cluster(struct fat_bs *, devmap_handle_t, fat_cluster_t);
+extern int fat_sanity_check(struct fat_bs *, devmap_handle_t);
 
 #endif