diff options
| author | Amlal EL Mahrouss. <113760121+amlel-el-mahrouss@users.noreply.github.com> | 2024-11-26 15:41:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-26 15:41:56 +0100 |
| commit | f05ac8c656f3dccd79e7b3a276c86f08be2bb9f7 (patch) | |
| tree | 8d9307c53d6ba28d321f3469cf933bf076d92d23 /dev/ZKAKit/KernelKit | |
| parent | f71dee9aae7f590caf77d226e694b8224c9c1e22 (diff) | |
| parent | 476e896ba9169b4b71c1e80d3e44dd006934b3e5 (diff) | |
Merge pull request #4 from ELMH-Group/unstable
Unstable
Diffstat (limited to 'dev/ZKAKit/KernelKit')
| -rw-r--r-- | dev/ZKAKit/KernelKit/DriveMgr.h | 29 | ||||
| -rw-r--r-- | dev/ZKAKit/KernelKit/IDLLObject.h | 7 | ||||
| -rw-r--r-- | dev/ZKAKit/KernelKit/IPEFDLLObject.h | 4 | ||||
| -rw-r--r-- | dev/ZKAKit/KernelKit/ThreadLocalStorage.h | 10 | ||||
| -rw-r--r-- | dev/ZKAKit/KernelKit/UserProcessScheduler.h | 1 |
5 files changed, 32 insertions, 19 deletions
diff --git a/dev/ZKAKit/KernelKit/DriveMgr.h b/dev/ZKAKit/KernelKit/DriveMgr.h index e3955a39..a630180b 100644 --- a/dev/ZKAKit/KernelKit/DriveMgr.h +++ b/dev/ZKAKit/KernelKit/DriveMgr.h @@ -93,36 +93,48 @@ namespace Kernel { return mA; } + DriveTrait& B() { return mB; } + DriveTrait& C() { return mC; } + DriveTrait& D() { return mD; } - DriveTraitPtr GetAddressOf(Int32 index) + enum + { + kDriveIndexA = 0, + kDriveIndexB, + kDriveIndexC, + kDriveIndexD, + kDriveIndexInvalid, + }; + + DriveTraitPtr GetAddressOf(const Int32& index) { ErrLocal() = kErrorSuccess; switch (index) { - case 0: + case kDriveIndexA: return &mA; - case 1: + case kDriveIndexB: return &mB; - case 2: + case kDriveIndexC: return &mC; - case 3: + case kDriveIndexD: return &mD; default: { ErrLocal() = kErrorNoSuchDisk; - kcout << "No such disk.\n"; + kcout << "No such disk index.\n"; break; } @@ -133,15 +145,16 @@ namespace Kernel private: DriveTrait mA, mB, mC, mD; + }; /// @brief Unimplemented drive. - /// @param pckt + /// @param pckt the packet to read. /// @return Void io_drv_unimplemented(DriveTrait::DrivePacket* pckt); /// @brief Gets the drive kind (ATA, SCSI, AHCI...) - /// @param + /// @param void none. /// @return the drive kind (ATA, Flash, NVM) const Char* io_drv_kind(Void); diff --git a/dev/ZKAKit/KernelKit/IDLLObject.h b/dev/ZKAKit/KernelKit/IDLLObject.h index 81b43ae8..bf336267 100644 --- a/dev/ZKAKit/KernelKit/IDLLObject.h +++ b/dev/ZKAKit/KernelKit/IDLLObject.h @@ -14,6 +14,7 @@ namespace Kernel { + /// @brief DLL class object. A handle to a shared library. class IDLLObject { public: @@ -22,12 +23,12 @@ namespace Kernel struct DLL_TRAITS final { - VoidPtr fImageObject{nullptr}; - VoidPtr fImageEntrypointOffset{nullptr}; + VoidPtr ImageObject{nullptr}; + VoidPtr ImageEntrypointOffset{nullptr}; Bool IsValid() { - return fImageObject && fImageEntrypointOffset; + return ImageObject && ImageEntrypointOffset; } }; diff --git a/dev/ZKAKit/KernelKit/IPEFDLLObject.h b/dev/ZKAKit/KernelKit/IPEFDLLObject.h index 64e5c2fd..450b3a13 100644 --- a/dev/ZKAKit/KernelKit/IPEFDLLObject.h +++ b/dev/ZKAKit/KernelKit/IPEFDLLObject.h @@ -48,7 +48,7 @@ namespace Kernel public: void Mount(DLL_TRAITS* to_mount) { - if (!to_mount || !to_mount->fImageObject) + if (!to_mount || !to_mount->ImageObject) return; fMounted = to_mount; @@ -61,7 +61,7 @@ namespace Kernel if (!fLoader) { - fLoader = new PEFLoader(fMounted->fImageObject); + fLoader = new PEFLoader(fMounted->ImageObject); } } diff --git a/dev/ZKAKit/KernelKit/ThreadLocalStorage.h b/dev/ZKAKit/KernelKit/ThreadLocalStorage.h index 680a10ed..808951a2 100644 --- a/dev/ZKAKit/KernelKit/ThreadLocalStorage.h +++ b/dev/ZKAKit/KernelKit/ThreadLocalStorage.h @@ -4,8 +4,8 @@ ------------------------------------------- */ -#ifndef _KERNELKIT_TLS_H -#define _KERNELKIT_TLS_H +#ifndef KERNELKIT_TLS_H +#define KERNELKIT_TLS_H #include <NewKit/Defines.h> @@ -23,8 +23,8 @@ struct THREAD_INFORMATION_BLOCK; /// Located in GS on AMD64, other architectures have their own stuff. (64x0, 32x0, ARM64) struct PACKED THREAD_INFORMATION_BLOCK final { - Kernel::Char f_Cookie[kTLSCookieLen]{0}; //! Thread magic number. - Kernel::VoidPtr f_ThreadRecord{nullptr}; //! Thread information record. + Kernel::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. + Kernel::VoidPtr Record{nullptr}; //! Thread information record. }; ///! @brief Cookie Sanity check. @@ -51,4 +51,4 @@ EXTERN_C Kernel::Bool tls_check_syscall_impl(Kernel::VoidPtr TIB) noexcept; // last rev 7/7/24 -#endif /* ifndef _KERNELKIT_TLS_H */ +#endif /* ifndef KERNELKIT_TLS_H */ diff --git a/dev/ZKAKit/KernelKit/UserProcessScheduler.h b/dev/ZKAKit/KernelKit/UserProcessScheduler.h index fd9d6455..545acf6d 100644 --- a/dev/ZKAKit/KernelKit/UserProcessScheduler.h +++ b/dev/ZKAKit/KernelKit/UserProcessScheduler.h @@ -50,7 +50,6 @@ namespace Kernel kRunning, kKilled, kFrozen, - KFinishing, kFinished, kCount, }; |
