From d07077d0cfb36f5b3df5a8ab38ac5c8ff32a1d3d Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Mon, 10 Feb 2025 15:31:49 +0100 Subject: ADD TWEAKS TO KERNEL. Signed-off-by: Amlal El Mahrouss --- dev/Kernel/src/FS/NeFS.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'dev/Kernel/src/FS') diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc index f8938444..91c6820e 100644 --- a/dev/Kernel/src/FS/NeFS.cc +++ b/dev/Kernel/src/FS/NeFS.cc @@ -449,13 +449,12 @@ _Output NEFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char /// @return If it was sucessful, see err_global_get(). bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const Lba endLba, _Input const Int32 flags, const Char* part_name) { -#ifdef NE_EPM_SUPPORT if (*part_name == 0 || endLba == 0) return false; // verify disk. - drive->fVerify(&drive->fPacket); + drive->fVerify(drive->fPacket); rt_copy_memory((VoidPtr) "fs/nefs-packet", drive->fPacket.fPacketMime, rt_string_len("fs/nefs-packet")); @@ -475,7 +474,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L drive->fPacket.fPacketSize = sizeof(NEFS_ROOT_PARTITION_BLOCK); drive->fPacket.fPacketLba = start; - drive->fInput(&drive->fPacket); + drive->fInput(drive->fPacket); if (flags & kNeFSPartitionTypeBoot) { @@ -511,7 +510,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L drive->fPacket.fPacketSize = sizeof(EPM_PART_BLOCK); drive->fPacket.fPacketLba = outEpmLba; - drive->fInput(&drive->fPacket); + drive->fInput(drive->fPacket); if (buf[0] == 0) { @@ -527,7 +526,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L drive->fPacket.fPacketSize = sizeof(EPM_PART_BLOCK); drive->fPacket.fPacketLba = outEpmLba; - drive->fOutput(&drive->fPacket); + drive->fOutput(drive->fPacket); break; } @@ -579,7 +578,7 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L drive->fPacket.fPacketSize = sizeof(NEFS_ROOT_PARTITION_BLOCK); drive->fPacket.fPacketLba = kNeFSRootCatalogStartAddress; - drive->fOutput(&drive->fPacket); + drive->fOutput(drive->fPacket); kout << "drive kind: " << drive->fDriveKind() << endl; @@ -604,9 +603,8 @@ bool NeFileSystemParser::Format(_Input _Output DriveTrait* drive, _Input const L drive->fPacket.fPacketSize = sizeof(NEFS_ROOT_PARTITION_BLOCK); drive->fPacket.fPacketLba = start; - drive->fInput(&drive->fPacket); + drive->fInput(drive->fPacket); } -#endif // NE_EPM_SUPPORT return false; } @@ -785,7 +783,7 @@ _Output NEFS_CATALOG_STRUCT* NeFileSystemParser::FindCatalog(_Input const Char* NEFS_CATALOG_STRUCT temporary_catalog{}; kNeFSSearchThroughCatalogList: - while (YES) + while (drive.fPacket.fPacketGood || !drive.fPacket.fPacketReadOnly) { drive.fPacket.fPacketLba = start_catalog_lba; drive.fPacket.fPacketContent = &temporary_catalog; -- cgit v1.2.3