summaryrefslogtreecommitdiffhomepage
path: root/Private/KernelKit
diff options
context:
space:
mode:
Diffstat (limited to 'Private/KernelKit')
-rw-r--r--Private/KernelKit/DeviceManager.hpp22
-rw-r--r--Private/KernelKit/Framebuffer.hpp14
-rw-r--r--Private/KernelKit/LockDelegate.hpp10
-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
-rw-r--r--Private/KernelKit/SMPManager.hpp16
10 files changed, 50 insertions, 50 deletions
diff --git a/Private/KernelKit/DeviceManager.hpp b/Private/KernelKit/DeviceManager.hpp
index 0935c5b3..490ebc71 100644
--- a/Private/KernelKit/DeviceManager.hpp
+++ b/Private/KernelKit/DeviceManager.hpp
@@ -34,7 +34,7 @@ template <typename T>
class DeviceInterface {
public:
explicit DeviceInterface(void (*Out)(T), void (*In)(T))
- : m_Out(Out), m_In(In) {}
+ : fOut(Out), fIn(In) {}
virtual ~DeviceInterface() = default;
@@ -44,23 +44,23 @@ class DeviceInterface {
public:
virtual DeviceInterface<T> &operator<<(T Data) {
- m_Out(Data);
+ fOut(Data);
return *this;
}
virtual DeviceInterface<T> &operator>>(T Data) {
- m_In(Data);
+ fIn(Data);
return *this;
}
virtual const char *Name() const { return "DeviceInterface"; }
- operator bool() { return m_Out && m_In; }
- bool operator!() { return !m_Out && !m_In; }
+ operator bool() { return fOut && fIn; }
+ bool operator!() { return !fOut && !fIn; }
private:
- void (*m_Out)(T Data);
- void (*m_In)(T Data);
+ void (*fOut)(T Data);
+ void (*fIn)(T Data);
};
///
@@ -70,7 +70,7 @@ class DeviceInterface {
template <typename T>
class IOBuf final {
public:
- explicit IOBuf(T Dat) : m_Data(Dat) {
+ explicit IOBuf(T Dat) : fData(Dat) {
// at least pass something valid when instancating this struct.
MUST_PASS(Dat);
}
@@ -83,16 +83,16 @@ class IOBuf final {
public:
template <typename R>
R operator->() const {
- return m_Data;
+ return fData;
}
template <typename R>
R &operator[](Size index) const {
- return m_Data[index];
+ return fData[index];
}
private:
- T m_Data;
+ T fData;
};
///! @brief Device enum types.
diff --git a/Private/KernelKit/Framebuffer.hpp b/Private/KernelKit/Framebuffer.hpp
index 91b4e8fd..39b1eb5e 100644
--- a/Private/KernelKit/Framebuffer.hpp
+++ b/Private/KernelKit/Framebuffer.hpp
@@ -20,16 +20,16 @@ enum class FramebufferColorKind : UChar {
class FramebufferContext final {
public:
- UIntPtr m_Base;
- UIntPtr m_Bpp;
- UInt m_Width;
- UInt m_Height;
+ UIntPtr fBase;
+ UIntPtr fBpp;
+ UInt fWidth;
+ UInt fHeight;
};
class Framebuffer final {
public:
explicit Framebuffer(Ref<FramebufferContext *> &addr)
- : m_FrameBufferAddr(addr) {}
+ : fFrameBufferAddr(addr) {}
~Framebuffer() {}
Framebuffer &operator=(const Framebuffer &) = delete;
@@ -62,8 +62,8 @@ class Framebuffer final {
Framebuffer &PutPixel(SizeT x, SizeT y, UInt32 color);
private:
- Ref<FramebufferContext *> m_FrameBufferAddr;
- FramebufferColorKind m_Colour;
+ Ref<FramebufferContext *> fFrameBufferAddr;
+ FramebufferColorKind fColour;
};
/***********************************************************************************/
diff --git a/Private/KernelKit/LockDelegate.hpp b/Private/KernelKit/LockDelegate.hpp
index 07f492a8..3b4889c9 100644
--- a/Private/KernelKit/LockDelegate.hpp
+++ b/Private/KernelKit/LockDelegate.hpp
@@ -34,13 +34,13 @@ class LockDelegate final
{
if (*expr)
{
- m_LockStatus | kLockDone;
+ fLockStatus | kLockDone;
break;
}
}
if (spin == N)
- m_LockStatus | kLockTimedOut;
+ fLockStatus | kLockTimedOut;
}
~LockDelegate() = default;
@@ -50,15 +50,15 @@ class LockDelegate final
bool Done()
{
- return m_LockStatus[kLockDone] == kLockDone;
+ return fLockStatus[kLockDone] == kLockDone;
}
bool HasTimedOut()
{
- return m_LockStatus[kLockTimedOut] != kLockTimedOut;
+ return fLockStatus[kLockTimedOut] != kLockTimedOut;
}
private:
- Atom<UInt> m_LockStatus;
+ Atom<UInt> fLockStatus;
};
} // namespace NewOS
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
diff --git a/Private/KernelKit/SMPManager.hpp b/Private/KernelKit/SMPManager.hpp
index 42cd572e..631b29ea 100644
--- a/Private/KernelKit/SMPManager.hpp
+++ b/Private/KernelKit/SMPManager.hpp
@@ -60,12 +60,12 @@ class HardwareThread final {
const ThreadID& ID() noexcept;
private:
- HAL::StackFrame* m_Stack;
- ThreadKind m_Kind;
- ThreadID m_ID;
- bool m_Wakeup;
- bool m_Busy;
- Int64 m_PID;
+ HAL::StackFrame* fStack;
+ ThreadKind fKind;
+ ThreadID fID;
+ bool fWakeup;
+ bool fBusy;
+ Int64 fPID;
private:
friend class SMPManager;
@@ -106,8 +106,8 @@ class SMPManager final {
SizeT Count() noexcept;
private:
- Array<HardwareThread, kMaxHarts> m_ThreadList;
- ThreadID m_CurrentThread{0};
+ Array<HardwareThread, kMaxHarts> fThreadList;
+ ThreadID fCurrentThread{0};
};
/// @brief wakes up thread.