summaryrefslogtreecommitdiffhomepage
path: root/Private/KernelKit/PCI
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal@el-mahrouss-logic.com>2024-04-06 14:52:33 +0200
committerAmlal El Mahrouss <amlal@el-mahrouss-logic.com>2024-04-06 14:52:33 +0200
commit32f75625830660468287de0f213baee760fc6384 (patch)
treeaaa8286ee13a4188d826d4efd59482c7b1aa0e73 /Private/KernelKit/PCI
parent422b8029eba71b6fbb6b3dcb386b8e115bbd08ef (diff)
:boom: Breaking changes, disk API improvemenets and bringing support for
more drivers... Signed-off-by: Amlal El Mahrouss <amlal@el-mahrouss-logic.com>
Diffstat (limited to 'Private/KernelKit/PCI')
-rw-r--r--Private/KernelKit/PCI/Device.hpp8
-rw-r--r--Private/KernelKit/PCI/Dma.hpp6
-rw-r--r--Private/KernelKit/PCI/Dma.inl4
-rw-r--r--Private/KernelKit/PCI/IO-Impl-AMD64.inl12
-rw-r--r--Private/KernelKit/PCI/IO.hpp6
-rw-r--r--Private/KernelKit/PCI/Iterator.hpp2
6 files changed, 19 insertions, 19 deletions
diff --git a/Private/KernelKit/PCI/Device.hpp b/Private/KernelKit/PCI/Device.hpp
index 9bb22cb2..ea11e327 100644
--- a/Private/KernelKit/PCI/Device.hpp
+++ b/Private/KernelKit/PCI/Device.hpp
@@ -68,10 +68,10 @@ namespace NewOS::PCI
UShort Vendor();
private:
- UShort m_Bus;
- UShort m_Device;
- UShort m_Function;
- UShort m_Bar;
+ UShort fBus;
+ UShort fDevice;
+ UShort fFunction;
+ UShort fBar;
};
} // namespace NewOS::PCI
diff --git a/Private/KernelKit/PCI/Dma.hpp b/Private/KernelKit/PCI/Dma.hpp
index 1e1b5036..392aeee3 100644
--- a/Private/KernelKit/PCI/Dma.hpp
+++ b/Private/KernelKit/PCI/Dma.hpp
@@ -28,7 +28,7 @@ class DMAWrapper final {
public:
explicit DMAWrapper(nullPtr) = delete;
explicit DMAWrapper(voidPtr Ptr, DmaKind Kind = DmaKind::PCI)
- : m_Address(Ptr), m_Kind(Kind) {}
+ : fAddress(Ptr), fKind(Kind) {}
public:
DMAWrapper &operator=(voidPtr Ptr);
@@ -59,8 +59,8 @@ class DMAWrapper final {
UIntPtr operator[](const UIntPtr &offset);
private:
- voidPtr m_Address{nullptr};
- DmaKind m_Kind{DmaKind::Invalid};
+ voidPtr fAddress{nullptr};
+ DmaKind fKind{DmaKind::Invalid};
private:
friend class DMAFactory;
diff --git a/Private/KernelKit/PCI/Dma.inl b/Private/KernelKit/PCI/Dma.inl
index 5f7e1379..846785a1 100644
--- a/Private/KernelKit/PCI/Dma.inl
+++ b/Private/KernelKit/PCI/Dma.inl
@@ -9,12 +9,12 @@ namespace NewOS
template<class T>
T* DMAWrapper::operator->()
{
- return m_Address;
+ return fAddress;
}
template<class T>
T* DMAWrapper::Get(const UIntPtr offset)
{
- return reinterpret_cast<T*>((UIntPtr) m_Address + offset);
+ return reinterpret_cast<T*>((UIntPtr) fAddress + offset);
}
}
diff --git a/Private/KernelKit/PCI/IO-Impl-AMD64.inl b/Private/KernelKit/PCI/IO-Impl-AMD64.inl
index 195ebca1..bf7b98d4 100644
--- a/Private/KernelKit/PCI/IO-Impl-AMD64.inl
+++ b/Private/KernelKit/PCI/IO-Impl-AMD64.inl
@@ -18,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(fPorts[index].Leak());
case 2:
- return HAL::In16(m_Ports[index].Leak());
+ return HAL::In16(fPorts[index].Leak());
case 1:
- return HAL::In8(m_Ports[index].Leak());
+ return HAL::In8(fPorts[index].Leak());
default:
return 0xFFFF;
}
@@ -34,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(fPorts[index].Leak(), value);
case 2:
- HAL::Out16(m_Ports[index].Leak(), value);
+ HAL::Out16(fPorts[index].Leak(), value);
case 1:
- HAL::Out8(m_Ports[index].Leak(), value);
+ HAL::Out8(fPorts[index].Leak(), value);
#endif
default:
break;
diff --git a/Private/KernelKit/PCI/IO.hpp b/Private/KernelKit/PCI/IO.hpp
index 87a29b78..a0ee51dc 100644
--- a/Private/KernelKit/PCI/IO.hpp
+++ b/Private/KernelKit/PCI/IO.hpp
@@ -19,14 +19,14 @@ class IOArray final {
IOArray(nullPtr) = delete;
- explicit IOArray(Array<UShort, Sz> &ports) : m_Ports(ports) {}
+ explicit IOArray(Array<UShort, Sz> &ports) : fPorts(ports) {}
~IOArray() {}
IOArray &operator=(const IOArray &) = default;
IOArray(const IOArray &) = default;
- operator bool() { return !m_Ports.Empty(); }
+ operator bool() { return !fPorts.Empty(); }
public:
template <typename T>
@@ -36,7 +36,7 @@ class IOArray final {
void Out(SizeT index, T value);
private:
- Array<UShort, Sz> m_Ports;
+ Array<UShort, Sz> fPorts;
};
using IOArray16 = IOArray<16>;
diff --git a/Private/KernelKit/PCI/Iterator.hpp b/Private/KernelKit/PCI/Iterator.hpp
index 7f17263d..b81aae74 100644
--- a/Private/KernelKit/PCI/Iterator.hpp
+++ b/Private/KernelKit/PCI/Iterator.hpp
@@ -29,7 +29,7 @@ namespace NewOS::PCI {
Ref<PCI::Device> operator[](const Size &sz);
private:
- Array<PCI::Device, NEWOS_BUS_COUNT> m_Devices;
+ Array<PCI::Device, NEWOS_BUS_COUNT> fDevices;
};
} // namespace NewOS::PCI