Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-10 12:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge from amd64 branch:

Browse source 
34741 (tkreuzer)
[BOOTVID]
- make bootvid build for PLATFORM=PC instead of ARCH=i386 to share the files between i386 and amd64
- fix ULONG <-> pointer casts

svn path=/trunk/; revision=46432
This commit is contained in:
Timo Kreuzer 2010-03-25 05:25:07 +00:00
parent 67c1ce90bd
commit e13ac2cb13
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/base/bootvid/bootvid.rbuild
View file

@ -6,7 +6,7 @@
<include base="bootvid">.</include> <include base="bootvid">.</include>
<library>ntoskrnl</library> <library>ntoskrnl</library>
<library>hal</library> <library>hal</library>
<if property="ARCH" value="i386"> <if property="PLATFORM" value="PC">
<directory name="i386"> <directory name="i386">
<file>bootvid.c</file> <file>bootvid.c</file>
<file>bootdata.c</file> <file>bootdata.c</file>

2
reactos/drivers/base/bootvid/i386/bootvid.c
View file

@ -355,7 +355,7 @@ BOOLEAN
NTAPI NTAPI
VidInitialize(IN BOOLEAN SetMode) VidInitialize(IN BOOLEAN SetMode)
{ {
ULONG Context = 0; ULONG_PTR Context = 0;
PHYSICAL_ADDRESS TranslatedAddress; PHYSICAL_ADDRESS TranslatedAddress;
PHYSICAL_ADDRESS NullAddress = {{0, 0}}, VgaAddress; PHYSICAL_ADDRESS NullAddress = {{0, 0}}, VgaAddress;
ULONG AddressSpace = 1; ULONG AddressSpace = 1;

10
reactos/drivers/base/bootvid/i386/vga.c
View file

@ -319,8 +319,8 @@ VgaScroll(ULONG Scroll)
do do
{ {
/* Write value in the new position so that we can do the scroll */ /* Write value in the new position so that we can do the scroll */
WRITE_REGISTER_UCHAR((PUCHAR)j, WRITE_REGISTER_UCHAR(UlongToPtr(j),
READ_REGISTER_UCHAR((PUCHAR)j + i)); READ_REGISTER_UCHAR(UlongToPtr(j + i)));
/* Move to the next memory location to write to */ /* Move to the next memory location to write to */
j++; j++;
@ -1197,7 +1197,7 @@ VidSolidColorFill(IN ULONG Left,
__outpw(0x3CE, 7); __outpw(0x3CE, 7);
/* Calculate pixel position for the read */ /* 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 */ /* Select the bitmask register and write the mask */
__outpw(0x3CE, (USHORT)lMask); __outpw(0x3CE, (USHORT)lMask);
@ -1221,7 +1221,7 @@ VidSolidColorFill(IN ULONG Left,
if (Distance) if (Distance)
{ {
/* Calculate new pixel position */ /* Calculate new pixel position */
Offset = VgaBase + (Top * 80) + (PUCHAR)RightOffset; Offset = VgaBase + (Top * 80) + (PUCHAR)(ULONG_PTR)RightOffset;
Distance--; Distance--;
/* Select the bitmask register and write the mask */ /* Select the bitmask register and write the mask */
@ -1247,7 +1247,7 @@ VidSolidColorFill(IN ULONG Left,
if (Distance) if (Distance)
{ {
/* Calculate new pixel position */ /* 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 */ /* Set the bitmask to 0xFF for all 4 planes */
__outpw(0x3CE, 0xFF08); __outpw(0x3CE, 0xFF08);