[ros-diffs] [ros-arm-bringup] 33975: - Implement VidSolidColorFill, VidSetScrollRegion and VidSetTextColor - Fix a bug in VidpBuildColor

Author: ros-arm-bringup
Date: Sat Jun 14 23:11:21 2008
New Revision: 33975

URL: http://svn.reactos.org/svn/reactos?rev=33975&view=rev
Log:
- Implement VidSolidColorFill, VidSetScrollRegion and VidSetTextColor
- Fix a bug in VidpBuildColor

Modified:
    trunk/reactos/drivers/base/bootvid/arm/bootvid.c

Modified: trunk/reactos/drivers/base/bootvid/arm/bootvid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/arm/bo...
==============================================================================
--- trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/base/bootvid/arm/bootvid.c [iso-8859-1] Sat Jun 14 23:11:21 2008
@@ -23,6 +23,16 @@
 #define WRITE_REGISTER_USHORT(r, v) (*(volatile USHORT *)(r) = (v))

PUSHORT VgaArmBase;
+UCHAR VidpTextColor = 0xF;
+ULONG VidpCurrentX = 0;
+ULONG VidpCurrentY = 0;
+ULONG VidpScrollRegion[4] =
+{
+    0,
+    0,
+    640 - 1,
+    480 - 1
+};

typedef struct _VGA_COLOR
 {
@@ -69,7 +79,7 @@
     //
     // Build the 16-bit color mask
     //
-    return ((Blue & 0x1F) << 11) | ((Green & 0x1F) << 6) | ((Red & 0x1F));
+    return ((Red & 0x1F) << 11) | ((Green & 0x1F) << 6) | ((Blue & 0x1F));
 }

@@ -182,9 +192,18 @@
 NTAPI
 VidSetTextColor(ULONG Color)
 {
-    UNIMPLEMENTED;
-    while (TRUE);
-    return 0;
+    UCHAR OldColor;
+    
+    //
+    // Save the old, set the new
+    //
+    OldColor = VidpTextColor;
+    VidpTextColor = Color;
+    
+    //
+    // Return the old text color
+    //
+    return OldColor;
 }

/*
@@ -211,8 +230,19 @@
                    ULONG x2,
                    ULONG y2)
 {
-    UNIMPLEMENTED;
-    while (TRUE);
+    /* Assert alignment */
+    ASSERT((x1 & 0x7) == 0);
+    ASSERT((x2 & 0x7) == 7);
+    
+    /* Set Scroll Region */
+    VidpScrollRegion[0] = x1;
+    VidpScrollRegion[1] = y1;
+    VidpScrollRegion[2] = x2;
+    VidpScrollRegion[3] = y2;
+    
+    /* Set current X and Y */
+    VidpCurrentX = x1;
+    VidpCurrentY = y1;
 }

/*
@@ -293,6 +323,22 @@
                   IN ULONG Bottom,
                   IN UCHAR Color)
 {
-    UNIMPLEMENTED;
-    while (TRUE);
-}
+    int y, x;
+    
+    //
+    // Loop along the Y-axis
+    //
+	for (y = Top; y <= Bottom; y++)
+	{
+        //
+        // Loop along the X-axis
+        //
+        for (x = Left; x <= Right; x++)
+        {
+            //
+            // Draw the pixel
+            //
+            VidpSetPixel(x, y, Color);
+        }
+	}    
+}