Changeset 51d0ee9 in mainline

Timestamp:

2011-08-27T21:27:24Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

dc6b148

Parents:

4cf5ed46

Message:

Fix ppc32 build and a possible rounding error.

Location:

uspace/app/mkfat

Files:

• fat.h (modified) (1 diff)
• mkfat.c (modified) (1 diff)

uspace/app/mkfat/fat.h

@@ -47 +47 @@
 #define FAT32   32
 
-#define FAT_SIZE(a) (((a) == FAT12) ? 1.5 : (((a) == FAT16) ? 2 : 4)) 
+#define FAT_CLUSTER_DOUBLE_SIZE(a) ((a) / 4)
 
 typedef struct fat_bs {

uspace/app/mkfat/mkfat.c

@@ -253 +253 @@
                 return ENOSPC;
 
-        fat_bytes = (cfg->total_clusters + 2) * FAT_SIZE(cfg->fat_type);
+        fat_bytes = div_round_up((cfg->total_clusters + 2) *
+            FAT_CLUSTER_DOUBLE_SIZE(cfg->fat_type), 2);
         cfg->fat_sectors = div_round_up(fat_bytes, cfg->sector_size);