Changeset d260a95 in mainline for uspace/srv/fs/fat/fat_ops.c

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_ops.c (modified) (1 diff)

uspace/srv/fs/fat/fat_ops.c

@@ -1002 +1002 @@
         }
 
-        /* Storing FAT type (12, 16, 32) in reserved field (bs->reserved) */
-        if (CC(bs) < 4085) {
-        /* Volume is FAT12 */
-            printf("Found FAT12 filesystem\n");
-            (bs)->reserved = 12;
-        } else if (CC(bs) < 65525) {
-        /* Volume is FAT16 */
-            printf("Found FAT16 filesystem\n");
-            (bs)->reserved = 16;
-        } else {
-        /* Volume is FAT32 */
-            printf("FAT32 filesystem is not supported by FAT server. Sorry.\n");
-            block_fini(devmap_handle);
-            async_answer_0(rid, ENOTSUP);
-            return;
-
-        }
+        /* Determining type of FAT  */
+        if (FAT_IS_FAT12(bs)) {
+                printf("Found FAT12 filesystem\n");
+        } else if (FAT_IS_FAT16(bs)) {
+                printf("Found FAT16 filesystem\n");
+        } else {
+                printf("FAT32 filesystem is not supported by FAT server.\n");
+                block_fini(devmap_handle);
+                async_answer_0(rid, ENOTSUP);
+                return;
+        }
 
         /* Do some simple sanity checks on the file system. */