diff options
Diffstat (limited to 'dev/zka/KernelKit')
| -rw-r--r-- | dev/zka/KernelKit/Framebuffer.hxx | 85 | ||||
| -rw-r--r-- | dev/zka/KernelKit/HardwareThreadScheduler.hxx | 2 | ||||
| -rw-r--r-- | dev/zka/KernelKit/Heap.hxx | 6 | ||||
| -rw-r--r-- | dev/zka/KernelKit/UserProcessScheduler.hxx | 6 | ||||
| -rw-r--r-- | dev/zka/KernelKit/XCOFF.hxx | 2 |
5 files changed, 9 insertions, 92 deletions
diff --git a/dev/zka/KernelKit/Framebuffer.hxx b/dev/zka/KernelKit/Framebuffer.hxx deleted file mode 100644 index dac9b514..00000000 --- a/dev/zka/KernelKit/Framebuffer.hxx +++ /dev/null @@ -1,85 +0,0 @@ -/* ------------------------------------------- - - Copyright ZKA Technologies. - - File: Framebuffer.hpp - Purpose: Framebuffer object. - -------------------------------------------- */ - -#ifndef __INC_FB_HPP__ -#define __INC_FB_HPP__ - -#include <NewKit/Defines.hxx> -#include <NewKit/Ref.hxx> - -namespace Kernel -{ - enum class FramebufferColorKind : UChar - { - RGB32, - RGB16, - RGB8, - INVALID, - }; - - class FramebufferContext final - { - public: - UIntPtr fBase; - UIntPtr fBpp; - UInt fWidth; - UInt fHeight; - }; - - class Framebuffer final - { - public: - explicit Framebuffer(Ref<FramebufferContext*>& addr); - ~Framebuffer() = default; - - Framebuffer& operator=(const Framebuffer&) = delete; - Framebuffer(const Framebuffer&) = default; - - volatile UIntPtr* operator[](const UIntPtr& pos); - - operator bool(); - - const FramebufferColorKind& Color( - const FramebufferColorKind& colour = FramebufferColorKind::INVALID); - - Ref<FramebufferContext*>& Leak(); - - /// @brief Draws a rectangle inside the fb. - /// @param width the width of it - /// @param height the height of it - /// @param x its x coord. - /// @param y its y coord. - /// @param color the color of it. - /// @return the framebuffer object. - Framebuffer& DrawRect(SizeT width, SizeT height, SizeT x, SizeT y, UInt32 color); - - /// @brief Puts a pixel on the screen. - /// @param x where in X - /// @param y where in Y - /// @param color the color of it. - /// @return the framebuffer object. - Framebuffer& PutPixel(SizeT x, SizeT y, UInt32 color); - - private: - Ref<FramebufferContext*> fFrameBufferAddr; - FramebufferColorKind fColour; - }; - - /***********************************************************************************/ - /// Some common colors. - /***********************************************************************************/ - - extern const UInt32 kRgbRed; - extern const UInt32 kRgbGreen; - extern const UInt32 kRgbBlue; - extern const UInt32 kRgbBlack; - extern const UInt32 kRgbWhite; -} // namespace Kernel - -#endif /* ifndef __INC_FB_HPP__ */ diff --git a/dev/zka/KernelKit/HardwareThreadScheduler.hxx b/dev/zka/KernelKit/HardwareThreadScheduler.hxx index 3d70e828..c76b037d 100644 --- a/dev/zka/KernelKit/HardwareThreadScheduler.hxx +++ b/dev/zka/KernelKit/HardwareThreadScheduler.hxx @@ -134,7 +134,7 @@ namespace Kernel private: Array<HardwareThread, cMaxHartInsideSched> fThreadList; - ThreadID fCurrentThread{0}; + ThreadID fCurrentThread{0}; }; /// @brief wakes up thread. diff --git a/dev/zka/KernelKit/Heap.hxx b/dev/zka/KernelKit/Heap.hxx index 53eec98e..8776ab5b 100644 --- a/dev/zka/KernelKit/Heap.hxx +++ b/dev/zka/KernelKit/Heap.hxx @@ -32,10 +32,10 @@ namespace Kernel /// @brief Allocate chunk of memory. /// @param sz Size of pointer - /// @param rw Read Write bit. + /// @param wr Read Write bit. /// @param user User enable bit. /// @return The newly allocated pointer. - VoidPtr mm_new_heap(const SizeT sz, const Bool rw, const Bool user); + VoidPtr mm_new_heap(const SizeT sz, const Bool wr, const Bool user); /// @brief Protect the heap with a CRC value. /// @param heap_ptr pointer. @@ -47,6 +47,7 @@ namespace Kernel /// @return status code Int32 mm_make_ke_page(VoidPtr heap_ptr); + /// @brief Allocate C++ class. template <typename T, typename... Args> inline T* mm_new_class(Args&&... args) { @@ -58,6 +59,7 @@ namespace Kernel return cls; } + /// @brief Free C++ class. template <typename T> inline Void mm_delete_class(T* cls) { diff --git a/dev/zka/KernelKit/UserProcessScheduler.hxx b/dev/zka/KernelKit/UserProcessScheduler.hxx index fc82bf38..4edc80c2 100644 --- a/dev/zka/KernelKit/UserProcessScheduler.hxx +++ b/dev/zka/KernelKit/UserProcessScheduler.hxx @@ -17,7 +17,7 @@ #define kSchedProcessLimitPerTeam (16U) #define kSchedMaxMemoryLimit gib_cast(128) -#define kSchedMaxStackSz mib_cast(8) +#define kSchedMaxStackSz mib_cast(8) //////////////////////////////////////////////////// @@ -188,8 +188,8 @@ namespace Kernel ProcessTime PTime{0}; //! @brief Process allocated tine. - PID ProcessId{kSchedInvalidPID}; - Int32 Kind{eExecutableKind}; + PID ProcessId{kSchedInvalidPID}; + Int32 Kind{eExecutableKind}; public: //! @brief boolean operator, check status. diff --git a/dev/zka/KernelKit/XCOFF.hxx b/dev/zka/KernelKit/XCOFF.hxx index 82c6dd35..29128799 100644 --- a/dev/zka/KernelKit/XCOFF.hxx +++ b/dev/zka/KernelKit/XCOFF.hxx @@ -36,7 +36,7 @@ typedef struct XCoffFileHeader Kernel::UIntPtr fSymPtr; Kernel::UInt32 fNumSyms; Kernel::UInt16 fOptHdr; // ?: Number of bytes in optional header -} XCoffFileHeader32, XCoffFileHeader64; +} XCoffFileHeader64; #define cForkNameLen (255) |
