diff options
| author | Amlal El Mahrouss <amlalelmahrouss@icloud.com> | 2024-02-02 09:13:50 +0000 |
|---|---|---|
| committer | Amlal El Mahrouss <amlalelmahrouss@icloud.com> | 2024-02-02 09:13:50 +0000 |
| commit | f08c864e988f6f1f01985910955755220b37ecc8 (patch) | |
| tree | 174a79ebbdd869e543df9d2aa97aea0343c84725 /Private/KernelKit | |
| parent | 5c59cd35a2fa3e620542b73e8c3f66f0dccd241c (diff) | |
| parent | df77fd9586cb305a738d5b4dfcdbe67177e3de3f (diff) | |
Merge branch 'HCR-9-add-support-for-file-load-hel-amd64' into 'trunk'
Merge Fixes and WiP Bootloader.
See merge request mahrouss-logic/micro-kernel!3
Diffstat (limited to 'Private/KernelKit')
| -rw-r--r-- | Private/KernelKit/PCI/Express.hpp | 4 | ||||
| -rw-r--r-- | Private/KernelKit/PCI/IO-Impl-AMD64.inl | 15 | ||||
| -rw-r--r-- | Private/KernelKit/ProcessManager.hpp | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/Private/KernelKit/PCI/Express.hpp b/Private/KernelKit/PCI/Express.hpp index 45676c23..8b46fbeb 100644 --- a/Private/KernelKit/PCI/Express.hpp +++ b/Private/KernelKit/PCI/Express.hpp @@ -9,4 +9,6 @@ #pragma once -#include <NewKit/Defines.hpp>
\ No newline at end of file +#include <NewKit/Defines.hpp> + +#define PCI_EXPRESS_BUS_COUNT (4096) diff --git a/Private/KernelKit/PCI/IO-Impl-AMD64.inl b/Private/KernelKit/PCI/IO-Impl-AMD64.inl index c5247d13..f720f2b6 100644 --- a/Private/KernelKit/PCI/IO-Impl-AMD64.inl +++ b/Private/KernelKit/PCI/IO-Impl-AMD64.inl @@ -7,7 +7,8 @@ Revision History: - 30/01/24: Added file (amlel) + 30/01/24: Add file. (amlel) + 02/02/24: Update I/O routines. (amlel) ------------------------------------------- */ @@ -17,11 +18,11 @@ template <typename T> T IOArray<Sz>::In(SizeT index) { switch (sizeof(T)) { case 4: - return HAL::in32(m_Ports[index].Leak()); + return HAL::In32(m_Ports[index].Leak()); case 2: - return HAL::in16(m_Ports[index].Leak()); + return HAL::In16(m_Ports[index].Leak()); case 1: - return HAL::in8(m_Ports[index].Leak()); + return HAL::In8(m_Ports[index].Leak()); default: return 0xFFFF; } @@ -33,11 +34,11 @@ void IOArray<Sz>::Out(SizeT index, T value) { switch (sizeof(T)) { #ifdef __x86_64__ case 4: - HAL::out32(m_Ports[index].Leak(), value); + HAL::Out32(m_Ports[index].Leak(), value); case 2: - HAL::out16(m_Ports[index].Leak(), value); + HAL::Out16(m_Ports[index].Leak(), value); case 1: - HAL::out8(m_Ports[index].Leak(), value); + HAL::Out8(m_Ports[index].Leak(), value); #endif default: break; diff --git a/Private/KernelKit/ProcessManager.hpp b/Private/KernelKit/ProcessManager.hpp index dbcd08b2..5637dd6f 100644 --- a/Private/KernelKit/ProcessManager.hpp +++ b/Private/KernelKit/ProcessManager.hpp @@ -16,8 +16,6 @@ #include <NewKit/MutableArray.hpp> #include <NewKit/UserHeap.hpp> -#include "NewKit/Defines.hpp" - #define kMinMicroTime AffinityKind::kStandard //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |