Moved FS structure printing into a separate tool.

Added large logical sector support to meet cluster size recommendations for SDXC cards with FAT32.
Other minor bug fixes/changes.

Author: profi200

include/blockdev.h

@@ -79,7 +79,7 @@ class BlockDev
 	 *
 	 * @return     Returns 0 on success or errno.
 	 */
-	int discardAll(const bool secure = false) const noexcept;
+	int eraseAll(const bool secure = false) const noexcept;
 
 	/**
 	 * @brief      Closes the block device.

include/buffered_fs_writer.h

@@ -107,11 +107,11 @@ class BufferedFsWriter final : private BlockDev
 	 *
 	 * @return     Returns 0 on success or errno.
 	 */
-	int discardAll(const bool secure = false) noexcept
+	int eraseAll(const bool secure = false) noexcept
 	{
-		memset(m_buf.get(), 0, m_pos & m_blkMask);
+		//memset(m_buf.get(), 0, m_pos & m_blkMask);
 		m_pos = 0;
-		return BlockDev::discardAll(secure);
+		return BlockDev::eraseAll(secure);
 	}
 
 	/**

include/errors.h

@@ -4,13 +4,14 @@
 enum
 {
 	// Everything ok = 0.
-	ERR_INVALID_ARG   = 1,
-	ERR_DEV_OPEN      = 2,
-	ERR_DEV_TOO_SMALL = 3,
-	ERR_ERASE         = 4,
-	ERR_PARTITION     = 5,
-	ERR_FORMAT        = 6,
-	ERR_CLOSE_DEV     = 7,
-	ERR_EXCEPTION     = 8,
-	ERR_UNK_EXCEPTION = 9
+	ERR_INVALID_ARG   =  1,
+	ERR_DEV_OPEN      =  2,
+	ERR_DEV_TOO_SMALL =  3,
+	ERR_ERASE         =  4,
+	ERR_FORMAT_PARAMS =  5,
+	ERR_PARTITION     =  6,
+	ERR_FORMAT        =  7,
+	ERR_CLOSE_DEV     =  8,
+	ERR_EXCEPTION     =  9,
+	ERR_UNK_EXCEPTION = 10
 };

include/exfat.h

@@ -2,6 +2,7 @@
 
 #include <cstddef>
 #include "types.h"
+#include "format.h"
 
 // References:
 // exFAT: https://learn.microsoft.com/en-us/windows/win32/fileio/exfat-specification
@@ -10,9 +11,9 @@
 // Boot Sector.
 typedef struct
 {
-	u8 jumpBoot[3];                  // {0xEB, 0x76, 0x90}.
+	u8  jumpBoot[3];                  // {0xEB, 0x76, 0x90}.
 	char fileSystemName[8];          // "EXFAT   ".
-	u8 mustBeZero[53];
+	u8  mustBeZero[53];
 	u64 partitionOffset;             // Arbitrary value or 0 = ignore this field.
 	u64 volumeLength;                // Minimum "2^20 / 2^BytesPerSectorShift", maximum "2^64 - 1". If excess space sub-region size = 0 then max. is "ClusterHeapOffset + (2^32 - 11) * 2^SectorsPerClusterShift".
 	u32 fatOffset;                   // Minimum "24", maximum "ClusterHeapOffset - (FatLength * NumberOfFats)".
@@ -28,8 +29,8 @@ typedef struct
 	u8  numberOfFats;                // "1" or "2" (TexFAT only).
 	u8  driveSelect;                 // Arbitrary value. Recommended 0x80.
 	u8  percentInUse;                // 0-100 "percentage of allocated clusters in the Cluster Heap, rounded down to the nearest integer" or 0xFF if unknown.
-	u8 reserved[7];
-	u8 bootCode[390];                // Bootstrapping code or 0xF4 filled (x86 halt).
+	u8  reserved[7];
+	u8  bootCode[390];               // Bootstrapping code or 0xF4 filled (x86 halt).
 	u16 bootSignature;               // 0xAA55.
 	//u8 excessSpace[(1u<<bytesPerSectorShift) - 512];
 } BootSector;
@@ -38,10 +39,10 @@ static_assert(offsetof(BootSector, bootSignature) == 510, "Member bootSignature
 // Extended Boot Sector.
 /*typedef struct
 {
-	u8 extendedBootCode[(1u<<bytesPerSectorShift) - 4];
+	u8  extendedBootCode[(1u<<bytesPerSectorShift) - 4];
 	u32 extendedBootSignature;                          // 0xAA550000.
 } ExtendedBootSector;*/
 
 
 
