From d2014a5e820cf322ef850864c3ec31d16dc52aec Mon Sep 17 00:00:00 2001 From: Rafal Kupiec Date: Fri, 17 May 2024 23:29:03 +0200 Subject: [PATCH] Use HlpRGBColor() internally --- xtoskrnl/hl/fbdev.c | 8 ++++---- xtoskrnl/includes/hli.h | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xtoskrnl/hl/fbdev.c b/xtoskrnl/hl/fbdev.c index 72d56d1..3d169c2 100644 --- a/xtoskrnl/hl/fbdev.c +++ b/xtoskrnl/hl/fbdev.c @@ -32,7 +32,7 @@ HlClearScreen(IN ULONG Color) FrameBuf = HlpFrameBufferData.Address; /* Convert background color */ - BackgroundColor = HlRGBColor(Color); + BackgroundColor = HlpRGBColor(Color); /* Fill the screen with a black box */ for(PositionY = 0; PositionY < HlpFrameBufferData.Height; PositionY++) @@ -87,7 +87,7 @@ HlDrawPixel(IN ULONG PositionX, FrameBufferIndex = 4 * HlpFrameBufferData.PixelsPerScanLine * PositionY + 4 * PositionX; /* Set the color of the pixel by writing to the corresponding memory location */ - *((PULONG)(HlpFrameBufferData.Address + FrameBufferIndex)) = HlRGBColor(Color); + *((PULONG)(HlpFrameBufferData.Address + FrameBufferIndex)) = HlpRGBColor(Color); } /** @@ -248,7 +248,7 @@ HlPutCharacter(IN ULONG PositionX, /* Find the glyph position on the frame buffer and set font color */ GlyphPixel = (UINT_PTR)HlpFrameBufferData.Address + PositionY * HlpFrameBufferData.Pitch + PositionX * 4; - FontColor = HlRGBColor(Color); + FontColor = HlpRGBColor(Color); /* Check all kerning fragments */ Mapping = 0; @@ -333,7 +333,7 @@ HlPutCharacter(IN ULONG PositionX, */ XTAPI ULONG -HlRGBColor(IN ULONG Color) +HlpRGBColor(IN ULONG Color) { USHORT Blue, Green, Red, Reserved; diff --git a/xtoskrnl/includes/hli.h b/xtoskrnl/includes/hli.h index 574f908..d54facf 100644 --- a/xtoskrnl/includes/hli.h +++ b/xtoskrnl/includes/hli.h @@ -55,6 +55,10 @@ XTAPI XTSTATUS HlInitializeFrameBuffer(VOID); +XTAPI +VOID +HlInitializeProcessor(); + XTAPI VOID HlPutCharacter(IN ULONG PositionX, @@ -62,16 +66,12 @@ HlPutCharacter(IN ULONG PositionX, IN ULONG Color, IN WCHAR WideCharacter); -XTAPI -ULONG -HlRGBColor(IN ULONG Color); - XTFASTCALL VOID HlSetRunLevel(IN KRUNLEVEL RunLevel); XTAPI -VOID -HlInitializeProcessor(); +ULONG +HlpRGBColor(IN ULONG Color); #endif /* __XTOSKRNL_HLI_H */