From ee433f2d1b077b51cf5c551111a7ae394e1c4eb1 Mon Sep 17 00:00:00 2001 From: Amlal Date: Tue, 25 Feb 2025 20:06:33 +0100 Subject: ADD: Remove BOOT_BLOCK_STRUCT, replace with EPM_PART_BLOCK. Signed-off-by: Amlal --- dev/Kernel/src/DriveMgr.cc | 2 +- dev/Kernel/src/FS/NeFS.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'dev/Kernel/src') diff --git a/dev/Kernel/src/DriveMgr.cc b/dev/Kernel/src/DriveMgr.cc index 2989d85e..5c5f853a 100644 --- a/dev/Kernel/src/DriveMgr.cc +++ b/dev/Kernel/src/DriveMgr.cc @@ -172,7 +172,7 @@ namespace NeOS trait.fInput(trait.fPacket); - if (rt_string_cmp(((BOOT_BLOCK_STRUCT*)trait.fPacket.fPacketContent)->Magic, kEPMMagic, kEPMMagicLength) == 0) + if (rt_string_cmp(((EPM_PART_BLOCK*)trait.fPacket.fPacketContent)->Magic, kEPMMagic, kEPMMagicLength) == 0) { trait.fPacket.fPacketReadOnly = NO; trait.fKind = kMassStorageDrive | kEPMDrive; diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc index 29427a2a..75414245 100644 --- a/dev/Kernel/src/FS/NeFS.cc +++ b/dev/Kernel/src/FS/NeFS.cc @@ -498,7 +498,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L // make it bootable when needed. Char buf_epm[kNeFSSectorSz] = {0}; - BOOT_BLOCK_STRUCT* epm_boot = (BOOT_BLOCK_STRUCT*)buf_epm; + EPM_PART_BLOCK* epm_boot = (EPM_PART_BLOCK*)buf_epm; // Write a new EPM entry. @@ -549,10 +549,10 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L } else { - prevStart = ((BOOT_BLOCK_STRUCT*)buf)->LbaStart + ((BOOT_BLOCK_STRUCT*)buf)->LbaEnd; + prevStart = ((EPM_PART_BLOCK*)buf)->LbaStart + ((EPM_PART_BLOCK*)buf)->LbaEnd; } - outEpmLba += sizeof(BOOT_BLOCK_STRUCT); + outEpmLba += sizeof(EPM_PART_BLOCK); ++cnt; } } -- cgit v1.2.3