RAN format command, and fix DiskImage framework.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>

9 files changed, 20 insertions, 19 deletions

diff --git a/dev/Boot/src/HEL/AMD64/BootEFI.cc b/dev/Boot/src/HEL/AMD64/BootEFI.cc
index c56e560a..a0f4c05e 100644
--- a/dev/Boot/src/HEL/AMD64/BootEFI.cc
+++ b/dev/Boot/src/HEL/AMD64/BootEFI.cc
@@ -277,7 +277,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
 	// Assign to global 'kHandoverHeader'.
 
 	WideChar kernel_path[256U] = {0};
-	UInt32	 kernel_path_sz	  = 256U;
+	UInt32	 kernel_path_sz	   = 256U;
 
 	if (ST->RuntimeServices->GetVariable(L"/props/boot_path", kEfiGlobalNamespaceVarGUID, nullptr, &kernel_path_sz, kernel_path) != kEfiOk)
 	{
diff --git a/dev/Kernel/FirmwareKit/CoreBoot/NetBoot.h b/dev/Kernel/FirmwareKit/CoreBoot/NetBoot.h
index 5ff9a527..c790d3e4 100644
--- a/dev/Kernel/FirmwareKit/CoreBoot/NetBoot.h
+++ b/dev/Kernel/FirmwareKit/CoreBoot/NetBoot.h
@@ -16,10 +16,10 @@ typedef struct NetBootInternetHeader
 	NeOS::Char NB3; /// magic char 3 'T'
 	NeOS::Char NB4; /// magic char 4 'B'
 
-	NeOS::Char	  PatchName[256U];	/// example: ColdChoco
-	NeOS::Int32	  PatchLength;		/// the patch length.
+	NeOS::Char	  PatchName[256U];	 /// example: ColdChoco
+	NeOS::Int32	  PatchLength;		 /// the patch length.
 	NeOS::Char	  PatchTarget[256U]; /// the target file.
-	NeOS::Boolean ImpliesROM;		/// does it imply an EEPROM reprogram?
-	NeOS::Boolean Preflight;		/// is it a preflight packet.
-	NeOS::Char	  Patch[];			/// non preflight packet has a patch blob for a **PatchTarget**
+	NeOS::Boolean ImpliesROM;		 /// does it imply an EEPROM reprogram?
+	NeOS::Boolean Preflight;		 /// is it a preflight packet.
+	NeOS::Char	  Patch[];			 /// non preflight packet has a patch blob for a **PatchTarget**
 } NetBootInternetHeader;
diff --git a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc
index 5726189a..6650d460 100644
--- a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc
+++ b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc
@@ -60,7 +60,7 @@ STATIC Void drv_compute_disk_ahci() noexcept;
 STATIC PCI::Device kPCIDevice;
 STATIC HbaMem* kSATA[kSATAPortCnt] = {};
 STATIC SizeT   kSATAIndex		   = 0UL;
-STATIC Lba	   kSATASectorCount		   = 0UL;
+STATIC Lba	   kSATASectorCount	   = 0UL;
 
 STATIC UInt16 kSATAPortsImplemented = 0U;
 
