summaryrefslogtreecommitdiffhomepage
path: root/public/frameworks/DiskImage.fwrk
diff options
context:
space:
mode:
authorAmlal <amlal@nekernel.org>2025-04-25 13:08:33 +0200
committerAmlal <amlal@nekernel.org>2025-04-25 13:08:33 +0200
commitfb790b07aeba8e22e4190cf3e1834d11ecde6c96 (patch)
tree4cec7d1b321307b1d5935577631dae116a658a37 /public/frameworks/DiskImage.fwrk
parent63a2d92c5dfe976175cda024ec01905d11b43738 (diff)
dev: better .clang-format, ran format command.
Signed-off-by: Amlal <amlal@nekernel.org>
Diffstat (limited to 'public/frameworks/DiskImage.fwrk')
-rw-r--r--public/frameworks/DiskImage.fwrk/headers/DiskImage.h76
-rw-r--r--public/frameworks/DiskImage.fwrk/src/DiskImage+EPM.cc51
-rw-r--r--public/frameworks/DiskImage.fwrk/src/DiskImage+NeFS.cc61
3 files changed, 86 insertions, 102 deletions
diff --git a/public/frameworks/DiskImage.fwrk/headers/DiskImage.h b/public/frameworks/DiskImage.fwrk/headers/DiskImage.h
index c0566485..78b39bf8 100644
--- a/public/frameworks/DiskImage.fwrk/headers/DiskImage.h
+++ b/public/frameworks/DiskImage.fwrk/headers/DiskImage.h
@@ -1,51 +1,49 @@
/* -------------------------------------------
- Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
+
+ FILE: DiskImage.h
+ PURPOSE: Disk Imaging framework.
- FILE: DiskImage.h
- PURPOSE: Disk Imaging framework.
-
------------------------------------------- */
#pragma once
#include <user/SystemCalls.h>
-#define kDISectorSz (512)
-#define kDIMinDiskSz mib_cast(1)
+#define kDISectorSz (512)
+#define kDIMinDiskSz mib_cast(1)
#define kDIDefaultOutputName "disk.eimg"
-#define kDIDefaultDiskName "Disk"
-#define kDISuccessStatus (0)
-#define kDIFailureStatus (1)
+#define kDIDefaultDiskName "Disk"
+#define kDISuccessStatus (0)
+#define kDIFailureStatus (1)
#define kDIDiskNameLen (16)
-#define kDIOutNameLen (256)
-
-namespace DI
-{
- /// @brief Disk Image file structure.
- /// @param disk_name Disk partition name.
- /// @param sector_sz Disk sector_sz.
- /// @param block_cnt Disk block count.
- /// @param disk_sz Disk size.
- /// @param out_name Output file name.
- struct DI_DISK_IMAGE
- {
- Char disk_name[kDIDiskNameLen] = kDIDefaultDiskName;
- SInt32 sector_sz = kDISectorSz;
- SInt32 block_cnt = 0;
- SizeT disk_sz = kDIMinDiskSz;
- Char out_name[kDIOutNameLen] = kDIDefaultOutputName;
- };
-
- /// @brief Format with an EPM partition.
- /// @param img disk image structure.
- /// @return Status code upon completion.
- SInt32 DIFormatPartitionEPM(struct DI_DISK_IMAGE& img) noexcept;
-
- /// @brief NeFS format over EPM.
- /// @param img disk image structure.
- /// @return Status code upon completion.
- SInt32 DIFormatFilesystemNeFS(struct DI_DISK_IMAGE& img) noexcept;
-
-} // namespace DI
+#define kDIOutNameLen (256)
+
+namespace DI {
+/// @brief Disk Image file structure.
+/// @param disk_name Disk partition name.
+/// @param sector_sz Disk sector_sz.
+/// @param block_cnt Disk block count.
+/// @param disk_sz Disk size.
+/// @param out_name Output file name.
+struct DI_DISK_IMAGE {
+ Char disk_name[kDIDiskNameLen] = kDIDefaultDiskName;
+ SInt32 sector_sz = kDISectorSz;
+ SInt32 block_cnt = 0;
+ SizeT disk_sz = kDIMinDiskSz;
+ Char out_name[kDIOutNameLen] = kDIDefaultOutputName;
+};
+
+/// @brief Format with an EPM partition.
+/// @param img disk image structure.
+/// @return Status code upon completion.
+SInt32 DIFormatPartitionEPM(struct DI_DISK_IMAGE& img) noexcept;
+
+/// @brief NeFS format over EPM.
+/// @param img disk image structure.
+/// @return Status code upon completion.
+SInt32 DIFormatFilesystemNeFS(struct DI_DISK_IMAGE& img) noexcept;
+
+} // namespace DI
diff --git a/public/frameworks/DiskImage.fwrk/src/DiskImage+EPM.cc b/public/frameworks/DiskImage.fwrk/src/DiskImage+EPM.cc
index 4d2a6694..a1182e64 100644
--- a/public/frameworks/DiskImage.fwrk/src/DiskImage+EPM.cc
+++ b/public/frameworks/DiskImage.fwrk/src/DiskImage+EPM.cc
@@ -1,53 +1,46 @@
/* -------------------------------------------
- Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
- FILE: DiskImage+EPM.cc
- PURPOSE: Disk Imaging framework.
+ FILE: DiskImage+EPM.cc
+ PURPOSE: Disk Imaging framework.
------------------------------------------- */
#include <DiskImage.fwrk/headers/DiskImage.h>
-#include <FirmwareKit/EPM.h>
#include <FSKit/NeFS.h>
+#include <FirmwareKit/EPM.h>
/// @brief EPM format disk
/// @param img disk image structure.
/// @return Status code upon completion.
-SInt32 DI::DIFormatPartitionEPM(struct DI_DISK_IMAGE& img) noexcept
-{
- if (!img.sector_sz || (img.sector_sz % 512 != 0))
- return kDIFailureStatus;
+SInt32 DI::DIFormatPartitionEPM(struct DI_DISK_IMAGE& img) noexcept {
+ if (!img.sector_sz || (img.sector_sz % 512 != 0)) return kDIFailureStatus;
- if (*img.out_name == 0 ||
- *img.disk_name == 0)
- return kDIFailureStatus;
+ if (*img.out_name == 0 || *img.disk_name == 0) return kDIFailureStatus;
- struct ::EPM_PART_BLOCK block
- {
- };
+ struct ::EPM_PART_BLOCK block {};
- block.NumBlocks = img.block_cnt;
- block.SectorSz = img.sector_sz;
- block.Version = kEPMRevisionBcd;
- block.LbaStart = sizeof(struct ::EPM_PART_BLOCK);
- block.LbaEnd = img.disk_sz - block.LbaStart;
- block.FsVersion = kNeFSVersionInteger;
+ block.NumBlocks = img.block_cnt;
+ block.SectorSz = img.sector_sz;
+ block.Version = kEPMRevisionBcd;
+ block.LbaStart = sizeof(struct ::EPM_PART_BLOCK);
+ block.LbaEnd = img.disk_sz - block.LbaStart;
+ block.FsVersion = kNeFSVersionInteger;
- ::MmCopyMemory(block.Name, (VoidPtr)img.disk_name, ::MmStrLen(img.disk_name));
- ::MmCopyMemory(block.Magic, (VoidPtr)kEPMMagic86, ::MmStrLen(kEPMMagic86));
+ ::MmCopyMemory(block.Name, (VoidPtr) img.disk_name, ::MmStrLen(img.disk_name));
+ ::MmCopyMemory(block.Magic, (VoidPtr) kEPMMagic86, ::MmStrLen(kEPMMagic86));
- IORef handle = IoOpenFile(img.out_name, nullptr);
+ IORef handle = IoOpenFile(img.out_name, nullptr);
- if (!handle)
- return kDIFailureStatus;
+ if (!handle) return kDIFailureStatus;
- ::IoWriteFile(handle, (Char*)&block, sizeof(struct ::EPM_PART_BLOCK));
+ ::IoWriteFile(handle, (Char*) &block, sizeof(struct ::EPM_PART_BLOCK));
- ::IoCloseFile(handle);
+ ::IoCloseFile(handle);
- handle = nullptr;
+ handle = nullptr;
- return kDISuccessStatus;
+ return kDISuccessStatus;
}
diff --git a/public/frameworks/DiskImage.fwrk/src/DiskImage+NeFS.cc b/public/frameworks/DiskImage.fwrk/src/DiskImage+NeFS.cc
index 4928c878..bee84cca 100644
--- a/public/frameworks/DiskImage.fwrk/src/DiskImage+NeFS.cc
+++ b/public/frameworks/DiskImage.fwrk/src/DiskImage+NeFS.cc
@@ -1,64 +1,57 @@
/* -------------------------------------------
- Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
+ Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
- FILE: DiskImage+NeFS.cc
- PURPOSE: Disk Imaging framework.
+ FILE: DiskImage+NeFS.cc
+ PURPOSE: Disk Imaging framework.
------------------------------------------- */
#include <DiskImage.fwrk/headers/DiskImage.h>
-#include <FirmwareKit/EPM.h>
#include <FSKit/NeFS.h>
+#include <FirmwareKit/EPM.h>
/// @brief NeFS format over EPM.
/// @param img disk image structure.
/// @return Status code upon completion.
-SInt32 DI::DIFormatFilesystemNeFS(struct DI_DISK_IMAGE& img) noexcept
-{
- if (!img.sector_sz || (img.sector_sz % 512 != 0))
- return kDIFailureStatus;
+SInt32 DI::DIFormatFilesystemNeFS(struct DI_DISK_IMAGE& img) noexcept {
+ if (!img.sector_sz || (img.sector_sz % 512 != 0)) return kDIFailureStatus;
- if (*img.out_name == 0 ||
- *img.disk_name == 0)
- return kDIFailureStatus;
+ if (*img.out_name == 0 || *img.disk_name == 0) return kDIFailureStatus;
- struct ::NEFS_ROOT_PARTITION_BLOCK rpb
- {
- };
+ struct ::NEFS_ROOT_PARTITION_BLOCK rpb {};
- ::MmCopyMemory(rpb.PartitionName, (VoidPtr)img.disk_name, ::MmStrLen(img.disk_name));
- ::MmCopyMemory(rpb.Ident, (VoidPtr)kNeFSIdent, ::MmStrLen(kNeFSIdent));
+ ::MmCopyMemory(rpb.PartitionName, (VoidPtr) img.disk_name, ::MmStrLen(img.disk_name));
+ ::MmCopyMemory(rpb.Ident, (VoidPtr) kNeFSIdent, ::MmStrLen(kNeFSIdent));
- rpb.Version = kNeFSVersionInteger;
- rpb.EpmBlock = kEPMBootBlockLba;
+ rpb.Version = kNeFSVersionInteger;
+ rpb.EpmBlock = kEPMBootBlockLba;
- rpb.StartCatalog = kNeFSCatalogStartAddress;
- rpb.CatalogCount = 0;
+ rpb.StartCatalog = kNeFSCatalogStartAddress;
+ rpb.CatalogCount = 0;
- rpb.DiskSize = img.disk_sz;
+ rpb.DiskSize = img.disk_sz;
- rpb.SectorSize = img.sector_sz;
- rpb.SectorCount = rpb.DiskSize / rpb.SectorSize;
+ rpb.SectorSize = img.sector_sz;
+ rpb.SectorCount = rpb.DiskSize / rpb.SectorSize;
- rpb.FreeSectors = rpb.SectorCount;
- rpb.FreeCatalog = rpb.DiskSize / sizeof(NEFS_CATALOG_STRUCT);
+ rpb.FreeSectors = rpb.SectorCount;
+ rpb.FreeCatalog = rpb.DiskSize / sizeof(NEFS_CATALOG_STRUCT);
- IORef handle = IoOpenFile(img.out_name, nullptr);
+ IORef handle = IoOpenFile(img.out_name, nullptr);
- if (!handle)
- return kDIFailureStatus;
+ if (!handle) return kDIFailureStatus;
- UInt64 p_prev = ::IoTellFile(handle);
+ UInt64 p_prev = ::IoTellFile(handle);
- ::IoWriteFile(handle, (Char*)&rpb, sizeof(struct ::NEFS_ROOT_PARTITION_BLOCK));
+ ::IoWriteFile(handle, (Char*) &rpb, sizeof(struct ::NEFS_ROOT_PARTITION_BLOCK));
- ::IoSeekFile(handle, p_prev);
+ ::IoSeekFile(handle, p_prev);
- ::IoCloseFile(handle);
+ ::IoCloseFile(handle);
- handle = nullptr;
+ handle = nullptr;
- return kDISuccessStatus;
+ return kDISuccessStatus;
} \ No newline at end of file