From da44113b0200161a8826ec6292af111e9292c3d1 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Wed, 15 Jan 2025 10:24:53 +0100 Subject: ADD: Patches to NeFS, only FindFork to fix now. Signed-off-by: Amlal El Mahrouss --- dev/Mod/ACPI/ACPIFactoryInterface.h | 6 +++--- dev/Mod/CoreGfx/AccessibilityMgr.h | 2 +- dev/Mod/CoreGfx/FBMgr.h | 28 ++++++++++++++-------------- dev/Mod/CoreGfx/TextMgr.h | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'dev/Mod') diff --git a/dev/Mod/ACPI/ACPIFactoryInterface.h b/dev/Mod/ACPI/ACPIFactoryInterface.h index 30a09fd7..bf248168 100644 --- a/dev/Mod/ACPI/ACPIFactoryInterface.h +++ b/dev/Mod/ACPI/ACPIFactoryInterface.h @@ -51,9 +51,9 @@ namespace Kernel } private: - VoidPtr fRsdp{nullptr}; // pointer to root descriptor. - SSizeT fEntries{0UL}; // number of entries, -1 tells that no invalid entries were - // found. + VoidPtr fRsdp{nullptr}; // pointer to root descriptor. + SSizeT fEntries{0UL}; // number of entries, -1 tells that no invalid entries were + // found. }; } // namespace Kernel diff --git a/dev/Mod/CoreGfx/AccessibilityMgr.h b/dev/Mod/CoreGfx/AccessibilityMgr.h index f0439a03..68c86030 100644 --- a/dev/Mod/CoreGfx/AccessibilityMgr.h +++ b/dev/Mod/CoreGfx/AccessibilityMgr.h @@ -36,6 +36,6 @@ namespace FB return kHandoverHeader->f_GOP.f_Height; } }; -} // namespace UI +} // namespace FB #endif // !GFX_MGR_ACCESSIBILITY_H_ diff --git a/dev/Mod/CoreGfx/FBMgr.h b/dev/Mod/CoreGfx/FBMgr.h index 2eaba448..828e236b 100644 --- a/dev/Mod/CoreGfx/FBMgr.h +++ b/dev/Mod/CoreGfx/FBMgr.h @@ -114,19 +114,19 @@ } #else #define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) -#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y) -#define FBDrawBitMapInRegionToRgn(_Rgn, reg_ptr, height, width, base_x, base_y) -#define CGClearRegion(height, width, base_x, base_y) -#define FBDrawInRegion(_Clr, height, width, base_x, base_y) -#define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y) -#define FBDrawInRegionA(_Clr, height, width, base_x, base_y) -#define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) -#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y) -#define FBDrawBitMapInRegionToRgn(_Rgn, reg_ptr, height, width, base_x, base_y) -#define CGClearRegion(height, width, base_x, base_y) -#define FBDrawInRegion(_Clr, height, width, base_x, base_y) -#define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y) -#define FBDrawInRegionA(_Clr, height, width, base_x, base_y) +#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y) +#define FBDrawBitMapInRegionToRgn(_Rgn, reg_ptr, height, width, base_x, base_y) +#define CGClearRegion(height, width, base_x, base_y) +#define FBDrawInRegion(_Clr, height, width, base_x, base_y) +#define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y) +#define FBDrawInRegionA(_Clr, height, width, base_x, base_y) +#define FBDrawBitMapInRegionA(reg_ptr, height, width, base_x, base_y) +#define FBDrawBitMapInRegion(reg_ptr, height, width, base_x, base_y) +#define FBDrawBitMapInRegionToRgn(_Rgn, reg_ptr, height, width, base_x, base_y) +#define CGClearRegion(height, width, base_x, base_y) +#define FBDrawInRegion(_Clr, height, width, base_x, base_y) +#define FBDrawInRegionToRgn(_Rgn, _Clr, height, width, base_x, base_y) +#define FBDrawInRegionA(_Clr, height, width, base_x, base_y) #endif // __ZKA_AMD64__ #ifndef GFX_MGR_ACCESSIBILITY_H @@ -147,4 +147,4 @@ namespace FB fb_clear(); } -} // namespace UI \ No newline at end of file +} // namespace FB \ No newline at end of file diff --git a/dev/Mod/CoreGfx/TextMgr.h b/dev/Mod/CoreGfx/TextMgr.h index 718bf1bb..b97cfde4 100644 --- a/dev/Mod/CoreGfx/TextMgr.h +++ b/dev/Mod/CoreGfx/TextMgr.h @@ -9,8 +9,8 @@ #include #include -#define kFontSizeX 8 -#define kFontSizeY 8 +#define kFontSizeX 8 +#define kFontSizeY 8 #define kFontNOFChars 128 inline const Kernel::UInt8 kFontBitmap[kFontNOFChars][kFontSizeX] = { -- cgit v1.2.3