- Cleaned up the Boot Video driver.

- Replaced most of the magic numbers by defines.
- Changed the video mode setting to directly program the VGA registers instead of using Ke386CallBios.
- Properly map the video memory.

svn path=/trunk/; revision=8534

reactos/drivers/dd/bootvid/bootvid.h

@@ -0,0 +1,124 @@
+/*
+ * ReactOS Boot video driver
+ *
+ * Copyright (C) 2003 Casper S. Hornstroup
+ * Copyright (C) 2004 Filip Navara
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Id: bootvid.h,v 1.1 2004/03/04 18:55:09 navaraf Exp $
+ */
+
+#ifndef _BOOTVID_H
+#define _BOOTVID_H
+
+#define PALETTE_FADE_STEPS  20
+#define PALETTE_FADE_TIME   20 * 10000 /* 20ms */
+
+/*
+ * Windows Bitmap structures
+ */
+
+#define RT_BITMAP   2
+
+typedef struct tagRGBQUAD
+{
+   unsigned char rgbBlue;
+   unsigned char rgbGreen;
+   unsigned char rgbRed;
+   unsigned char rgbReserved;
+} RGBQUAD, *PRGBQUAD;
+
+typedef long FXPT2DOT30;
+
+typedef struct tagCIEXYZ
+{
+   FXPT2DOT30 ciexyzX; 
+   FXPT2DOT30 ciexyzY; 
+   FXPT2DOT30 ciexyzZ; 
+} CIEXYZ, *LPCIEXYZ;
+
+typedef struct tagCIEXYZTRIPLE
+{
+   CIEXYZ ciexyzRed; 
+   CIEXYZ ciexyzGreen; 
+   CIEXYZ ciexyzBlue; 
+} CIEXYZTRIPLE, *LPCIEXYZTRIPLE;
+
+typedef struct { 
+   DWORD bV5Size; 
+   LONG bV5Width; 
+   LONG bV5Height; 
+   WORD bV5Planes; 
+   WORD bV5BitCount; 
+   DWORD bV5Compression; 
+   DWORD bV5SizeImage; 
+   LONG bV5XPelsPerMeter; 
+   LONG bV5YPelsPerMeter; 
+   DWORD bV5ClrUsed; 
+   DWORD bV5ClrImportant; 
+   DWORD bV5RedMask; 
+   DWORD bV5GreenMask; 
+   DWORD bV5BlueMask; 
+   DWORD bV5AlphaMask; 
+   DWORD bV5CSType; 
+   CIEXYZTRIPLE bV5Endpoints; 
+   DWORD bV5GammaRed; 
+   DWORD bV5GammaGreen; 
+   DWORD bV5GammaBlue; 
+   DWORD bV5Intent; 
+   DWORD bV5ProfileData; 
+   DWORD bV5ProfileSize; 
+   DWORD bV5Reserved; 
+} BITMAPV5HEADER, *PBITMAPV5HEADER; 
+
+/*
+ * Private driver structures
+ */
+
+typedef struct {
+  ULONG r;
+  ULONG g;
+  ULONG b;
+} FADER_PALETTE_ENTRY;
+
+typedef struct _VGA_REGISTERS
+{
+   UCHAR CRT[24];
+   UCHAR Attribute[21];
+   UCHAR Graphics[9];
+   UCHAR Sequencer[5];
+   UCHAR Misc;
+} VGA_REGISTERS, *PVGA_REGISTERS;
+
+/* VGA registers */
+#define MISC         (PUCHAR)0x3c2
+#define SEQ          (PUCHAR)0x3c4
+#define SEQDATA      (PUCHAR)0x3c5
+#define CRTC         (PUCHAR)0x3d4
+#define CRTCDATA     (PUCHAR)0x3d5
+#define GRAPHICS     (PUCHAR)0x3ce
+#define GRAPHICSDATA (PUCHAR)0x3cf
+#define ATTRIB       (PUCHAR)0x3c0
+#define STATUS       (PUCHAR)0x3da
+#define PELMASK      (PUCHAR)0x3c6
+#define PELINDEX     (PUCHAR)0x3c8
+#define PELDATA      (PUCHAR)0x3c9
+
+/* In pixelsups.S */
+extern VOID
+InbvPutPixels(int x, int y, unsigned long c);
+
+#endif /* _BOOTVID_H */

