Changeset cb052b4 in mainline

Timestamp:

2011-04-30T08:02:46Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

875edff6

Parents:

ce8f4f4

Message:

1. Add new macros for determining FAT32 (FAT_IS_FAT32) and change existing macros: FAT_CLST_LAST1,

FAT_CLST_LAST8, FAT_CLST_BAD to support FAT32

2. Allow to mount FAT32 filesystem
3. Known issue: FAT32 fs does not pass sanity checks because of support 32-bit fat_cluster_t is required.

Location:

uspace/srv/fs/fat

Files:

• fat_fat.h (modified) (2 diffs)
• fat_ops.c (modified) (1 diff)

uspace/srv/fs/fat/fat_fat.h

@@ -50 +50 @@
 #define FAT16_CLST_LAST1  0xfff8
 #define FAT16_CLST_LAST8  0xffff
+#define FAT32_CLST_BAD    0x0ffffff7
+#define FAT32_CLST_LAST1  0x0ffffff8
+#define FAT32_CLST_LAST8  0x0fffffff
 
 #define FAT12_CLST_MAX    4085
@@ -72 +75 @@
 #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_LAST1(bs) \
-    (FAT_IS_FAT12(bs) ? FAT12_CLST_LAST1 : FAT16_CLST_LAST1)
+    (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 : FAT16_CLST_LAST8)
+    (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 : FAT16_CLST_BAD)
+    (FAT_IS_FAT12(bs) ? FAT12_CLST_BAD : (FAT_IS_FAT32(bs) ? FAT32_CLST_BAD : FAT16_CLST_BAD))
 
 /* forward declarations */

uspace/srv/fs/fat/fat_ops.c

@@ -1003 +1003 @@
         }
 
-        /* Return NOT SUPPORTED if try to mount FAT32  */
-        if (!FAT_IS_FAT12(bs) && !FAT_IS_FAT16(bs)) {
-                block_fini(devmap_handle);
-                async_answer_0(rid, ENOTSUP);
-                return;
-        }
-
         /* Do some simple sanity checks on the file system. */
         rc = fat_sanity_check(bs, devmap_handle);