[ros-diffs] [tkreuzer] 34741: - make bootvid build for PLATFORM=PC instead of ARCH=i386 to share the files between i386 and amd64 - fix ULONG <-> pointer casts - add bootvid_amd64.def

Author: tkreuzer
Date: Thu Jul 24 09:15:12 2008
New Revision: 34741

URL: http://svn.reactos.org/svn/reactos?rev=34741&view=rev
Log:
- make bootvid build for PLATFORM=PC instead of ARCH=i386 to share the files between i386
and amd64
- fix ULONG <-> pointer casts
- add bootvid_amd64.def

Added:
    branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def   (with
props)
Modified:
    branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild
    branches/ros-amd64-bringup/reactos/drivers/base/bootvid/i386/bootvid.c
    branches/ros-amd64-bringup/reactos/drivers/base/bootvid/i386/vga.c

Modified: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1]
Thu Jul 24 09:15:12 2008
@@ -6,7 +6,7 @@
 	<include base="bootvid">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
-	<if property="ARCH" value="i386">
+	<if property="PLATFORM" value="PC">
 		<directory name="i386">
 			<file>bootvid.c</file>
 			<file>bootdata.c</file>
@@ -14,7 +14,7 @@
 		</directory>
 	</if>
 	<if property="ARCH" value="arm">
-        <directory name="arm">
+		<directory name="arm">
 			<file>bootvid.c</file>
 			<file>bootdata.c</file>
 		</directory>

Added: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def (added)
+++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def [iso-8859-1]
Thu Jul 24 09:15:12 2008
@@ -1,0 +1,15 @@
+LIBRARY BOOTVID.DLL
+
+EXPORTS
+VidBitBlt
+VidBufferToScreenBlt
+VidCleanUp
+VidDisplayString
+VidDisplayStringXY
+VidInitialize
+VidResetDisplay
+VidScreenToBufferBlt
+VidSetScrollRegion
+VidSetTextColor
+VidSolidColorFill
+

Propchange: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_amd64.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/i386/bootvid.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/i386/bootvid.c [iso-8859-1]
Thu Jul 24 09:15:12 2008
@@ -355,7 +355,7 @@
 NTAPI
 VidInitialize(IN BOOLEAN SetMode)
 {
-    ULONG Context = 0;
+    ULONG_PTR Context = 0;
     PHYSICAL_ADDRESS TranslatedAddress;
     PHYSICAL_ADDRESS NullAddress = {{0}};
     ULONG AddressSpace = 1;

Modified: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/i386/vga.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Thu
Jul 24 09:15:12 2008
@@ -314,8 +314,8 @@
             do
             {
                 /* Write value in the new position so that we can do the scroll */
-                WRITE_REGISTER_UCHAR((PUCHAR)j,
-                                     READ_REGISTER_UCHAR((PUCHAR)j + i));
+                WRITE_REGISTER_UCHAR(UlongToPtr(j),
+                                     READ_REGISTER_UCHAR(UlongToPtr(j + i)));
 
                 /* Move to the next memory location to write to */
                 j++;
@@ -1192,7 +1192,7 @@
     __outpw(0x3CE, 7);
 
     /* Calculate pixel position for the read */
-    Offset = VgaBase + (Top * 80) + (PUCHAR)LeftOffset;
+    Offset = VgaBase + (Top * 80) + (PUCHAR)(ULONG_PTR)LeftOffset;
 
     /* Select the bitmask register and write the mask */
     __outpw(0x3CE, (USHORT)lMask);
@@ -1216,7 +1216,7 @@
     if (Distance)
     {
         /* Calculate new pixel position */
-        Offset = VgaBase + (Top * 80) + (PUCHAR)RightOffset;
+        Offset = VgaBase + (Top * 80) + (PUCHAR)(ULONG_PTR)RightOffset;
         Distance--;
 
         /* Select the bitmask register and write the mask */
@@ -1242,7 +1242,7 @@
         if (Distance)
         {
             /* Calculate new pixel position */
-            Offset = VgaBase + (Top * 80) + (PUCHAR)(LeftOffset + 1);
+            Offset = VgaBase + (Top * 80) + (PUCHAR)(ULONG_PTR)(LeftOffset + 1);
 
             /* Set the bitmask to 0xFF for all 4 planes */
             __outpw(0x3CE, 0xFF08);