Changeset 88a27f1 in mainline for uspace/srv/fs/fat/fat_fat.h

Timestamp:

2011-05-13T20:14:32Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

0182e5cc

Parents:

a8c14aa

Message:

1. Split fat_get_cluster into 3 methods: fat_get_cluster_fat[12,16,32]

and fat_set_cluster to fat_set_cluster_fat[12,16,32]

2. Use FAT_MASK to calculating FAT_CLST_LAST1, FAT_CLST_LAST8, FAT_CLST_BAD

File:

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

uspace/srv/fs/fat/fat_fat.h

@@ -44 +44 @@
 #define FAT_CLST_FIRST    0x0002
 
-#define FAT12_CLST_BAD    0x0ff7
-#define FAT12_CLST_LAST1  0x0ff8
-#define FAT12_CLST_LAST8  0x0fff
-#define FAT16_CLST_BAD    0xfff7
-#define FAT16_CLST_LAST1  0xfff8
-#define FAT16_CLST_LAST8  0xffff
 #define FAT32_CLST_BAD    0x0ffffff7
 #define FAT32_CLST_LAST1  0x0ffffff8
@@ -86 +80 @@
 #define FAT_IS_FAT32(bs)        (CC(bs) >= FAT16_CLST_MAX)
 
-#define FAT_CLST_LAST1(bs) \
-    (FAT_IS_FAT12(bs) ? FAT12_CLST_LAST1 : \
-    (FAT_IS_FAT32(bs) ? FAT32_CLST_LAST1 : FAT16_CLST_LAST1))
-#define FAT_CLST_LAST8(bs) \
-    (FAT_IS_FAT12(bs) ? FAT12_CLST_LAST8 : \
-    (FAT_IS_FAT32(bs) ? FAT32_CLST_LAST8 : FAT16_CLST_LAST8))
-#define FAT_CLST_BAD(bs) \
-    (FAT_IS_FAT12(bs) ? FAT12_CLST_BAD : \
-    (FAT_IS_FAT32(bs) ? FAT32_CLST_BAD : FAT16_CLST_BAD))
-
 #define FAT_CLST_SIZE(bs) \
     (FAT_IS_FAT32(bs) ? FAT32_CLST_SIZE : FAT16_CLST_SIZE)
@@ -102 +86 @@
     (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) \
@@ -133 +121 @@
 extern int fat_alloc_shadow_clusters(struct fat_bs *, devmap_handle_t,
     fat_cluster_t *, unsigned);
+extern int fat_get_cluster_fat12(struct fat_bs *, devmap_handle_t, unsigned,
+    fat_cluster_t, fat_cluster_t *);
+extern int fat_get_cluster_fat16(struct fat_bs *, devmap_handle_t, unsigned,
+    fat_cluster_t, fat_cluster_t *);
+extern int fat_get_cluster_fat32(struct fat_bs *, devmap_handle_t, unsigned,
+    fat_cluster_t, fat_cluster_t *);
 extern int fat_get_cluster(struct fat_bs *, devmap_handle_t, unsigned,
     fat_cluster_t, fat_cluster_t *);
+extern int fat_set_cluster_fat12(struct fat_bs *, devmap_handle_t, unsigned,
+    fat_cluster_t, fat_cluster_t);
+extern int fat_set_cluster_fat16(struct fat_bs *, devmap_handle_t, unsigned,
+    fat_cluster_t, fat_cluster_t);
+extern int fat_set_cluster_fat32(struct fat_bs *, devmap_handle_t, unsigned,
+    fat_cluster_t, fat_cluster_t);
 extern int fat_set_cluster(struct fat_bs *, devmap_handle_t, unsigned,
     fat_cluster_t, fat_cluster_t);