Changeset 5dbd696 in mainline for uspace/app/mkexfat/mkexfat.c

Timestamp:

2012-02-18T18:32:39Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

f8973122

Parents:

6b3cda3

Message:

mkexfat: compute the total FAT size

File:

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

uspace/app/mkexfat/mkexfat.c

@@ -68 +68 @@
         size_t   sector_size;
         size_t   cluster_size;
-        unsigned long total_clusters;
+        uint32_t total_clusters;
 } exfat_cfg_t;
 
@@ -83 +83 @@
 cfg_params_initialize(exfat_cfg_t *cfg)
 {
-        aoff64_t const volume_bytes = cfg->volume_count * cfg->sector_size;
+        unsigned long fat_bytes;
+        aoff64_t const volume_bytes = (cfg->volume_count - FAT_SECTOR_START) *
+            cfg->sector_size;
 
         /** Number of clusters required to index the entire device, it must
@@ -100 +102 @@
                 n_req_clusters = volume_bytes / cfg->cluster_size;
         }
+
+        cfg->total_clusters = n_req_clusters;
+
+        /* Compute the FAT size in sectors */
+        fat_bytes = (cfg->total_clusters + 1) * 4;
+        cfg->fat_sector_count = div_round_up(fat_bytes, cfg->sector_size);
 }
 
@@ -203 +211 @@
         rc = block_get_nblocks(service_id, &cfg.volume_count);
         if (rc != EOK) {
-                printf(NAME ": Warning, failed to obtain device block size.\n");
-                /* FIXME: the user should specify the filesystem size */
+                printf(NAME ": Warning, failed to obtain" \
+                    " device block size.\n");
+                /* FIXME: the user should be able to specify the filesystem size */
                 return 1;
         } else {