diff --git a/dev/Kernel/HALKit/AMD64/Storage/DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/DMA.cc
index 661a932b..a51c31ba 100644
--- a/dev/Kernel/HALKit/AMD64/Storage/DMA.cc
+++ b/dev/Kernel/HALKit/AMD64/Storage/DMA.cc
@@ -212,9 +212,9 @@ Void drv_std_write(UInt64 Lba, UInt16 IO, UInt8 Master, Char* Buf, SizeT SectorS
 	rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
 
 	Detail::PRDEntry* prd = (Detail::PRDEntry*)(kATADevice.Bar(0x20) + 4);
-	prd->mAddress		   = (UInt32)(UIntPtr)kWriteAddr;
-	prd->mByteCount		   = Size - 1;
-	prd->mFlags			   = 0x8000;
+	prd->mAddress		  = (UInt32)(UIntPtr)kWriteAddr;
+	prd->mByteCount		  = Size - 1;
+	prd->mFlags			  = 0x8000;
 
 	rt_out32(kATADevice.Bar(0x20) + 0x04, (UInt32)(UIntPtr)prd);
 	rt_out8(kATADevice.Bar(0x20) + ATA_REG_COMMAND, ATA_CMD_WRITE_DMA);
diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc
index adee0322..88f83020 100644
--- a/dev/Kernel/src/FS/NeFS.cc
+++ b/dev/Kernel/src/FS/NeFS.cc
@@ -587,7 +587,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L
 			part_block->StartCatalog = kNeFSCatalogStartAddress;
 			part_block->Flags		 = kNeFSPartitionTypeStandard;
 			part_block->CatalogCount = sectorCount / sizeof(NEFS_CATALOG_STRUCT);
-			part_block->FreeSectors = sectorCount / sizeof(NEFS_CATALOG_STRUCT);
+			part_block->FreeSectors	 = sectorCount / sizeof(NEFS_CATALOG_STRUCT);
 			part_block->SectorCount	 = sectorCount;
 			part_block->DiskSize	 = diskSize;
 			part_block->FreeCatalog	 = sectorCount / sizeof(NEFS_CATALOG_STRUCT);
diff --git a/public/frameworks/DiskImage.fwrk/headers/DiskImage.h b/public/frameworks/DiskImage.fwrk/headers/DiskImage.h
index 34a0bc0c..33883450 100644
--- a/public/frameworks/DiskImage.fwrk/headers/DiskImage.h
+++ b/public/frameworks/DiskImage.fwrk/headers/DiskImage.h
@@ -14,8 +14,8 @@
 #include <uuid/uuid.h>
 #include <LibSCI/SCI.h>
 
-SInt32 DIFormatDiskToFile(const char* kDiskName		= "Disk",
-						  int		  kDiskSectorSz = 512,
-						  const int	  kDiskBlockCnt = 1,
-						  size_t	  kDiskSz		= gib_cast(4),
-						  const char* kOutDisk		= "disk.eimg") noexcept;
\ No newline at end of file
+SInt32 DIFormatDiskToFile(const char* disk_name = "Disk",
+						  int		  sector_sz = 512,
+						  const int	  block_cnt = 1,
+						  size_t	  disk_sz	= gib_cast(4),
+						  const char* out_name	= "disk.eimg") noexcept;
\ No newline at end of file
diff --git a/public/frameworks/DiskImage.fwrk/src/DiskImage.cc b/public/frameworks/DiskImage.fwrk/src/DiskImage.cc
index c992371b..d11cd45e 100644
--- a/public/frameworks/DiskImage.fwrk/src/DiskImage.cc
+++ b/public/frameworks/DiskImage.fwrk/src/DiskImage.cc
@@ -24,7 +24,7 @@ SInt32 DIFormatDiskToFile(const char* kDiskName,
 	block.SectorSz	= kDiskSectorSz;
 	block.Version	= kEPMRevisionBcd;
 	block.LbaStart	= sizeof(struct ::EPM_PART_BLOCK);
-	block.LbaEnd	= 0;
+	block.LbaEnd	= kDiskSz - block.LbaStart;
 	block.FsVersion = kNeFSVersionInteger;
 
 	::MmCopyMemory(block.Name, (VoidPtr)kDiskName, ::MmStrLen(kDiskName));
@@ -37,6 +37,7 @@ SInt32 DIFormatDiskToFile(const char* kDiskName,
 
 	struct ::NEFS_ROOT_PARTITION_BLOCK rpb
 	{
+		0
 	};
 
 	::MmCopyMemory(rpb.PartitionName, (VoidPtr)kDiskName, ::MmStrLen(kDiskName));
diff --git a/public/tools/make_app/Steps.h b/public/tools/make_app/Steps.h
index 83962da0..3b302eeb 100644
--- a/public/tools/make_app/Steps.h
+++ b/public/tools/make_app/Steps.h
@@ -10,7 +10,7 @@
 #include <Framework.h>
 
 #define kStepsExtension ".stp"
-#define kStepsStrLen (256U)
+#define kStepsStrLen	(256U)
 
 struct STEPS_COMMON_RECORD final
 {
diff --git a/public/tools/make_app/src/CommandLine.cc b/public/tools/make_app/src/CommandLine.cc
index 984251a5..49be4795 100644
--- a/public/tools/make_app/src/CommandLine.cc
+++ b/public/tools/make_app/src/CommandLine.cc
@@ -81,7 +81,7 @@ int main(int argc, char* argv[])
 
 			handle = nullptr;
 		}
-		
+
 		for (SInt32 i = 0; i < files.Count(); ++i)
 		{
 			auto& file = files[i];