reactos/drivers/dd/bootvid/pixelsup_i386.S

@@ -1,4 +1,4 @@
-/* $Id: pixelsup_i386.S,v 1.1 2003/08/24 12:11:13 dwelch Exp $
+/* $Id: pixelsup_i386.S,v 1.2 2004/03/04 18:55:09 navaraf Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -52,44 +52,47 @@ _InbvPutPixels:
 .nomask:
 
   /* Compute offset in video memory and put it in EBX
-     offset = (x >> 3) + y80[y]; */
+     offset = (x >> 3) + (y << 4) + (y << 6); */
   movl	0xC(%ebp), %esi   /* y */
-  movl	_y80(,%esi, 4), %ebx
+  movl	%esi, %ebx
+  shll  $0x6, %ebx
+  shll  $0x4, %esi
+  addl	%esi, %ebx
   movl	0x8(%ebp), %eax   /* x */
   shrl  $0x3, %eax
   addl	%eax, %ebx
 
   /* Latch first byte
-    (UCHAR) READ_REGISTER_UCHAR(vidmem + offset+0); */
+    (UCHAR) READ_REGISTER_UCHAR(VideoMemory + offset+0); */
-  movl	(_vidmem), %esi
+  movl	(_VideoMemory), %esi
   addl	%ebx, %esi
   movb  0x0(%esi), %bl
   /* Write color index for first pixel
-     *((PUCHAR)(vidmem + offset+0)) = (c >> 0*8) & 0xff; */
+     *((PUCHAR)(VideoMemory + offset+0)) = (c >> 0*8) & 0xff; */
   movl  0x10(%ebp), %eax
   movb  %al, 0x0(%esi)
 
   /* Latch second byte
-    (UCHAR) READ_REGISTER_UCHAR(vidmem + offset+1); */
+    (UCHAR) READ_REGISTER_UCHAR(VideoMemory + offset+1); */
   movb  0x1(%esi), %bl
   /* Write color index for second pixel
-     *((PUCHAR)(vidmem + offset+1)) = (c >> 1*8) & 0xff; */
+     *((PUCHAR)(VideoMemory + offset+1)) = (c >> 1*8) & 0xff; */
   shrl  $0x8, %eax
   movb  %al, 0x1(%esi)
 
   /* Latch third byte
-    (UCHAR) READ_REGISTER_UCHAR(vidmem + offset+2); */
+    (UCHAR) READ_REGISTER_UCHAR(VideoMemory + offset+2); */
   movb  0x2(%esi), %bl
   /* Write color index for third pixel
-     *((PUCHAR)(vidmem + offset+2)) = (c >> 2*8) & 0xff; */
+     *((PUCHAR)(VideoMemory + offset+2)) = (c >> 2*8) & 0xff; */
   shrl  $0x8, %eax
   movb  %al, 0x2(%esi)
 
   /* Latch fourth byte
-    (UCHAR) READ_REGISTER_UCHAR(vidmem + offset+3); */
+    (UCHAR) READ_REGISTER_UCHAR(VideoMemory + offset+3); */
   movb  0x3(%esi), %bl
   /* Write color index for fourth pixel
-     *((PUCHAR)(vidmem + offset+3)) = (c >> 3*8) & 0xff; */
+     *((PUCHAR)(VideoMemory + offset+3)) = (c >> 3*8) & 0xff; */
   shrl  $0x8, %eax
   movb  %al, 0x3(%esi)