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

Timestamp:

2011-04-30T11:22:28Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

aa2ea13

Parents:

cb052b4

Message:

It is possible to mount FAT32 file system.
Changes:

1. 32bit fat_cluster_t
2. Change macros SF(bs) to add support FAT32 sectors per fat value
3. New macros (FAT_CLST_SIZE) for determining size of FAT cluster (2 or 4 bytes)
4. New macros (FAT_MASK) for determining necessary mask for cluster value depending on FAT type
5. fat_get_cluster support FAT32 and correctly return cluster value
6. Change fat_sanity_check() to add support FAT32. Wrapping explicit use of br→(value) with macros.

TODO: need to wrap all explicit use of br→() with appropriated macros.

File:

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

uspace/srv/fs/fat/fat_fat.h

@@ -54 +54 @@
 #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
 
 /* internally used to mark root directory's parent */
@@ -84 +93 @@
     (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)
+
+#define FAT_MASK(bs) \
+    (FAT_IS_FAT12(bs) ? FAT12_MASK : (FAT_IS_FAT32(bs) ? FAT32_MASK : FAT16_MASK))
+
 /* forward declarations */
 struct block;
@@ -89 +103 @@
 struct fat_bs;
 
-typedef uint16_t fat_cluster_t;
+typedef uint32_t fat_cluster_t;
 
 #define fat_clusters_get(numc, bs, dh, fc) \