X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=boot%2Ffreeldr%2Ffreeldr%2Farch%2Fi386%2Fxboxvideo.c;h=d5839024d43eb1f1f05baa85565f17c28c2eca34;hp=c664eef5d3ca04a842df350310e1006f7fd250b9;hb=297abde716495c13cfcafac5c0dee867cfb4c7a3;hpb=7909284220c291465de9ef02a9bbddf903fafe7f

diff --git a/boot/freeldr/freeldr/arch/i386/xboxvideo.c b/boot/freeldr/freeldr/arch/i386/xboxvideo.c
index c664eef5d3c..d5839024d43 100644
--- a/boot/freeldr/freeldr/arch/i386/xboxvideo.c
+++ b/boot/freeldr/freeldr/arch/i386/xboxvideo.c
@@ -40,8 +40,6 @@ static ULONG Delta;
 
 #define MAKE_COLOR(Red, Green, Blue) (0xff000000 | (((Red) & 0xff) << 16) | (((Green) & 0xff) << 8) | ((Blue) & 0xff))
 
-BOOLEAN I2CTransmitByteGetReturn(UCHAR bPicAddressI2cFormat, UCHAR bDataToWrite, ULONG *Return);
-
 static VOID
 XboxVideoOutputChar(UCHAR Char, unsigned X, unsigned Y, ULONG FgColor, ULONG BgColor)
 {
@@ -122,48 +120,45 @@ XboxVideoPutChar(int Ch, UCHAR Attr, unsigned X, unsigned Y)
   XboxVideoOutputChar(Ch, X, Y, FgColor, BgColor);
 }
 
+UCHAR
+NvGetCrtc(UCHAR Index)
+{
+    *((PUCHAR) NV2A_CRTC_REGISTER_INDEX) = Index;
+    return *((PUCHAR) NV2A_CRTC_REGISTER_VALUE);
+}
+
 VOID
 XboxVideoInit(VOID)
 {
-  ULONG AvMode;
-
   /* Reuse framebuffer that was set up by firmware */
-  FrameBuffer = (PVOID)*((PULONG) 0xfd600800);
+  FrameBuffer = (PVOID)*((PULONG) NV2A_CRTC_FRAMEBUFFER_START);
   /* Verify that framebuffer address is page-aligned */
   ASSERT((ULONG_PTR)FrameBuffer % PAGE_SIZE == 0);
 
   /* FIXME: obtain fb size from firmware somehow (Cromwell reserves high 4 MB of RAM) */
   FrameBufferSize = 4 * 1024 * 1024;
 
-  /* FIXME: don't use SMBus, obtain current video resolution directly from NV2A */
-  if (I2CTransmitByteGetReturn(0x10, 0x04, &AvMode))
-    {
-      if (1 == AvMode) /* HDTV */
-        {
-          ScreenWidth = 720;
-        }
-      else
-        {
-          /* FIXME Other possible values of AvMode:
-           * 0 - AV_SCART_RGB
-           * 2 - AV_VGA_SOG
-           * 4 - AV_SVIDEO
-           * 6 - AV_COMPOSITE
-           * 7 - AV_VGA
-           * other AV_COMPOSITE
-           */
-          ScreenWidth = 640;
-        }
-    }
+  ScreenWidth = *((PULONG) NV2A_RAMDAC_FP_HVALID_END) + 1;
+  ScreenHeight = *((PULONG) 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)
+  {
+    ASSERT((NvGetCrtc(0x28) & 0xF) == BytesPerPixel - 1);
+  }
   else
-    {
-      ScreenWidth = 640;
-    }
-
-  ScreenHeight = 480;
-  BytesPerPixel = 4;
+  {
+    ASSERT((NvGetCrtc(0x28) & 0xF) == BytesPerPixel);
+  }
   Delta = (ScreenWidth * BytesPerPixel + 3) & ~ 0x3;
 
+  /* Verify screen resolution */
+  ASSERT(ScreenWidth > 1);
+  ASSERT(ScreenHeight > 1);
+  ASSERT(BytesPerPixel >= 1 && BytesPerPixel <= 4);
+  /* Verify that screen fits framebuffer size */
+  ASSERT(ScreenWidth * ScreenHeight * BytesPerPixel <= FrameBufferSize);
+
   XboxVideoClearScreenColor(MAKE_COLOR(0, 0, 0), TRUE);
 }