Changeset 602c3d8c in mainline

Timestamp:

2011-08-16T19:51:23Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

c56c4576

Parents:

ae560da

Message:

Improve HelenOS mkfat. Add option "—type 12|16|32" to toggle FAT type

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/mkfat/fat.h (modified) (1 diff)
• uspace/app/mkfat/mkfat.c (modified) (20 diffs)

boot/Makefile.common

@@ -154 +154 @@
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/mkfat/mkfat \
+        $(USPACE_PATH)/app/mkexfat/mkexfat \
         $(USPACE_PATH)/app/lsusb/lsusb \
         $(USPACE_PATH)/app/sbi/sbi \

uspace/Makefile

@@ -48 +48 @@
         app/lsusb \
         app/mkfat \
+        app/mkexfat \
         app/redir \
         app/sbi \

uspace/app/mkfat/fat.h

@@ -38 +38 @@
 #define BS_BLOCK                0
 #define BS_SIZE                 512
+#define DIRENT_SIZE             32
 
-#define DIRENT_SIZE             32
+#define FAT12_CLST_MAX    4085
+#define FAT16_CLST_MAX    65525
+
+#define FAT12   12
+#define FAT16   16
+#define FAT32   32
+
+#define FAT_SIZE(a) ((a==FAT12)? 1.5 : ( (a==FAT16)? 2 : 4  ) ) 
 
 typedef struct fat_bs {

uspace/app/mkfat/mkfat.c

@@ -35 +35 @@
  * @brief       Tool for creating new FAT file systems.
  *
- * Currently we can only create 16-bit FAT.
+ * Currently we can create 12/16/32-bit FAT.
  */
 
@@ -55 +55 @@
 #define div_round_up(a, b) (((a) + (b) - 1) / (b))
 
-/** Predefined file-system parameters */
+/** Default file-system parameters */
 enum {
-        sector_size             = 512,
-        sectors_per_cluster     = 8,
-        fat_count               = 2,
-        reserved_clusters       = 2,
-        media_descriptor        = 0xF8 /**< fixed disk */
+        default_sector_size             = 512,
+        default_sectors_per_cluster     = 4,
+        default_fat_count               = 2,
+        default_reserved_clusters       = 2,
+        default_media_descriptor        = 0xF8 /**< fixed disk */
 };
 
 /** Configurable file-system parameters */
 typedef struct fat_cfg {
+        int fat_type; /* FAT12 = 12, FAT16 = 16, FAT32 = 32 */
+        size_t sector_size;
         uint32_t total_sectors;
         uint16_t root_ent_max;
-        uint16_t addt_res_sectors;
+        uint32_t addt_res_sectors;
+        uint8_t sectors_per_cluster;
+
+        uint16_t reserved_sectors;
+        uint32_t rootdir_sectors;
+        uint32_t fat_sectors;
+        uint32_t total_clusters;
+        uint8_t fat_count;
 } fat_cfg_t;
 
-/** Derived file-system parameters */
-typedef struct fat_params {
-        struct fat_cfg cfg;
-        uint16_t reserved_sectors;
-        uint16_t rootdir_sectors;
-        uint32_t fat_sectors;
-        uint16_t total_clusters;
-} fat_params_t;
-
 static void syntax_print(void);
 
-static int fat_params_compute(struct fat_cfg const *cfg,
-    struct fat_params *par);
-static int fat_blocks_write(struct fat_params const *par,
-    devmap_handle_t handle);
-static void fat_bootsec_create(struct fat_params const *par, struct fat_bs *bs);
+static int fat_params_compute(struct fat_cfg *cfg);
+static int fat_blocks_write(struct fat_cfg const *cfg, devmap_handle_t handle);
+static void fat_bootsec_create(struct fat_cfg const *cfg, struct fat_bs *bs);
 
 int main(int argc, char **argv)
 {
-        struct fat_params par;
         struct fat_cfg cfg;
 
@@ -96 +93 @@
         char *dev_path;
         devmap_handle_t handle;
-        size_t block_size;
         char *endptr;
         aoff64_t dev_nblocks;
 
+        cfg.sector_size = default_sector_size;
+        cfg.sectors_per_cluster = default_sectors_per_cluster;
+        cfg.fat_count = default_fat_count;
         cfg.total_sectors = 0;
         cfg.addt_res_sectors = 0;
         cfg.root_ent_max = 128;
+        cfg.fat_type = FAT16;
 
         if (argc < 2) {
@@ -111 +111 @@
 
         --argc; ++argv;
-
         if (str_cmp(*argv, "--size") == 0) {
                 --argc; ++argv;
@@ -130 +129 @@
         }
 
+        if (str_cmp(*argv, "--type") == 0) {
+                --argc; ++argv;
+                if (*argv == NULL) {
+                        printf(NAME ": Error, argument missing.\n");
+                        syntax_print();
+                        return 1;
+                }
+
+                cfg.fat_type = strtol(*argv, &endptr, 10);
+                if (*endptr != '\0') {
+                        printf(NAME ": Error, invalid argument.\n");
+                        syntax_print();
+                        return 1;
+                }
+
+                --argc; ++argv;
+        }
+
         if (argc != 1) {
                 printf(NAME ": Error, unexpected argument.\n");
@@ -137 +154 @@
 
         dev_path = *argv;
+        printf("Device: %s\n", dev_path);
 
         rc = devmap_device_get_handle(dev_path, &handle, 0);
@@ -150 +168 @@
         }
 
-        rc = block_get_bsize(handle, &block_size);
+        rc = block_get_bsize(handle, &cfg.sector_size);
         if (rc != EOK) {
                 printf(NAME ": Error determining device block size.\n");
@@ -162 +180 @@
                 printf(NAME ": Block device has %" PRIuOFF64 " blocks.\n",
                     dev_nblocks);
+                printf("Device total size: %lld Mb\n", dev_nblocks*cfg.sector_size/(1024*1024));
                 cfg.total_sectors = dev_nblocks;
         }
 
-        if (block_size != 512) {
-                printf(NAME ": Error. Device block size is not 512 bytes.\n");
+        if (cfg.fat_type == FAT12 && cfg.sector_size != 512) {
+                printf(NAME ": Error. Device block size is not 512 bytes for FAT12 file system.\n");
                 return 2;
         }
@@ -175 +194 @@
         }
 
-        printf(NAME ": Creating FAT filesystem on device %s.\n", dev_path);
-
-        rc = fat_params_compute(&cfg, &par);
+        printf(NAME ": Creating FAT%d filesystem on device %s.\n", cfg.fat_type, dev_path);
+
+        rc = fat_params_compute(&cfg);
         if (rc != EOK) {
                 printf(NAME ": Invalid file-system parameters.\n");
@@ -183 +202 @@
         }
 
-        rc = fat_blocks_write(&par, handle);
+        rc = fat_blocks_write(&cfg, handle);
         if (rc != EOK) {
                 printf(NAME ": Error writing device.\n");
@@ -197 +216 @@
 static void syntax_print(void)
 {
-        printf("syntax: mkfat [--size <num_blocks>] <device_name>\n");
+        printf("syntax: mkfat32 [--size <sectors>] [--type 12|16|32] <device_name>\n");
 }
 
@@ -205 +224 @@
  * file system params.
  */
-static int fat_params_compute(struct fat_cfg const *cfg, struct fat_params *par)
+static int fat_params_compute(struct fat_cfg *cfg)
 {
         uint32_t fat_bytes;
@@ -211 +230 @@
 
         /*
-         * Make a conservative guess on the FAT size needed for the file
-         * system. The optimum could be potentially smaller since we
-         * do not subtract size of the FAT itself when computing the
-         * size of the data region.
-         */
-
-        par->reserved_sectors = 1 + cfg->addt_res_sectors;
-        par->rootdir_sectors = div_round_up(cfg->root_ent_max * DIRENT_SIZE,
-            sector_size);
-        non_data_sectors_lb = par->reserved_sectors + par->rootdir_sectors;
-
-        par->total_clusters = div_round_up(cfg->total_sectors - non_data_sectors_lb,
-            sectors_per_cluster);
-
-        fat_bytes = (par->total_clusters + 2) * 2;
-        par->fat_sectors = div_round_up(fat_bytes, sector_size);
-
-        par->cfg = *cfg;
+     * Make a conservative guess on the FAT size needed for the file
+     * system. The optimum could be potentially smaller since we
+     * do not subtract size of the FAT itself when computing the
+     * size of the data region.
+     */
+
+        if (cfg->fat_type == FAT12)
+                cfg->sectors_per_cluster = 1;
+
+        cfg->reserved_sectors = 1 + cfg->addt_res_sectors;
+        if (cfg->fat_type != FAT32) {
+                cfg->rootdir_sectors = div_round_up(cfg->root_ent_max * DIRENT_SIZE,
+                        cfg->sector_size);
+        }
+        else
+                cfg->rootdir_sectors = 0;
+        non_data_sectors_lb = cfg->reserved_sectors + cfg->rootdir_sectors;
+
+        cfg->total_clusters = div_round_up(cfg->total_sectors - non_data_sectors_lb,
+            cfg->sectors_per_cluster);
+
+        if ((cfg->fat_type == FAT12 && cfg->total_clusters > FAT12_CLST_MAX) ||
+                (cfg->fat_type == FAT16 && (cfg->total_clusters <= FAT12_CLST_MAX ||
+                cfg->total_clusters > FAT16_CLST_MAX)) ||
+            (cfg->fat_type == FAT32 && cfg->total_clusters <= FAT16_CLST_MAX))
+                return ENOSPC;
+
+        fat_bytes = (cfg->total_clusters + 2) * FAT_SIZE(cfg->fat_type);
+        cfg->fat_sectors = div_round_up(fat_bytes, cfg->sector_size);
 
         return EOK;
@@ -234 +264 @@
 
 /** Create file system with the given parameters. */
-static int fat_blocks_write(struct fat_params const *par, devmap_handle_t handle)
+static int fat_blocks_write(struct fat_cfg const *cfg, devmap_handle_t handle)
 {
         aoff64_t addr;
@@ -243 +273 @@
         struct fat_bs bs;
 
-        fat_bootsec_create(par, &bs);
+        fat_bootsec_create(cfg, &bs);
 
         rc = block_write_direct(handle, BS_BLOCK, 1, &bs);
@@ -251 +281 @@
         addr = BS_BLOCK + 1;
 
-        buffer = calloc(sector_size, 1);
+        buffer = calloc(cfg->sector_size, 1);
         if (buffer == NULL)
                 return ENOMEM;
+        memset(buffer, 0, cfg->sector_size);
 
         /* Reserved sectors */
-        for (i = 0; i < par->reserved_sectors - 1; ++i) {
+        for (i = 0; i < cfg->reserved_sectors - 1; ++i) {
                 rc = block_write_direct(handle, addr, 1, buffer);
                 if (rc != EOK)
@@ -265 +296 @@
 
         /* File allocation tables */
-        for (i = 0; i < fat_count; ++i) {
+        for (i = 0; i < cfg->fat_count; ++i) {
                 printf("Writing allocation table %d.\n", i + 1);
 
-                for (j = 0; j < par->fat_sectors; ++j) {
-                        memset(buffer, 0, sector_size);
+                for (j = 0; j < cfg->fat_sectors; ++j) {
+                        memset(buffer, 0, cfg->sector_size);
                         if (j == 0) {
-                                buffer[0] = media_descriptor;
+                                buffer[0] = default_media_descriptor;
                                 buffer[1] = 0xFF;
                                 buffer[2] = 0xFF;
-                                buffer[3] = 0xFF;
+                                if (cfg->fat_type == FAT16) {
+                                        buffer[3] = 0xFF;
+                                } else if (cfg->fat_type == FAT32) {
+                                        buffer[3] = 0x0F;
+                                        buffer[4] = 0xFF;
+                                        buffer[5] = 0xFF;
+                                        buffer[6] = 0xFF;
+                                        buffer[7] = 0x0F;
+                                        buffer[8] = 0xF8;
+                                        buffer[9] = 0xFF;
+                                        buffer[10] = 0xFF;
+                                        buffer[11] = 0x0F;
+                                }
                         }
 
@@ -285 +328 @@
         }
 
+        /* Root directory */
         printf("Writing root directory.\n");
-
-        memset(buffer, 0, sector_size);
-
-        /* Root directory */
-        for (i = 0; i < par->rootdir_sectors; ++i) {
-                rc = block_write_direct(handle, addr, 1, buffer);
-                if (rc != EOK)
-                        return EIO;
-
-                ++addr;
+        memset(buffer, 0, cfg->sector_size);
+        if (cfg->fat_type != FAT32) {
+                size_t idx;
+                for (idx = 0; idx < cfg->rootdir_sectors; ++idx) {
+                        rc = block_write_direct(handle, addr, 1, buffer);
+                        if (rc != EOK)
+                                return EIO;
+
+                        ++addr;
+                }
+        } else {
+                for (i=0; i<cfg->sectors_per_cluster; i++) {
+                        rc = block_write_direct(handle, addr, 1, buffer);
+                        if (rc != EOK)
+                                return EIO;
+
+                        ++addr;
+                }       
         }
 
@@ -304 +356 @@
 
 /** Construct boot sector with the given parameters. */
-static void fat_bootsec_create(struct fat_params const *par, struct fat_bs *bs)
+static void fat_bootsec_create(struct fat_cfg const *cfg, struct fat_bs *bs)
 {
         memset(bs, 0, sizeof(*bs));
@@ -315 +367 @@
 
         /* BIOS Parameter Block */
-        bs->bps = host2uint16_t_le(sector_size);
-        bs->spc = sectors_per_cluster;
-        bs->rscnt = host2uint16_t_le(par->reserved_sectors);
-        bs->fatcnt = fat_count;
-        bs->root_ent_max = host2uint16_t_le(par->cfg.root_ent_max);
-
-        if (par->cfg.total_sectors < 0x10000)
-                bs->totsec16 = host2uint16_t_le(par->cfg.total_sectors);
-        else
-                bs->totsec16 = host2uint16_t_le(0);
-
-        bs->mdesc = media_descriptor;
-        bs->sec_per_fat = host2uint16_t_le(par->fat_sectors);
+        bs->bps = host2uint16_t_le(cfg->sector_size);
+        bs->spc = cfg->sectors_per_cluster;
+        bs->rscnt = host2uint16_t_le(cfg->reserved_sectors);
+        bs->fatcnt = cfg->fat_count;
+        bs->root_ent_max = host2uint16_t_le(cfg->root_ent_max);
+
+        if (cfg->total_sectors < 0x10000) {
+                bs->totsec16 = host2uint16_t_le(cfg->total_sectors);
+                bs->totsec32 = 0;
+        } else {
+                bs->totsec16 = 0;
+                bs->totsec32 = host2uint32_t_le(cfg->total_sectors);
+        }
+
+        bs->mdesc = default_media_descriptor;
         bs->sec_per_track = host2uint16_t_le(63);
+        bs->signature = host2uint16_t_be(0x55AA);
         bs->headcnt = host2uint16_t_le(6);
         bs->hidden_sec = host2uint32_t_le(0);
 
-        if (par->cfg.total_sectors >= 0x10000)
-                bs->totsec32 = host2uint32_t_le(par->cfg.total_sectors);
-        else
-                bs->totsec32 = host2uint32_t_le(0);
-
-        /* Extended BPB */
-        bs->pdn = 0x80;
-        bs->ebs = 0x29;
-        bs->id = host2uint32_t_be(0x12345678);
-
-        memcpy(bs->label, "HELENOS_NEW", 11);
-        memcpy(bs->type, "FAT16   ", 8);
-        bs->signature = host2uint16_t_be(0x55AA);
+        if (cfg->fat_type == FAT32) {
+                bs->sec_per_fat = 0;
+                bs->fat32.sectors_per_fat = host2uint32_t_le(cfg->fat_sectors);
+
+                bs->fat32.pdn = 0x80;
+                bs->fat32.ebs = 0x29;
+                bs->fat32.id = host2uint32_t_be(0x12345678);
+                bs->fat32.root_cluster = 2;
+
+                memcpy(bs->fat32.label, "HELENOS_NEW", 11);
+                memcpy(bs->fat32.type, "FAT32   ", 8);
+        } else {
+                bs->sec_per_fat = host2uint16_t_le(cfg->fat_sectors);
+                bs->pdn = 0x80;
+                bs->ebs = 0x29;
+                bs->id = host2uint32_t_be(0x12345678);
+
+                memcpy(bs->label, "HELENOS_NEW", 11);
+                memcpy(bs->type, "FAT   ", 8);
+        }
 }