diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-08-23 18:20:04 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-08-23 18:20:04 +0200 |
| commit | bac8c9a8306e1582ef24ba68a412a29674c97775 (patch) | |
| tree | 956155581fdb44fb6c82673a5f71a00cc6f4c89c /dev/ZKA/KernelKit | |
| parent | 73e0c81b5c8325db7aaec773fcc657f3ef50b0b8 (diff) | |
[IMP/WIP] AHCI disk driver for kernel DLL.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/ZKA/KernelKit')
| -rw-r--r-- | dev/ZKA/KernelKit/DebugOutput.hxx | 2 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/DriveManager.hxx | 2 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/FileManager.hxx | 4 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/LoaderInterface.hxx | 2 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/MP.hxx | 4 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/PCI/Device.hxx | 5 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/PCI/Iterator.hxx | 8 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/PEFCodeManager.hxx | 2 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/PEFSharedObject.hxx | 2 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/ProcessScheduler.hxx | 6 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/Semaphore.hxx | 2 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/Timer.hxx | 6 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/User.hxx | 4 |
13 files changed, 25 insertions, 24 deletions
diff --git a/dev/ZKA/KernelKit/DebugOutput.hxx b/dev/ZKA/KernelKit/DebugOutput.hxx index b8fd97dd..fcf18bff 100644 --- a/dev/ZKA/KernelKit/DebugOutput.hxx +++ b/dev/ZKA/KernelKit/DebugOutput.hxx @@ -51,7 +51,7 @@ namespace Kernel return ("TerminalDevice"); } - NEWOS_COPY_DEFAULT(TerminalDevice); + ZKA_COPY_DEFAULT(TerminalDevice); STATIC TerminalDevice The() noexcept; }; diff --git a/dev/ZKA/KernelKit/DriveManager.hxx b/dev/ZKA/KernelKit/DriveManager.hxx index 6485f995..6df3d3b0 100644 --- a/dev/ZKA/KernelKit/DriveManager.hxx +++ b/dev/ZKA/KernelKit/DriveManager.hxx @@ -78,7 +78,7 @@ namespace Kernel explicit MountpointInterface() = default; ~MountpointInterface() = default; - NEWOS_COPY_DEFAULT(MountpointInterface); + ZKA_COPY_DEFAULT(MountpointInterface); public: DriveTrait& A() diff --git a/dev/ZKA/KernelKit/FileManager.hxx b/dev/ZKA/KernelKit/FileManager.hxx index 3ac3fe3b..af33208a 100644 --- a/dev/ZKA/KernelKit/FileManager.hxx +++ b/dev/ZKA/KernelKit/FileManager.hxx @@ -78,7 +78,7 @@ namespace Kernel virtual ~FilesystemManagerInterface() = default; public: - NEWOS_COPY_DEFAULT(FilesystemManagerInterface); + ZKA_COPY_DEFAULT(FilesystemManagerInterface); public: /// @brief Mounts a new filesystem into an active state. @@ -143,7 +143,7 @@ namespace Kernel ~NewFilesystemManager() override; public: - NEWOS_COPY_DEFAULT(NewFilesystemManager); + ZKA_COPY_DEFAULT(NewFilesystemManager); public: NodePtr Create(const Char* path) override; diff --git a/dev/ZKA/KernelKit/LoaderInterface.hxx b/dev/ZKA/KernelKit/LoaderInterface.hxx index ceb7d528..816b6897 100644 --- a/dev/ZKA/KernelKit/LoaderInterface.hxx +++ b/dev/ZKA/KernelKit/LoaderInterface.hxx @@ -21,7 +21,7 @@ namespace Kernel explicit LoaderInterface() = default; virtual ~LoaderInterface() = default; - NEWOS_COPY_DEFAULT(LoaderInterface); + ZKA_COPY_DEFAULT(LoaderInterface); public: virtual _Output const Char* AsString() = 0; diff --git a/dev/ZKA/KernelKit/MP.hxx b/dev/ZKA/KernelKit/MP.hxx index bc94102e..0194e8dd 100644 --- a/dev/ZKA/KernelKit/MP.hxx +++ b/dev/ZKA/KernelKit/MP.hxx @@ -49,7 +49,7 @@ namespace Kernel ~HardwareThread(); public: - NEWOS_COPY_DEFAULT(HardwareThread) + ZKA_COPY_DEFAULT(HardwareThread) public: operator bool(); @@ -92,7 +92,7 @@ namespace Kernel public: ~HardwareThreadScheduler(); - NEWOS_COPY_DEFAULT(HardwareThreadScheduler); + ZKA_COPY_DEFAULT(HardwareThreadScheduler); public: bool Switch(HAL::StackFramePtr the); diff --git a/dev/ZKA/KernelKit/PCI/Device.hxx b/dev/ZKA/KernelKit/PCI/Device.hxx index a562219a..b1c011e9 100644 --- a/dev/ZKA/KernelKit/PCI/Device.hxx +++ b/dev/ZKA/KernelKit/PCI/Device.hxx @@ -22,7 +22,7 @@ namespace Kernel::PCI Device() = default; public: - explicit Device(UShort bus, UShort device, UShort function, UShort bar); + explicit Device(UShort bus, UShort device, UShort function, UInt32 bar); Device& operator=(const Device&) = default; @@ -60,6 +60,7 @@ namespace Kernel::PCI UChar Subclass(); UChar ProgIf(); UChar HeaderType(); + UInt32 Bar(); public: void EnableMmio(); @@ -71,7 +72,7 @@ namespace Kernel::PCI UShort fBus; UShort fDevice; UShort fFunction; - UShort fBar; + UInt32 fBar; }; } // namespace Kernel::PCI diff --git a/dev/ZKA/KernelKit/PCI/Iterator.hxx b/dev/ZKA/KernelKit/PCI/Iterator.hxx index 5f2ca089..cad8f09f 100644 --- a/dev/ZKA/KernelKit/PCI/Iterator.hxx +++ b/dev/ZKA/KernelKit/PCI/Iterator.hxx @@ -13,9 +13,9 @@ #include <NewKit/Defines.hxx> #include <NewKit/Ref.hxx> -#define NEWOS_BUS_COUNT (256) -#define NEWOS_DEVICE_COUNT (33) -#define NEWOS_FUNCTION_COUNT (8) +#define ZKA_BUS_COUNT (256) +#define ZKA_DEVICE_COUNT (33) +#define ZKA_FUNCTION_COUNT (8) namespace Kernel::PCI { @@ -36,7 +36,7 @@ namespace Kernel::PCI Ref<PCI::Device> operator[](const Size& sz); private: - Array<PCI::Device, NEWOS_BUS_COUNT> fDevices; + Array<PCI::Device, ZKA_BUS_COUNT> fDevices; }; } // namespace Kernel::PCI diff --git a/dev/ZKA/KernelKit/PEFCodeManager.hxx b/dev/ZKA/KernelKit/PEFCodeManager.hxx index db01d23c..2935f709 100644 --- a/dev/ZKA/KernelKit/PEFCodeManager.hxx +++ b/dev/ZKA/KernelKit/PEFCodeManager.hxx @@ -31,7 +31,7 @@ namespace Kernel ~PEFLoader() override; public: - NEWOS_COPY_DEFAULT(PEFLoader); + ZKA_COPY_DEFAULT(PEFLoader); public: const Char* Path() override; diff --git a/dev/ZKA/KernelKit/PEFSharedObject.hxx b/dev/ZKA/KernelKit/PEFSharedObject.hxx index 690f0b5d..48b70508 100644 --- a/dev/ZKA/KernelKit/PEFSharedObject.hxx +++ b/dev/ZKA/KernelKit/PEFSharedObject.hxx @@ -40,7 +40,7 @@ namespace Kernel ~PEFSharedObjectInterface() = default; public: - NEWOS_COPY_DEFAULT(PEFSharedObjectInterface); + ZKA_COPY_DEFAULT(PEFSharedObjectInterface); private: PEF_SHARED_OBJECT_TRAITS* fMounted{nullptr}; diff --git a/dev/ZKA/KernelKit/ProcessScheduler.hxx b/dev/ZKA/KernelKit/ProcessScheduler.hxx index c74dee6a..810886ab 100644 --- a/dev/ZKA/KernelKit/ProcessScheduler.hxx +++ b/dev/ZKA/KernelKit/ProcessScheduler.hxx @@ -136,7 +136,7 @@ namespace Kernel ~PROCESS_HEADER_BLOCK() = default; - NEWOS_COPY_DEFAULT(PROCESS_HEADER_BLOCK) + ZKA_COPY_DEFAULT(PROCESS_HEADER_BLOCK) public: void SetEntrypoint(UIntPtr& imageStart) noexcept; @@ -229,7 +229,7 @@ namespace Kernel explicit ProcessTeam() = default; ~ProcessTeam() = default; - NEWOS_COPY_DEFAULT(ProcessTeam); + ZKA_COPY_DEFAULT(ProcessTeam); MutableArray<Ref<PROCESS_HEADER_BLOCK>>& AsArray(); Ref<PROCESS_HEADER_BLOCK>& AsRef(); @@ -252,7 +252,7 @@ namespace Kernel public: ~ProcessScheduler() = default; - NEWOS_COPY_DEFAULT(ProcessScheduler) + ZKA_COPY_DEFAULT(ProcessScheduler) operator bool(); bool operator!(); diff --git a/dev/ZKA/KernelKit/Semaphore.hxx b/dev/ZKA/KernelKit/Semaphore.hxx index efef472a..7f6b2001 100644 --- a/dev/ZKA/KernelKit/Semaphore.hxx +++ b/dev/ZKA/KernelKit/Semaphore.hxx @@ -35,7 +35,7 @@ namespace Kernel bool LockOrWait(PROCESS_HEADER_BLOCK* process, TimerInterface* timer); public: - NEWOS_COPY_DEFAULT(Semaphore); + ZKA_COPY_DEFAULT(Semaphore); private: ProcessHeaderRef fLockingProcess{nullptr}; diff --git a/dev/ZKA/KernelKit/Timer.hxx b/dev/ZKA/KernelKit/Timer.hxx index 603cacff..e6afd454 100644 --- a/dev/ZKA/KernelKit/Timer.hxx +++ b/dev/ZKA/KernelKit/Timer.hxx @@ -23,7 +23,7 @@ namespace Kernel virtual ~TimerInterface() = default; public: - NEWOS_COPY_DEFAULT(TimerInterface); + ZKA_COPY_DEFAULT(TimerInterface); public: virtual Int32 Wait() noexcept; @@ -36,7 +36,7 @@ namespace Kernel ~SoftwareTimer() override; public: - NEWOS_COPY_DEFAULT(SoftwareTimer); + ZKA_COPY_DEFAULT(SoftwareTimer); public: Int32 Wait() noexcept override; @@ -53,7 +53,7 @@ namespace Kernel ~HardwareTimer() override; public: - NEWOS_COPY_DEFAULT(HardwareTimer); + ZKA_COPY_DEFAULT(HardwareTimer); public: Int32 Wait() noexcept override; diff --git a/dev/ZKA/KernelKit/User.hxx b/dev/ZKA/KernelKit/User.hxx index 0aec93ad..ddc422c3 100644 --- a/dev/ZKA/KernelKit/User.hxx +++ b/dev/ZKA/KernelKit/User.hxx @@ -49,7 +49,7 @@ namespace Kernel ~User(); public: - NEWOS_COPY_DEFAULT(User) + ZKA_COPY_DEFAULT(User) public: bool operator==(const User& lhs); @@ -90,7 +90,7 @@ namespace Kernel User* fRootUser{nullptr}; public: - NEWOS_COPY_DELETE(UserManager); + ZKA_COPY_DELETE(UserManager); STATIC UserManager* The() noexcept; Bool TryLogIn(User& user, const Char* password, const Char* right_password) noexcept; |
