diff options
Diffstat (limited to 'dev/ZKA/Sources')
| -rw-r--r-- | dev/ZKA/Sources/DriveMgr.cxx | 16 | ||||
| -rw-r--r-- | dev/ZKA/Sources/FS/NeFS.cxx | 14 | ||||
| -rw-r--r-- | dev/ZKA/Sources/KernelCheck.cxx | 6 |
3 files changed, 18 insertions, 18 deletions
diff --git a/dev/ZKA/Sources/DriveMgr.cxx b/dev/ZKA/Sources/DriveMgr.cxx index 5d0f7fc3..82291ada 100644 --- a/dev/ZKA/Sources/DriveMgr.cxx +++ b/dev/ZKA/Sources/DriveMgr.cxx @@ -58,7 +58,7 @@ namespace Kernel /// @brief Executes a disk check on the ATA drive. /// @param pckt /// @return - Void ke_drv_check_disk(DriveTrait::DrivePacket* pckt) + Void ke_drv_init(DriveTrait::DrivePacket* pckt) { if (!pckt) { @@ -84,21 +84,21 @@ namespace Kernel /// @param /// @return #ifdef __ATA_PIO__ - const Char* io_drive_kind(Void) + const Char* ke_drv_kind(Void) { return "ATA-PIO"; } #endif #ifdef __ATA_DMA__ - const Char* io_drive_kind(Void) + const Char* ke_drv_kind(Void) { return "ATA-DMA"; } #endif #ifdef __AHCI__ - const Char* io_drive_kind(Void) + const Char* ke_drv_kind(Void) { return "AHCI"; } @@ -124,7 +124,8 @@ namespace Kernel trait.fInput = io_drv_unimplemented; trait.fOutput = io_drv_unimplemented; trait.fVerify = io_drv_unimplemented; - trait.fDriveKind = io_drive_kind; + trait.fInit = io_drv_unimplemented; + trait.fDriveKind = ke_drv_kind; return trait; } @@ -140,8 +141,9 @@ namespace Kernel trait.fInput = ke_drv_input; trait.fOutput = ke_drv_output; - trait.fVerify = ke_drv_check_disk; - trait.fDriveKind = io_drive_kind; + trait.fVerify = io_drv_unimplemented; + trait.fInit = ke_drv_init; + trait.fDriveKind = ke_drv_kind; kcout << "Construct drive with success.\r"; diff --git a/dev/ZKA/Sources/FS/NeFS.cxx b/dev/ZKA/Sources/FS/NeFS.cxx index 9c33b78c..8bd467c6 100644 --- a/dev/ZKA/Sources/FS/NeFS.cxx +++ b/dev/ZKA/Sources/FS/NeFS.cxx @@ -790,9 +790,13 @@ _Output NFS_CATALOG_STRUCT* NeFSParser::FindCatalog(_Input const Char* catalogNa { delete parentCatalog; } + else + { + return nullptr; + } } - kcout << "fetching catalog...\r"; + kcout << "Fetching catalog...\r"; NeFSSearchThroughCatalogList: while (drive.fPacket.fPacketGood) @@ -980,7 +984,7 @@ VoidPtr NeFSParser::ReadCatalog(_Input _Output NFS_CATALOG_STRUCT* catalog, if (dataForkLba < kNeFSCatalogStartAddress) { - delete[] fs_buf; + delete fs_buf; return nullptr; } @@ -1038,11 +1042,11 @@ namespace Kernel::Detail sMountpointInterface.C() = io_construct_drive(); sMountpointInterface.D() = io_construct_drive(); - kcout << "Testing A:\r"; + kcout << "Constructing A:\r"; - sMountpointInterface.A().fVerify(&sMountpointInterface.A().fPacket); + sMountpointInterface.A().fInit(&sMountpointInterface.A().fPacket); - kcout << "Testing A: [ OK ]\r"; + kcout << "Constructing A: [ OK ]\r"; return true; } diff --git a/dev/ZKA/Sources/KernelCheck.cxx b/dev/ZKA/Sources/KernelCheck.cxx index 833ac6de..4c316c0b 100644 --- a/dev/ZKA/Sources/KernelCheck.cxx +++ b/dev/ZKA/Sources/KernelCheck.cxx @@ -138,12 +138,6 @@ namespace Kernel Void RecoveryFactory::Recover() noexcept { - if (NeFileSystemMgr::GetMounted()) - { - NeFileSystemMgr::GetMounted()->CreateSwapFile("\\Boot\\$DUMP"); - NeFileSystemMgr::GetMounted()->CreateSwapFile("\\Support\\$CHKDSK"); - } - PowerFactoryInterface power(nullptr); power.Reboot(); } |