diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2025-03-09 06:07:31 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2025-03-09 06:07:31 +0100 |
| commit | 2299687dec9010df6bb5630057435280b98f90d9 (patch) | |
| tree | 079c2bd8a601b7619b5793be360095cec0e87841 /public | |
| parent | eab0c97a968cc4c0aa77c61185df25884a99357f (diff) | |
RAN format command, and fix DiskImage framework.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'public')
| -rw-r--r-- | public/frameworks/DiskImage.fwrk/headers/DiskImage.h | 10 | ||||
| -rw-r--r-- | public/frameworks/DiskImage.fwrk/src/DiskImage.cc | 3 | ||||
| -rw-r--r-- | public/tools/make_app/Steps.h | 2 | ||||
| -rw-r--r-- | public/tools/make_app/src/CommandLine.cc | 2 |
4 files changed, 9 insertions, 8 deletions
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]; |