From eb5271c14e02aab956ab53f5e74290bca495e2ff Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 28 Dec 2024 05:03:47 +0100 Subject: See details of commit. IMPL: Better Bootloader architecture. FIX: Remove overcomplicated FbMgr code. IMPL: Implement the SwapMgrDisk function to dump process data to disk. FIX: Fix the format system in Boot. Signed-off-by: Amlal El Mahrouss --- dev/Mod/Flash/Flash.h | 21 --------------------- dev/Mod/GfxMgr/FBMgr.h | 34 ++++------------------------------ dev/Mod/MFlash/MFlash.h | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 51 deletions(-) delete mode 100644 dev/Mod/Flash/Flash.h create mode 100644 dev/Mod/MFlash/MFlash.h (limited to 'dev/Mod') diff --git a/dev/Mod/Flash/Flash.h b/dev/Mod/Flash/Flash.h deleted file mode 100644 index 9f5d4117..00000000 --- a/dev/Mod/Flash/Flash.h +++ /dev/null @@ -1,21 +0,0 @@ -/* ------------------------------------------- - - Copyright (C) 2024, Theater Quality Inc, all rights reserved. - -------------------------------------------- */ - -#pragma once - -#ifdef ZKA_USE_MBCI_FLASH - -#include - -/// @brief get sector count. -/// @return drive sector count. -Kernel::SizeT drv_get_sector_count(); - -/// @brief get device size. -/// @return drive size -Kernel::SizeT drv_get_size(); - -#endif // ifdef ZKA_USE_MBCI_FLASH diff --git a/dev/Mod/GfxMgr/FBMgr.h b/dev/Mod/GfxMgr/FBMgr.h index 37fbaddc..75bdba6d 100644 --- a/dev/Mod/GfxMgr/FBMgr.h +++ b/dev/Mod/GfxMgr/FBMgr.h @@ -14,7 +14,7 @@ #define fb_get_clear_clr() fb_color(0x20, 0x20, 0x20) -#define fb_fini() kCGCursor = 0 +#define fb_clear() kCGCursor = 0 /// @brief Performs OR drawing on the framebuffer. #define FBDrawBitMapInRegionA(_BitMp, _Height, _Width, _BaseX, _BaseY) \ @@ -100,34 +100,6 @@ } \ } -#define FBDrawInRegionToVideoRgn(_VideoRgn, _Clr, _Height, _Width, _BaseX, _BaseY) \ - kCGCursor = 0; \ - \ - for (Kernel::SizeT x_base = _BaseX; x_base < (_Width + _BaseX); ++x_base) \ - { \ - for (Kernel::SizeT y_base = _BaseY; y_base < (_Height + _BaseY); ++y_base) \ - { \ - *(((volatile Kernel::UInt32*)(_VideoRgn + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - x_base + \ - 4 * y_base))) = _Clr; \ - ++kCGCursor; \ - } \ - } - -#define FBDrawInRegionToVideoRgnA(_VideoRgn, _Clr, _Height, _Width, _BaseX, _BaseY) \ - for (Kernel::SizeT x_base = _BaseX; x_base < (_Width + _BaseX); ++x_base) \ - { \ - for (Kernel::SizeT y_base = _BaseY; y_base < (_Height + _BaseY); ++y_base) \ - { \ - *(((volatile Kernel::UInt32*)(_VideoRgn + \ - 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ - x_base + \ - 4 * y_base))) |= _Clr; \ - ++kCGCursor; \ - } \ - } - #define FBDrawInRegionA(_Clr, _Height, _Width, _BaseX, _BaseY) \ for (Kernel::SizeT x_base = _BaseX; x_base < (_Width + _BaseX); ++x_base) \ { \ @@ -140,7 +112,9 @@ } \ } +#ifndef GFX_MGR_ACCESSIBILITY_H #include +#endif // ifndef GFX_MGR_ACCESSIBILITY_H namespace UI { @@ -151,7 +125,7 @@ namespace UI FBDrawInRegion(fb_get_clear_clr(), UI::UIAccessibilty::Height(), UI::UIAccessibilty::Width(), 0, 0); - fb_fini(); + fb_clear(); } } // namespace UI \ No newline at end of file diff --git a/dev/Mod/MFlash/MFlash.h b/dev/Mod/MFlash/MFlash.h new file mode 100644 index 00000000..9f5d4117 --- /dev/null +++ b/dev/Mod/MFlash/MFlash.h @@ -0,0 +1,21 @@ +/* ------------------------------------------- + + Copyright (C) 2024, Theater Quality Inc, all rights reserved. + +------------------------------------------- */ + +#pragma once + +#ifdef ZKA_USE_MBCI_FLASH + +#include + +/// @brief get sector count. +/// @return drive sector count. +Kernel::SizeT drv_get_sector_count(); + +/// @brief get device size. +/// @return drive size +Kernel::SizeT drv_get_size(); + +#endif // ifdef ZKA_USE_MBCI_FLASH -- cgit v1.2.3