diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2025-02-07 09:25:08 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2025-02-07 09:25:08 +0100 |
| commit | 513077cfec0ea87303ba19502c368f5adcc8ed99 (patch) | |
| tree | 8ed03e4ebbd78366b7e8ce6c3647e990261d521d /dev/Kernel/src | |
| parent | d282d5301dcc7d46c2d9a40a71eecfc1f674b107 (diff) | |
ADD: VGA logging and tweaks.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/Kernel/src')
| -rw-r--r-- | dev/Kernel/src/FS/NeFS.cc | 22 | ||||
| -rw-r--r-- | dev/Kernel/src/Json.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/src/MemoryMgr.cc | 14 | ||||
| -rw-r--r-- | dev/Kernel/src/User.cc | 2 |
4 files changed, 14 insertions, 26 deletions
diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc index d954230d..418cc7cc 100644 --- a/dev/Kernel/src/FS/NeFS.cc +++ b/dev/Kernel/src/FS/NeFS.cc @@ -150,7 +150,7 @@ _Output BOOL NeFileSystemParser::CreateFork(_Input NFS_FORK_STRUCT& the_fork) /// log what we have now. kout << "Fork offset is at: " << hex_number(the_fork.DataOffset) - << endl; + << endl; kout << "Wrote fork metadata at: " << hex_number(lba) << endl; @@ -413,9 +413,9 @@ _Output NFS_CATALOG_STRUCT* NeFileSystemParser::CreateCatalog(_Input const Char* drive.fOutput(drive.fPacket); kout << "Create new catalog with flags: " - << hex_number(child_catalog->Flags) << endl; + << hex_number(child_catalog->Flags) << endl; kout << "Create new catalog with name: " << child_catalog->Name - << endl; + << endl; delete catalog; catalog = nullptr; @@ -944,7 +944,7 @@ VoidPtr NeFileSystemParser::ReadCatalog(_Input _Output NFS_CATALOG_STRUCT* catal { if (!catalog) { - err_global_get() = kErrorFileNotFound; + err_global_get() = kErrorInvalidData; return nullptr; } @@ -952,7 +952,7 @@ VoidPtr NeFileSystemParser::ReadCatalog(_Input _Output NFS_CATALOG_STRUCT* catal Size dataForkSize = (!is_rsrc_fork) ? catalog->DataForkSize : catalog->ResourceForkSize; kout << "catalog " << catalog->Name - << ", fork: " << hex_number(dataForkLba) << endl; + << ", fork: " << hex_number(dataForkLba) << endl; NFS_FORK_STRUCT* fs_buf = new NFS_FORK_STRUCT(); auto drive = kMountpoint.A(); @@ -1000,12 +1000,6 @@ VoidPtr NeFileSystemParser::ReadCatalog(_Input _Output NFS_CATALOG_STRUCT* catal bool NeFileSystemParser::Seek(_Input _Output NFS_CATALOG_STRUCT* catalog, SizeT off) { - if (!catalog) - { - err_global_get() = kErrorFileNotFound; - return false; - } - err_global_get() = kErrorUnimplemented; return false; } @@ -1018,12 +1012,6 @@ bool NeFileSystemParser::Seek(_Input _Output NFS_CATALOG_STRUCT* catalog, SizeT SizeT NeFileSystemParser::Tell(_Input _Output NFS_CATALOG_STRUCT* catalog) { - if (!catalog) - { - err_global_get() = kErrorFileNotFound; - return 0; - } - err_global_get() = kErrorUnimplemented; return 0; } diff --git a/dev/Kernel/src/Json.cc b/dev/Kernel/src/Json.cc index 47f6f3f3..2e0a1465 100644 --- a/dev/Kernel/src/Json.cc +++ b/dev/Kernel/src/Json.cc @@ -7,4 +7,4 @@ #include <NewKit/Json.h> /// @brief Undefined object, is null in length. -RTL_INIT_OBJECT(Kernel::JSON::kNull, Kernel::JSON); +RTL_INIT_OBJECT(Kernel::Json::kNull, Kernel::Json); diff --git a/dev/Kernel/src/MemoryMgr.cc b/dev/Kernel/src/MemoryMgr.cc index bdaec674..989a4e95 100644 --- a/dev/Kernel/src/MemoryMgr.cc +++ b/dev/Kernel/src/MemoryMgr.cc @@ -24,7 +24,7 @@ //! @file Heap.cc //! @brief This Heap algorithm serves as the main memory manager. -#define kKernelHeapMagic (0xD4D7D5) +#define kKernelHeapMagic (0xD4D75) #define kKernelHeapAlignSz (__BIGGEST_ALIGNMENT__) namespace Kernel @@ -40,25 +40,25 @@ namespace Kernel struct PACKED HEAP_INFORMATION_BLOCK final { ///! @brief 32-bit value which contains the magic number of the heap. - UInt64 fMagic; + UInt32 fMagic : 24; ///! @brief Is the heap present? - Boolean fPresent : 1; + UInt8 fPresent : 1; /// @brief Is this valued owned by the user? - Boolean fWriteRead : 1; + UInt8 fWriteRead : 1; /// @brief Is this valued owned by the user? - Boolean fUser : 1; + UInt8 fUser : 1; /// @brief Is this a page pointer? - Boolean fPage : 1; + UInt8 fPage : 1; /// @brief 32-bit CRC checksum. UInt32 fCRC32; /// @brief 64-bit Allocation flags. - UInt64 fFlags; + UInt16 fFlags; /// @brief 64-bit pointer size. SizeT fSize; diff --git a/dev/Kernel/src/User.cc b/dev/Kernel/src/User.cc index f42ca69a..e8ed9be6 100644 --- a/dev/Kernel/src/User.cc +++ b/dev/Kernel/src/User.cc @@ -1,7 +1,7 @@ /* * ======================================================== * - * ZKA + * NeKernel * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved., all rights reserved. * * File: User.cc |
