Changeset 53f2ca3 in rtems

Timestamp:

05/31/12 11:50:08 (11 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

6b24b88, b824fb8

Parents:

f164ae75

Message:

dosfs: Fix format request with sectors per cluster

File:

• cpukit/libfs/src/dosfs/msdos_format.c (modified) (2 diffs)

cpukit/libfs/src/dosfs/msdos_format.c

@@ -485 +485 @@
        * are a compromise concerning capacity and efficency
        */
+      uint32_t fat12_sect_per_clust = 8;
+      uint32_t fat16_sect_per_clust = 32;
+
+      if (rqdata != NULL && rqdata->sectors_per_cluster != 0) {
+        fat12_sect_per_clust = rqdata->sectors_per_cluster;
+        fat16_sect_per_clust = rqdata->sectors_per_cluster;
+      }
+
       if (fmt_params->totl_sector_cnt
-          < ((uint32_t)FAT_FAT12_MAX_CLN)*8) {
+          < FAT_FAT12_MAX_CLN * fat12_sect_per_clust) {
         fmt_params->fattype = FAT_FAT12;
         /* start trying with small clusters */
@@ -492 +500 @@
       }
       else if (fmt_params->totl_sector_cnt
-               < ((uint32_t)FAT_FAT16_MAX_CLN)*32) {
+               < FAT_FAT16_MAX_CLN * fat16_sect_per_clust) {
         fmt_params->fattype = FAT_FAT16;
         /* start trying with small clusters */