Changeset df1b4a8 in mainline

Timestamp:

2024-06-18T21:28:27Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

7cec216

Parents:

c15296b

Message:

Fix volume label entry / rootdir creation in mkfat for FAT32

With FAT32 the root directory is stored in clusters (like any
other directory). Its start address must be adjusted for
root_cluster (which is 2).

File:

• uspace/app/mkfat/mkfat.c (modified) (4 diffs)

uspace/app/mkfat/mkfat.c

@@ -66 +66 @@
         default_fat_count               = 2,
         default_reserved_clusters       = 2,
-        default_media_descriptor        = 0xF8 /**< fixed disk */
+        default_media_descriptor        = 0xF8 /**< fixed disk */,
+        fat32_root_cluster              = 2
 };
 
@@ -313 +314 @@
         cfg->reserved_sectors = 1 + cfg->addt_res_sectors;
 
-        /* Only correct for FAT12/16 (FAT32 has root dir stored in clusters */
+        /* Only correct for FAT12/16 (FAT32 has root dir stored in clusters) */
         rd_sectors = div_round_up(cfg->root_ent_max * DIRENT_SIZE,
             cfg->sector_size);
@@ -434 +435 @@
         }
 
+        if (cfg->fat_type == FAT32) {
+                /* Root dir is stored in cluster fat32_root_cluster */
+                addr += fat32_root_cluster * cfg->sectors_per_cluster;
+        }
+
         /* Root directory */
         printf("Writing root directory.\n");
@@ -529 +535 @@
                 bs->fat32.ebs = 0x29;
                 bs->fat32.id = host2uint32_t_be(vsn);
-                bs->fat32.root_cluster = 2;
+                bs->fat32.root_cluster = fat32_root_cluster;
 
                 (void) fat_label_encode(&bs->fat32.label, bs_label);