From 8eee31685e4334415870bb00b11b6b0d29821f10 Mon Sep 17 00:00:00 2001 From: Amlal Date: Tue, 23 Jul 2024 09:03:11 +0200 Subject: [MHR-36] NVME driver improvements, add RLE flag for NewFS. NVME: - Rename NVME.hxx to Defines.hxx, inside NVME module. NewFS: - Add RLE flag to NewFS. Which marks catalog as compressed. Meta: - Remove unused headers. - Use Mahrouss API version for kernel version. Signed-off-by: Amlal --- Kernel/KernelKit/PCI/Iterator.hpp | 7 ++++- Kernel/KernelKit/PCI/PCI.hpp | 58 -------------------------------------- Kernel/KernelKit/PCI/PCI.hxx | 59 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 59 deletions(-) delete mode 100644 Kernel/KernelKit/PCI/PCI.hpp create mode 100644 Kernel/KernelKit/PCI/PCI.hxx (limited to 'Kernel/KernelKit') diff --git a/Kernel/KernelKit/PCI/Iterator.hpp b/Kernel/KernelKit/PCI/Iterator.hpp index 0d6d894c..8c2df3b4 100644 --- a/Kernel/KernelKit/PCI/Iterator.hpp +++ b/Kernel/KernelKit/PCI/Iterator.hpp @@ -1,3 +1,9 @@ +/* ------------------------------------------- + + Copyright ZKA Technologies + +------------------------------------------- */ + #ifndef __PCI_ITERATOR_HPP__ #define __PCI_ITERATOR_HPP__ @@ -22,7 +28,6 @@ namespace Kernel::PCI explicit Iterator(const Types::PciDeviceKind& deviceType); Iterator& operator=(const Iterator&) = default; - Iterator(const Iterator&) = default; ~Iterator(); diff --git a/Kernel/KernelKit/PCI/PCI.hpp b/Kernel/KernelKit/PCI/PCI.hpp deleted file mode 100644 index b2d54a34..00000000 --- a/Kernel/KernelKit/PCI/PCI.hpp +++ /dev/null @@ -1,58 +0,0 @@ -/* ------------------------------------------- - - Copyright ZKA Technologies - -------------------------------------------- */ -#pragma once - -#include - -#define PCI_CONFIG_ADDRESS (0xCF8) -#define PCI_CONFIG_DATA (0xCFC) - -#define PCI_DEVICE_COUNT (32) -#define PCI_FUNC_COUNT (8) -#define PCI_BUS_COUNT (255) - -namespace Kernel::PCI -{ - // model - struct DeviceHeader - { - UInt16 VendorId; - UInt16 DeviceId; - UInt8 Command; - UInt8 Status; - UInt8 RevisionId; - UInt8 ProgIf; - UInt8 SubClass; - UInt8 Class; - UInt8 CacheLineSz; - UInt8 LatencyTimer; - UInt8 HeaderType; - UInt8 Bist; - UInt8 Bus; - UInt8 Device; - UInt8 Function; - }; - - namespace Detail - { - class BAR - { - public: - UIntPtr BAR; - SizeT Size; - }; - } // namespace Detail - - class BAR - { - public: - Detail::BAR BAR1; - Detail::BAR BAR2; - Detail::BAR BAR3; - Detail::BAR BAR4; - Detail::BAR BAR5; - }; -} // namespace Kernel::PCI diff --git a/Kernel/KernelKit/PCI/PCI.hxx b/Kernel/KernelKit/PCI/PCI.hxx new file mode 100644 index 00000000..e75215d6 --- /dev/null +++ b/Kernel/KernelKit/PCI/PCI.hxx @@ -0,0 +1,59 @@ +/* ------------------------------------------- + + Copyright ZKA Technologies + +------------------------------------------- */ + +#pragma once + +#include + +#define cPCIConfigAddressPort (0xCF8) +#define cPCIConfigDataPort (0xCFC) + +#define cPCIDeviceCount (32) +#define cPCIFuncCount (8) +#define cPCIBusCount (255) + +namespace Kernel::PCI +{ + // model + struct DeviceHeader + { + UInt16 VendorId; + UInt16 DeviceId; + UInt8 Command; + UInt8 Status; + UInt8 RevisionId; + UInt8 ProgIf; + UInt8 SubClass; + UInt8 Class; + UInt8 CacheLineSz; + UInt8 LatencyTimer; + UInt8 HeaderType; + UInt8 Bist; + UInt8 Bus; + UInt8 Device; + UInt8 Function; + }; + + namespace Detail + { + class BAR + { + public: + UIntPtr BAR; + SizeT Size; + }; + } // namespace Detail + + class BAR + { + public: + Detail::BAR BAR1; + Detail::BAR BAR2; + Detail::BAR BAR3; + Detail::BAR BAR4; + Detail::BAR BAR5; + }; +} // namespace Kernel::PCI -- cgit v1.2.3