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

Timestamp:

2011-04-19T08:03:45Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

3dbe4ca2

Parents:

97bc3ee

Message:

Improve code style for my changes. Adding macros for determining type of FAT and cluster value

File:

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

uspace/srv/fs/fat/fat_fat.h

@@ -51 +51 @@
 #define FAT16_CLST_LAST8  0xffff
 
+#define FAT12_CLST_MAX    4085
+#define FAT16_CLST_MAX    65525
+
 /* internally used to mark root directory's parent */
 #define FAT_CLST_ROOTPAR        FAT_CLST_RES0
@@ -60 +63 @@
  * 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 FATTYPE(bs)     (bs)->reserved
+#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 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_CLST_LAST1(bs) \
+    (FAT_IS_FAT12(bs) ? FAT12_CLST_LAST1 : FAT16_CLST_LAST1)
+#define FAT_CLST_LAST8(bs) \
+    (FAT_IS_FAT12(bs) ? FAT12_CLST_LAST8 : FAT16_CLST_LAST8)
+#define FAT_CLST_BAD(bs) \
+    (FAT_IS_FAT12(bs) ? FAT12_CLST_BAD : FAT16_CLST_BAD)
 
 /* forward declarations */