Changeset 557e5b13 in mainline

Timestamp:

2012-02-24T21:50:48Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

89a0a827

Parents:

69f9cf5

Message:

mkexfat: write the rootdir cluster index to the boot sector

File:

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

uspace/app/mkexfat/mkexfat.c

@@ -84 +84 @@
         unsigned long data_start_sector;
         unsigned long rootdir_cluster;
+        unsigned long upcase_table_cluster;
         unsigned long total_clusters;
         unsigned long allocated_clusters;
@@ -216 +217 @@
             div_round_up(cfg->data_start_sector, cfg->cluster_size));
 
-        mbs->rootdir_cluster = 0;
+        mbs->rootdir_cluster = host2uint32_t_le(cfg->rootdir_cluster);
         mbs->volume_serial = 0;
         mbs->version.major = 1;
@@ -573 +574 @@
         cfg_print_info(&cfg);
 
-        rc = bootsec_write(service_id, &cfg);
-        if (rc != EOK) {
-                printf(NAME ": Error, failed to write the VBR to disk\n");
-                return 2;
-        }
-
         rc = fat_initialize(service_id, &cfg);
         if (rc != EOK) {
                 printf(NAME ": Error, failed to write the FAT to disk\n");
-                return 2;
-        }
-
-        rc = bitmap_write(service_id, &cfg);
-        if (rc != EOK) {
-                printf(NAME ": Error, failed to write the allocation" \
-                    " bitmap to disk.\n");
                 return 2;
         }
@@ -602 +590 @@
         next_cls = FIRST_FREE_CLUSTER +
             div_round_up(cfg.bitmap_size, cfg.cluster_size);
+        cfg.upcase_table_cluster = next_cls;
 
         /* Allocate clusters for the upcase table */
@@ -621 +610 @@
         }
 
+        rc = bitmap_write(service_id, &cfg);
+        if (rc != EOK) {
+                printf(NAME ": Error, failed to write the allocation" \
+                    " bitmap to disk.\n");
+                return 2;
+        }
+
+        rc = bootsec_write(service_id, &cfg);
+        if (rc != EOK) {
+                printf(NAME ": Error, failed to write the VBR to disk\n");
+                return 2;
+        }
+
         return 0;
 }