Skip to content

Commit 379eb14

Browse files
committed
[FREELDR:XBOX/UEFI] Separate framebuffer functions with those pertaining to emulated text console (reactos#8530)
- Framebuffer routines that output characters with text-like attributes, or return screen sizes in character units (columns/rows), pertain to a "framebuffer console" (FbCons) layer. Their interface may be extended a bit in the future. - Add Doxygen documentation for some of them. - The Xbox/UefiVideo* functions that are similarly character-oriented, invoke these framebuffer console routines.
1 parent 9f69e8c commit 379eb14

File tree

6 files changed

+249
-107
lines changed

6 files changed

+249
-107
lines changed

boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ XboxConsPutChar(int c)
3636
NeedScroll = (CurrentCursorY >= Height);
3737
if (NeedScroll)
3838
{
39-
VidFbScrollUp(CurrentAttr);
39+
FbConsScrollUp(CurrentAttr);
4040
--CurrentCursorY;
4141
}
4242

boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ extern multiboot_info_t * MultibootInfoPtr;
3636
VOID
3737
XboxVideoClearScreen(UCHAR Attr)
3838
{
39-
VidFbClearScreen(Attr);
39+
FbConsClearScreen(Attr);
4040
}
4141

4242
VOID
4343
XboxVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y)
4444
{
45-
VidFbPutChar(Ch, Attr, X, Y);
45+
FbConsPutChar(Ch, Attr, X, Y);
4646
}
4747

4848
static UCHAR
@@ -149,13 +149,13 @@ XboxVideoSetDisplayMode(PCSTR DisplayMode, BOOLEAN Init)
149149
VOID
150150
XboxVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth)
151151
{
152-
VidFbGetDisplaySize(Width, Height, Depth);
152+
FbConsGetDisplaySize(Width, Height, Depth);
153153
}
154154

155155
ULONG
156156
XboxVideoGetBufferSize(VOID)
157157
{
158-
return VidFbGetBufferSize();
158+
return FbConsGetBufferSize();
159159
}
160160

161161
VOID
@@ -179,7 +179,7 @@ XboxVideoHideShowTextCursor(BOOLEAN Show)
179179
VOID
180180
XboxVideoCopyOffScreenBufferToVRAM(PVOID Buffer)
181181
{
182-
VidFbCopyOffScreenBufferToVRAM(Buffer);
182+
FbConsCopyOffScreenBufferToVRAM(Buffer);
183183
}
184184

185185
BOOLEAN

boot/freeldr/freeldr/arch/uefi/ueficon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ UefiConsPutChar(int c)
3434
NeedScroll = (CurrentCursorY >= Height);
3535
if (NeedScroll)
3636
{
37-
VidFbScrollUp(CurrentAttr);
37+
FbConsScrollUp(CurrentAttr);
3838
--CurrentCursorY;
3939
}
4040
if (c == '\r')

boot/freeldr/freeldr/arch/uefi/uefivid.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@ UefiInitializeVideo(VOID)
7373
VOID
7474
UefiVideoClearScreen(UCHAR Attr)
7575
{
76-
VidFbClearScreen(Attr);
76+
FbConsClearScreen(Attr);
7777
}
7878

7979
VOID
8080
UefiVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y)
8181
{
82-
VidFbPutChar(Ch, Attr, X, Y);
82+
FbConsPutChar(Ch, Attr, X, Y);
8383
}
8484

8585
VOID
8686
UefiVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth)
8787
{
88-
VidFbGetDisplaySize(Width, Height, Depth);
88+
FbConsGetDisplaySize(Width, Height, Depth);
8989
}
9090

9191
VIDEODISPLAYMODE
@@ -98,13 +98,13 @@ UefiVideoSetDisplayMode(PCSTR DisplayMode, BOOLEAN Init)
9898
ULONG
9999
UefiVideoGetBufferSize(VOID)
100100
{
101-
return VidFbGetBufferSize();
101+
return FbConsGetBufferSize();
102102
}
103103

104104
VOID
105105
UefiVideoCopyOffScreenBufferToVRAM(PVOID Buffer)
106106
{
107-
VidFbCopyOffScreenBufferToVRAM(Buffer);
107+
FbConsCopyOffScreenBufferToVRAM(Buffer);
108108
}
109109

110110
VOID

0 commit comments

Comments
 (0)