Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 19:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VGA_NEW]

Browse source 
Fix build with msvc

svn path=/branches/cmake-bringup/; revision=50556
This commit is contained in:
Timo Kreuzer 2011-01-29 14:57:40 +00:00
parent e3d0802c23
commit a042b23093
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/video/miniport/vga_new/CMakeLists.txt
View file

@ -11,7 +11,11 @@ add_library(vga SHARED ${CMAKE_CURRENT_BINARY_DIR}/vga_vga.h.gch ${SOURCE})
target_link_libraries(vga libcntpr) target_link_libraries(vga libcntpr)
if(MSVC)
set_target_properties(vga PROPERTIES COMPILE_FLAGS "/Gz")
else()
set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin")
endif()
set_module_type(vga kernelmodedriver) set_module_type(vga kernelmodedriver)
add_importlibs(vga videoprt) add_importlibs(vga videoprt)

28
drivers/video/miniport/vga_new/vga.c
View file

@ -93,7 +93,7 @@ VgaSetPaletteReg(
PVIDEO_PALETTE_DATA PaletteBuffer, PVIDEO_PALETTE_DATA PaletteBuffer,
ULONG PaletteBufferSize ULONG PaletteBufferSize
); );
VP_STATUS VP_STATUS
VgaSetColorLookup( VgaSetColorLookup(
PHW_DEVICE_EXTENSION HwDeviceExtension, PHW_DEVICE_EXTENSION HwDeviceExtension,
@ -846,11 +846,11 @@ Return Value:
case IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES: case IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES:
{ {
VideoDebugPrint((2, "VgaStartIO - Query Public Address Ranges\n"));
PVIDEO_PUBLIC_ACCESS_RANGES portAccess; PVIDEO_PUBLIC_ACCESS_RANGES portAccess;
ULONG physicalPortLength; ULONG physicalPortLength;
VideoDebugPrint((2, "VgaStartIO - Query Public Address Ranges\n"));
if (RequestPacket->OutputBufferLength < if (RequestPacket->OutputBufferLength <
sizeof(VIDEO_PUBLIC_ACCESS_RANGES)) sizeof(VIDEO_PUBLIC_ACCESS_RANGES))
{ {
@ -882,7 +882,7 @@ Return Value:
// eVb: 1.17 [END] // eVb: 1.17 [END]
VideoDebugPrint((2, "VgaStartIO - mapping ports to (%x)\n", portAccess->VirtualAddress)); VideoDebugPrint((2, "VgaStartIO - mapping ports to (%x)\n", portAccess->VirtualAddress));
} }
break; break;
case IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES: case IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES:
@ -891,7 +891,7 @@ Return Value:
status = ERROR_INVALID_FUNCTION; status = ERROR_INVALID_FUNCTION;
break; break;
// //
// if we get here, an invalid IoControlCode was specified. // if we get here, an invalid IoControlCode was specified.
// //
@ -1371,7 +1371,7 @@ Return Value:
{ {
PVIDEOMODE CurrentMode = HwDeviceExtension->CurrentMode; PVIDEOMODE CurrentMode = HwDeviceExtension->CurrentMode;
USHORT i; USHORT i;
// //
// Check if the size of the data in the input buffer is large enough. // Check if the size of the data in the input buffer is large enough.
// //
@ -1400,9 +1400,9 @@ Return Value:
// //
// Check SVGA mode // Check SVGA mode
// //
if (CurrentMode->bitsPerPlane >= 8) return VbeSetColorLookup(HwDeviceExtension, ClutBuffer); if (CurrentMode->bitsPerPlane >= 8) return VbeSetColorLookup(HwDeviceExtension, ClutBuffer);
// eVb: 1.14 [END] // eVb: 1.14 [END]
// //
// Path for VGA mode // Path for VGA mode
// //
@ -1507,11 +1507,11 @@ VgaAcquireResources(
{ {
VP_STATUS Status = NO_ERROR; VP_STATUS Status = NO_ERROR;
ULONG Ranges, i; ULONG Ranges, i;
// //
// Try exclusive ranges (vga + ati) // Try exclusive ranges (vga + ati)
// //
Ranges = NUM_VGA_ACCESS_RANGES; Ranges = NUM_VGA_ACCESS_RANGES;
for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = FALSE; for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = FALSE;
if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR) if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR)
@ -1519,14 +1519,14 @@ VgaAcquireResources(
// //
// Not worked, try vga only // Not worked, try vga only
// //
Ranges = 3; Ranges = 3;
if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR) if (VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange) != NO_ERROR)
{ {
// //
// Still not, try shared ranges // Still not, try shared ranges
// //
for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE; for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE;
Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange); Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange);
if (Status == NO_ERROR) if (Status == NO_ERROR)
@ -1534,7 +1534,7 @@ VgaAcquireResources(
// //
// It did work // It did work
// //
VideoPortVerifyAccessRanges(DeviceExtension, 0, 0); VideoPortVerifyAccessRanges(DeviceExtension, 0, 0);
Status = NO_ERROR; Status = NO_ERROR;
} }
@ -1546,7 +1546,7 @@ VgaAcquireResources(
// //
// Worked with exclusive, also try shared // Worked with exclusive, also try shared
// //
for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE; for (i = 0; i < Ranges; i++) VgaAccessRange[i].RangeShareable = TRUE;
Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange); Status = VideoPortVerifyAccessRanges(DeviceExtension, Ranges, VgaAccessRange);
} }