diff options
Diffstat (limited to 'dev/ZKA/KernelKit/PCI')
| -rw-r--r-- | dev/ZKA/KernelKit/PCI/Device.hxx | 5 | ||||
| -rw-r--r-- | dev/ZKA/KernelKit/PCI/Iterator.hxx | 8 |
2 files changed, 7 insertions, 6 deletions
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 |