From 09383c793fe953da6441902b4f66b1382df46738 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 23 Mar 2024 21:40:37 +0100 Subject: Kernel: See below. Fix BUG inside ATA driver: Due to bad cast on lba select. Add ToolBox APIs for kernel GUI. Userland: See below. Worked a bit on System.Core, just wrapped Thread.hxx into the System namespace. Signed-off-by: Amlal El Mahrouss --- Private/KernelKit/Rsrc/Cursor.rsrc | 2 +- Private/KernelKit/Rsrc/Util.hxx | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'Private/KernelKit/Rsrc') diff --git a/Private/KernelKit/Rsrc/Cursor.rsrc b/Private/KernelKit/Rsrc/Cursor.rsrc index 94922ca7..34366f96 100644 --- a/Private/KernelKit/Rsrc/Cursor.rsrc +++ b/Private/KernelKit/Rsrc/Cursor.rsrc @@ -4,7 +4,7 @@ #define POINTER_WIDTH 32 // array size is 3072 -static const unsigned int Pointer[] = { +inline const unsigned int Pointer[] = { 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0xf7f7f7, 0xb6b6b6, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, diff --git a/Private/KernelKit/Rsrc/Util.hxx b/Private/KernelKit/Rsrc/Util.hxx index bf753055..ccca0c97 100644 --- a/Private/KernelKit/Rsrc/Util.hxx +++ b/Private/KernelKit/Rsrc/Util.hxx @@ -4,12 +4,14 @@ // Last Rev // Sat Feb 24 CET 2024 -#define KeInitRsrc() HCore::SizeT uA = 0 +#define ToolboxInitRsrc() HCore::SizeT uA = 0 -#define KeClearRsrc() uA = 0 +#define kClearClr RGB(26, 67, B3) + +#define ToolboxClearRsrc() uA = 0 /// @brief draws a resource. -#define KeDrawRsrc(ImgPtr, _Height, _Width, BaseX, BaseY) \ +#define ToolboxDrawRsrc(ImgPtr, _Height, _Width, BaseX, BaseY) \ uA = 0; \ \ for (HCore::SizeT i = BaseX; i < _Height + BaseX; ++i) { \ @@ -36,7 +38,7 @@ /// @brief cleans a resource. -#define KeClearZone(_Height, _Width, BaseX, BaseY) \ +#define ToolboxClearZone(_Height, _Width, BaseX, BaseY) \ \ for (HCore::SizeT i = BaseX; i < _Height + BaseX; ++i) { \ for (HCore::SizeT u = BaseY; u < _Width + BaseY; ++u) { \ @@ -45,15 +47,15 @@ kHandoverHeader->f_GOP \ .f_PixelPerLine * \ i + \ - 4 * u))) = RGB(0, 0, 0); \ + 4 * u))) = kClearClr; \ } \ } -#define KeDrawZone(_Clr, _Height, _Width, BaseX, BaseY) \ +#define ToolboxDrawZone(_Clr, _Height, _Width, BaseX, BaseY) \ \ - for (HCore::SizeT i = BaseX; i < _Height + BaseX; ++i) { \ - for (HCore::SizeT u = BaseY; u < _Width + BaseY; ++u) { \ + for (HCore::SizeT i = BaseX; i < _Width + BaseX; ++i) { \ + for (HCore::SizeT u = BaseY; u < _Height + BaseY; ++u) { \ *(((volatile HCore::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * \ kHandoverHeader->f_GOP \ -- cgit v1.2.3