X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fexfat-utils.git;a=blobdiff_plain;f=mkfs%2Fvbr.c;h=68f481ca188ca7742929d2239b52ba2e6b5c9ad5;hp=4580565ea1863be1313f8ae5179475f44ec6f623;hb=70a4b10edcf53a90140e6dd80ccaa045f3647ad7;hpb=9799d681703e3a63dbbf876c16c9bb51b20c8fab

diff --git a/mkfs/vbr.c b/mkfs/vbr.c
index 4580565..68f481c 100644
--- a/mkfs/vbr.c
+++ b/mkfs/vbr.c
@@ -2,7 +2,7 @@
 	vbr.c (09.11.10)
 	Volume Boot Record creation code.
 
-	Copyright (C) 2009, 2010  Andrew Nayenko
+	Copyright (C) 2011, 2012  Andrew Nayenko
 
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -18,71 +18,129 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <unistd.h>
 #include <string.h>
-#include <errno.h>
-#include "mkexfat.h"
+#include "vbr.h"
+#include "fat.h"
+#include "cbm.h"
+#include "uct.h"
+#include "rootdir.h"
 
-off_t vbr_alignment(void)
+static off_t vbr_alignment(void)
 {
-	return 1;
+	return get_sector_size();
 }
 
-off_t vbr_size(void)
+static off_t vbr_size(void)
 {
-	return 12 * SECTOR_SIZE(sb);
+	return 12 * get_sector_size();
 }
 
-int vbr_write(struct exfat_dev* dev, off_t base)
+static void init_sb(struct exfat_super_block* sb)
 {
+	uint32_t clusters_max;
+	uint32_t fat_sectors;
+
+	clusters_max = get_volume_size() / get_cluster_size();
+	fat_sectors = DIV_ROUND_UP((off_t) clusters_max * sizeof(cluster_t),
+			get_sector_size());
+
+	memset(sb, 0, sizeof(struct exfat_super_block));
+	sb->jump[0] = 0xeb;
+	sb->jump[1] = 0x76;
+	sb->jump[2] = 0x90;
+	memcpy(sb->oem_name, "EXFAT   ", sizeof(sb->oem_name));
+	sb->sector_start = cpu_to_le64(get_first_sector());
+	sb->sector_count = cpu_to_le64(get_volume_size() / get_sector_size());
+	sb->fat_sector_start = cpu_to_le32(
+			fat.get_alignment() / get_sector_size());
+	sb->fat_sector_count = cpu_to_le32(ROUND_UP(
+			le32_to_cpu(sb->fat_sector_start) + fat_sectors,
+				1 << get_spc_bits()) -
+			le32_to_cpu(sb->fat_sector_start));
+	sb->cluster_sector_start = cpu_to_le32(
+			get_position(&cbm) / get_sector_size());
+	sb->cluster_count = cpu_to_le32(clusters_max -
+			((le32_to_cpu(sb->fat_sector_start) +
+			  le32_to_cpu(sb->fat_sector_count)) >> get_spc_bits()));
+	sb->rootdir_cluster = cpu_to_le32(
+			(get_position(&rootdir) - get_position(&cbm)) / get_cluster_size()
+			+ EXFAT_FIRST_DATA_CLUSTER);
+	sb->volume_serial = cpu_to_le32(get_volume_serial());
+	sb->version.major = 1;
+	sb->version.minor = 0;
+	sb->volume_state = cpu_to_le16(0);
+	sb->sector_bits = get_sector_bits();
+	sb->spc_bits = get_spc_bits();
+	sb->fat_count = 1;
+	sb->drive_no = 0x80;
+	sb->allocated_percent = 0;
+	sb->boot_signature = cpu_to_le16(0xaa55);
+}
+
+static int vbr_write(struct exfat_dev* dev)
+{
+	struct exfat_super_block sb;
 	uint32_t checksum;
-	le32_t* sector = malloc(SECTOR_SIZE(sb));
+	le32_t* sector = malloc(get_sector_size());
 	size_t i;
 
 	if (sector == NULL)
-		return errno;
+	{
+		exfat_error("failed to allocate sector-sized block of memory");
+		return 1;
+	}
 
+	init_sb(&sb);
 	if (exfat_write(dev, &sb, sizeof(struct exfat_super_block)) < 0)
 	{
 		free(sector);
-		return errno;
+		exfat_error("failed to write super block sector");
+		return 1;
 	}
 	checksum = exfat_vbr_start_checksum(&sb, sizeof(struct exfat_super_block));
 
-	memset(sector, 0, SECTOR_SIZE(sb));
-	sector[SECTOR_SIZE(sb) / sizeof(sector[0]) - 1] = cpu_to_le32(0xaa550000);
+	memset(sector, 0, get_sector_size());
+	sector[get_sector_size() / sizeof(sector[0]) - 1] =
+			cpu_to_le32(0xaa550000);
 	for (i = 0; i < 8; i++)
 	{
-		if (exfat_write(dev, sector, SECTOR_SIZE(sb)) < 0)
+		if (exfat_write(dev, sector, get_sector_size()) < 0)
 		{
 			free(sector);
-			return errno;
+			exfat_error("failed to write a sector with boot signature");
+			return 1;
 		}
-		checksum = exfat_vbr_add_checksum(sector, SECTOR_SIZE(sb), checksum);
+		checksum = exfat_vbr_add_checksum(sector, get_sector_size(), checksum);
 	}
 
-	memset(sector, 0, SECTOR_SIZE(sb));
-	if (exfat_write(dev, sector, SECTOR_SIZE(sb)) < 0)
-	{
-		free(sector);
-		return errno;
-	}
-	checksum = exfat_vbr_add_checksum(sector, SECTOR_SIZE(sb), checksum);
-	if (exfat_write(dev, sector, SECTOR_SIZE(sb)) < 0)
+	memset(sector, 0, get_sector_size());
+	for (i = 0; i < 2; i++)
 	{
-		free(sector);
-		return errno;
+		if (exfat_write(dev, sector, get_sector_size()) < 0)
+		{
+			free(sector);
+			exfat_error("failed to write an empty sector");
+			return 1;
+		}
+		checksum = exfat_vbr_add_checksum(sector, get_sector_size(), checksum);
 	}
-	checksum = exfat_vbr_add_checksum(sector, SECTOR_SIZE(sb), checksum);
 
-	for (i = 0; i < SECTOR_SIZE(sb) / sizeof(sector[0]); i++)
+	for (i = 0; i < get_sector_size() / sizeof(sector[0]); i++)
 		sector[i] = cpu_to_le32(checksum);
-	if (exfat_write(dev, sector, SECTOR_SIZE(sb)) < 0)
+	if (exfat_write(dev, sector, get_sector_size()) < 0)
 	{
 		free(sector);
-		return errno;
+		exfat_error("failed to write checksum sector");
+		return 1;
 	}
 
 	free(sector);
 	return 0;
 }
+
+const struct fs_object vbr =
+{
+	.get_alignment = vbr_alignment,
+	.get_size = vbr_size,
+	.write = vbr_write,
+};