Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-29 05:54:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR] Work with Xbox GPU memory registers properly

Browse source 
Bug was noticed with GCC 8.4
This commit is contained in:
Stanislav Motylkov 2020-05-02 23:16:58 +03:00
parent d53ee9c69e
commit 764e884f5e
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c
View file

@ -124,8 +124,8 @@ XboxVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y)
UCHAR
NvGetCrtc(UCHAR Index)
{
*((PUCHAR) NV2A_CRTC_REGISTER_INDEX) = Index;
return *((PUCHAR) NV2A_CRTC_REGISTER_VALUE);
WRITE_REGISTER_UCHAR(NV2A_CRTC_REGISTER_INDEX, Index);
return READ_REGISTER_UCHAR(NV2A_CRTC_REGISTER_VALUE);
}
ULONG
@ -175,7 +175,7 @@ VOID
XboxVideoInit(VOID)
{
/* Reuse framebuffer that was set up by firmware */
FrameBuffer = (PVOID)*((PULONG) NV2A_CRTC_FRAMEBUFFER_START);
FrameBuffer = (PVOID)READ_REGISTER_ULONG(NV2A_CRTC_FRAMEBUFFER_START);
/* Verify that framebuffer address is page-aligned */
ASSERT((ULONG_PTR)FrameBuffer % PAGE_SIZE == 0);
@ -187,8 +187,8 @@ XboxVideoInit(VOID)
WARN("Could not detect framebuffer memory size, fallback to 4 MB\n");
}
ScreenWidth = *((PULONG) NV2A_RAMDAC_FP_HVALID_END) + 1;
ScreenHeight = *((PULONG) NV2A_RAMDAC_FP_VVALID_END) + 1;
ScreenWidth = READ_REGISTER_ULONG(NV2A_RAMDAC_FP_HVALID_END) + 1;
ScreenHeight = READ_REGISTER_ULONG(NV2A_RAMDAC_FP_VVALID_END) + 1;
/* Get BPP directly from NV2A CRTC (magic constants are from Cromwell) */
BytesPerPixel = 8 * (((NvGetCrtc(0x19) & 0xE0) << 3) | (NvGetCrtc(0x13) & 0xFF)) / ScreenWidth;
if (BytesPerPixel == 4)