Changeset 50e754e in mainline

Timestamp:

2012-02-19T20:27:13Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

69c4172

Parents:

3f6d4ea

Message:

mkexfat: Initialize the FAT vector, vbr-backup starts at sector 12.

File:

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

uspace/app/mkexfat/mkexfat.c

@@ -41 +41 @@
 #include <assert.h>
 #include <errno.h>
+#include <malloc.h>
 #include <byteorder.h>
 #include <align.h>
@@ -178 +179 @@
 }
 
+/** Writes the FAT on disk.
+ *
+ * @param cfg Pointer to the exfat_cfg structure.
+ * @return EOK on success or a negative error code.
+ */
+static int
+fat_write(service_id_t service_id, exfat_cfg_t *cfg)
+{
+        unsigned long i;
+        uint32_t *pfat;
+        int rc;
+
+        pfat = calloc(cfg->fat_sector_count, cfg->sector_size);
+        if (!pfat)
+                return ENOMEM;
+
+        pfat[0] = host2uint32_t_le(0xFFFFFFF8);
+        pfat[1] = host2uint32_t_le(0xFFFFFFFF);
+
+        rc = block_write_direct(service_id, FAT_SECTOR_START, 1, pfat);
+        if (rc != EOK)
+                goto error;
+
+        pfat[0] = pfat[1] = 0x00000000;
+
+        for (i = FAT_SECTOR_START + 1; i < cfg->fat_sector_count; ++i) {
+                rc = block_write_direct(service_id, i, 1, pfat);
+                if (rc != EOK)
+                        goto error;
+        }
+
+error:
+        free(pfat);
+        return rc;
+}
+
 /** Given a power-of-two number (n), returns the result of log2(n).
  *
@@ -260 +297 @@
 
         /* Write the VBR backup on disk */
-        rc = block_write_direct(service_id, 1, 1, &vbr);
+        rc = block_write_direct(service_id, 12, 1, &vbr);
         if (rc != EOK) {
                 printf(NAME ": Error, failed to write the VBR" \
@@ -267 +304 @@
         }
 
+        rc = fat_write(service_id, &cfg);
+        if (rc != EOK) {
+                printf(NAME ": Error, failed to write the FAT on disk\n");
+                return 2;
+        }
+
         return 0;
 }