-void calcFormatExFat(void); // (const u64 totSec, FormatParams *const paramsOut)
+void calcFormatExFat(FormatParams &params);

include/fat.h

@@ -98,6 +98,6 @@ static_assert(offsetof(FatDir, fileSize) == 28, "Member fileSize of FatDir not a
 
 
 
-void calcFormatFat(const u32 totSec, FormatParams &params);
-void calcFormatFat32(const u32 totSec, FormatParams &params);
+void calcFormatFat(FormatParams &params);
+void calcFormatFat32(FormatParams &params);
 int makeFsFat(const FormatParams &params, BufferedFsWriter &dev, const std::string &label);

include/format.h

@@ -1,37 +1,46 @@
 #pragma once
 
+#include <string>
 #include "types.h"
 
 
+// The smallest card we can format without running into issues is 64 KiB.
+#define MIN_CAPACITY        (1024u * 64 / 512)
+#define MAX_CAPACITY_FAT32  (0xFFFFFFFFu)
+
+
 union ArgFlags
 {
 	struct
 	{
-		u8 dryRun     : 1;
-		u8 erase      : 1;
-		u8 secErase   : 1;
-		u8 forceFat32 : 1;
-		u8 verbose    : 1;
+		u8 bigClusters : 1;
+		//u8 dryRun      : 1;
+		u8 erase       : 1;
+		u8 forceFat32  : 1;
+		u8 secErase    : 1;
+		u8 verbose     : 1;
 	};
 	u8 allFlags;
 };
 
+// Note: Unless specified otherwise everything is in logical sectors.
 typedef struct
 {
 	// TODO: union with exFAT vars.
 	u64 totSec;
+	u16 bytesPerSec;
 	u8  heads;
 	u8  secPerTrk;
 	u8  fatBits;
-	u32 alignment;
+	u32 alignment;  // In logical sectors.
 	u32 secPerClus;
 	u32 rsvdSecCnt;
 	u32 secPerFat;
-	u32 fsAreaSize;
-	u32 partStart;
-	u32 maxClus;
+	u32 fsAreaSize; // In logical sectors.
+	u32 partStart;  // In logical sectors.
+	u32 maxClus;    // Logical clusters.
 } FormatParams;
 
 
 
-u32 formatSd(const char *const path, const char *const label, const ArgFlags flags, const u64 overrTotSec);
+u32 formatSd(const char *const path, const std::string &label, const ArgFlags flags, const u64 overrTotSec);

include/mbr.h

@@ -29,4 +29,4 @@ static_assert(offsetof(Mbr, bootSig) == 510, "Member bootSig of Mbr not at offse
 
 
 
-int createMbrAndPartition(const FormatParams *const params, BufferedFsWriter &dev);
+int createMbrAndPartition(const FormatParams &params, BufferedFsWriter &dev);

source/blockdev.cpp

@@ -192,7 +192,7 @@ int BlockDev::write(const u8 *buf, const u64 sector, const u64 count) noexcept
 	return 0;
 }
 
-int BlockDev::discardAll(const bool secure) const noexcept
+int BlockDev::eraseAll(const bool secure) const noexcept
 {
 	int res = 0;
 	const u64 wholeRange[2] = {0, m_sectors * m_sectorSize};

source/exfat.cpp

@@ -17,8 +17,10 @@ u32 calcExFatBootChecksum(const u8 *data, const u16 bytesPerSector)
 	return checksum;
 }
 
-void calcFormatExFat(void) // (const u64 totSec, FormatParams *const paramsOut)
+void calcFormatExFat(FormatParams &params)
 {
+	(void)params;
+
 	// TODO
 	fputs("exFAT is not supported yet.\n", stderr);
 }