diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/Modules/FB/FB.h | 10 | ||||
| -rw-r--r-- | dev/ZBAKit/amd64-efi.make | 2 | ||||
| -rw-r--r-- | dev/ZBAKit/src/HEL/AMD64/BootMain.cc | 8 | ||||
| -rw-r--r-- | dev/ZKAKit/src/Stop.cc | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/dev/Modules/FB/FB.h b/dev/Modules/FB/FB.h index 1d68dc20..ffd6edf9 100644 --- a/dev/Modules/FB/FB.h +++ b/dev/Modules/FB/FB.h @@ -8,13 +8,13 @@ #include <NewKit/Defines.h> -#define CGInit() Kernel::SizeT kCGCursor = 0 +#define cg_init() Kernel::SizeT kCGCursor = 0 -#define CGColor(R, G, B) RGB(R, G, B) +#define cg_color(R, G, B) RGB(R, G, B) -#define cCGClearClr CGColor(0x0, 0x0, 0x0) +#define cg_get_clear_clr() cg_color(0xB2, 0xB2, 0xB2) -#define CGFini() kCGCursor = 0 +#define cg_fini() kCGCursor = 0 /// @brief Performs OR drawing on the framebuffer. #define CGDrawBitMapInRegionA(_BitMp, _Height, _Width, _BaseX, _BaseY) \ @@ -76,7 +76,7 @@ *(((volatile Kernel::UInt32*)(kHandoverHeader->f_GOP.f_The + \ 4 * kHandoverHeader->f_GOP.f_PixelPerLine * \ i + \ - 4 * u))) = cCGClearClr; \ + 4 * u))) = cg_get_clear_clr(); \ } \ } diff --git a/dev/ZBAKit/amd64-efi.make b/dev/ZBAKit/amd64-efi.make index 4d503bc3..7a36305e 100644 --- a/dev/ZBAKit/amd64-efi.make +++ b/dev/ZBAKit/amd64-efi.make @@ -75,7 +75,7 @@ endif .PHONY: compile-amd64 compile-amd64: - $(RESCMD) + $(WINDRES) src/BootloaderRsrc.rsrc -O coff -o BootloaderRsrc.o $(CC_GNU) $(ZKA_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \ $(wildcard src/HEL/AMD64/*.cc) \ $(wildcard src/HEL/AMD64/*.S) \ diff --git a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc index 77de8a7b..87336fbd 100644 --- a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc +++ b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc @@ -142,11 +142,11 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, kHandoverHeader = handover_hdr; #ifdef ZBA_USE_FB - CGInit(); - CGDrawInRegion(CGColor(0x00, 0x00, 0x00), handover_hdr->f_GOP.f_Height, handover_hdr->f_GOP.f_Width, 0, 0); - CGFini(); + cg_init(); + CGDrawInRegion(cg_color(0x00, 0x00, 0x00), handover_hdr->f_GOP.f_Height, handover_hdr->f_GOP.f_Width, 0, 0); + cg_fini(); - CGFini(); + cg_fini(); #endif // ZBA_USE_FB UInt32 cnt_enabled = 0; diff --git a/dev/ZKAKit/src/Stop.cc b/dev/ZKAKit/src/Stop.cc index 3d624a17..057722b5 100644 --- a/dev/ZKAKit/src/Stop.cc +++ b/dev/ZKAKit/src/Stop.cc @@ -27,7 +27,7 @@ namespace Kernel /***********************************************************************************/ Void ke_stop(const Kernel::Int32& id) { - CGInit(); + cg_init(); auto panic_text = RGB(0xff, 0xff, 0xff); @@ -37,7 +37,7 @@ namespace Kernel CGDrawString("Kernel Panic!", start_y, x, panic_text); start_y += 10; - CGFini(); + cg_fini(); // show text according to error id. |