Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 21:36:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- PCHify vgamp.

Browse source 
- fix some definition problems.
- make it build with msvc.

svn path=/trunk/; revision=20677
This commit is contained in:
Alex Ionescu 2006-01-07 22:34:25 +00:00
parent 247736b04e
commit 9cbd310bec
5 changed files with 56 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

16
reactos/drivers/video/miniport/vga/initvga.c
View file

@ -1,10 +1,4 @@
#include <ntddk.h> #include "vgamp.h"
#include <miniport.h>
#include <video.h>
#include "vgavideo.h"
#define NDEBUG
#include <debug.h>
static VGA_REGISTERS Mode12Regs = static VGA_REGISTERS Mode12Regs =
{ {
@ -24,10 +18,10 @@ static VGA_REGISTERS Mode12Regs =
VGA_REGISTERS TextModeRegs; VGA_REGISTERS TextModeRegs;
STATIC VOID FASTCALL static VOID FASTCALL
vgaSaveRegisters(PVGA_REGISTERS Registers) vgaSaveRegisters(PVGA_REGISTERS Registers)
{ {
UINT i; SIZE_T i;
for (i = 0; i < sizeof(Registers->CRT); i++) for (i = 0; i < sizeof(Registers->CRT); i++)
{ {
@ -57,10 +51,10 @@ vgaSaveRegisters(PVGA_REGISTERS Registers)
Registers->Misc = VideoPortReadPortUchar(MISC); Registers->Misc = VideoPortReadPortUchar(MISC);
} }
STATIC VOID FASTCALL static VOID FASTCALL
vgaSetRegisters(PVGA_REGISTERS Registers) vgaSetRegisters(PVGA_REGISTERS Registers)
{ {
UINT i; SIZE_T i;
/* Update misc output register */ /* Update misc output register */
VideoPortWritePortUchar(MISC, Registers->Misc); VideoPortWritePortUchar(MISC, Registers->Misc);

47
reactos/drivers/video/miniport/vga/vgamp.c
View file

@ -72,7 +72,7 @@ DriverEntry(IN PVOID Context1,
// RETURNS: // RETURNS:
// VP_STATUS // VP_STATUS
static VP_STATUS STDCALL VP_STATUS STDCALL
VGAFindAdapter(PVOID DeviceExtension, VGAFindAdapter(PVOID DeviceExtension,
PVOID Context, PVOID Context,
PWSTR ArgumentString, PWSTR ArgumentString,
@ -82,7 +82,7 @@ VGAFindAdapter(PVOID DeviceExtension,
/* FIXME: Determine if the adapter is present */ /* FIXME: Determine if the adapter is present */
*Again = FALSE; *Again = FALSE;
return STATUS_SUCCESS; return NO_ERROR;
/* FIXME: Claim any necessary memory/IO resources for the adapter */ /* FIXME: Claim any necessary memory/IO resources for the adapter */
/* FIXME: Map resources into system memory for the adapter */ /* FIXME: Map resources into system memory for the adapter */
@ -104,7 +104,7 @@ VGAFindAdapter(PVOID DeviceExtension,
// PVOID DeviceExtension // PVOID DeviceExtension
// RETURNS: // RETURNS:
// BOOLEAN Success or failure // BOOLEAN Success or failure
static BOOLEAN STDCALL BOOLEAN STDCALL
VGAInitialize(PVOID DeviceExtension) VGAInitialize(PVOID DeviceExtension)
{ {
return TRUE; return TRUE;
@ -161,13 +161,13 @@ VGAInitialize(PVOID DeviceExtension)
// BOOLEAN This function must return TRUE, and complete the work or // BOOLEAN This function must return TRUE, and complete the work or
// set an error status in the VRP. // set an error status in the VRP.
static BOOLEAN STDCALL BOOLEAN STDCALL
VGAStartIO(PVOID DeviceExtension, VGAStartIO(PVOID DeviceExtension,
PVIDEO_REQUEST_PACKET RequestPacket) PVIDEO_REQUEST_PACKET RequestPacket)
{ {
BOOL Result; BOOLEAN Result;
RequestPacket->StatusBlock->Status = STATUS_UNSUCCESSFUL; RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
switch (RequestPacket->IoControlCode) switch (RequestPacket->IoControlCode)
{ {
@ -216,7 +216,8 @@ VGAStartIO(PVOID DeviceExtension,
break; break;
case IOCTL_VIDEO_RESET_DEVICE: case IOCTL_VIDEO_RESET_DEVICE:
Result = VGAResetDevice(RequestPacket->StatusBlock); VGAResetDevice(RequestPacket->StatusBlock);
Result = TRUE;
break; break;
case IOCTL_VIDEO_SET_COLOR_REGISTERS: case IOCTL_VIDEO_SET_COLOR_REGISTERS:
@ -275,7 +276,7 @@ VGAStartIO(PVOID DeviceExtension,
RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
case IOCTL_VIDEO_SET_PALETTE_REGISTERS: case IOCTL_VIDEO_SET_PALETTE_REGISTERS:
Result = VGASetPaletteRegisters((PWORD) RequestPacket->InputBuffer, Result = VGASetPaletteRegisters((PUSHORT) RequestPacket->InputBuffer,
RequestPacket->StatusBlock); RequestPacket->StatusBlock);
break; break;
@ -318,12 +319,12 @@ VGAStartIO(PVOID DeviceExtension,
#endif #endif
default: default:
RequestPacket->StatusBlock->Status = STATUS_NOT_IMPLEMENTED; RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION;
return FALSE; return FALSE;
} }
if (Result) if (Result)
RequestPacket->StatusBlock->Status = STATUS_SUCCESS; RequestPacket->StatusBlock->Status = NO_ERROR;
return TRUE; return TRUE;
} }
@ -367,7 +368,7 @@ VGAInterrupt(PVOID DeviceExtension)
// BOOLEAN TRUE if no further action is necessary, FALSE if the system // BOOLEAN TRUE if no further action is necessary, FALSE if the system
// needs to still do a BIOS int 10 reset. // needs to still do a BIOS int 10 reset.
static BOOLEAN STDCALL BOOLEAN STDCALL
VGAResetHw(PVOID DeviceExtension, VGAResetHw(PVOID DeviceExtension,
ULONG Columns, ULONG Columns,
ULONG Rows) ULONG Rows)
@ -397,7 +398,7 @@ VGATimer(PVOID DeviceExtension)
#endif #endif
BOOL VGAMapVideoMemory(IN PVOID DeviceExtension, BOOLEAN VGAMapVideoMemory(IN PVOID DeviceExtension,
IN PVIDEO_MEMORY RequestedAddress, IN PVIDEO_MEMORY RequestedAddress,
OUT PVIDEO_MEMORY_INFORMATION MapInformation, OUT PVIDEO_MEMORY_INFORMATION MapInformation,
OUT PSTATUS_BLOCK StatusBlock) OUT PSTATUS_BLOCK StatusBlock)
@ -428,14 +429,14 @@ BOOL VGAMapVideoMemory(IN PVOID DeviceExtension,
return TRUE; return TRUE;
} }
BOOL VGAQueryAvailModes(OUT PVIDEO_MODE_INFORMATION ReturnedModes, BOOLEAN VGAQueryAvailModes(OUT PVIDEO_MODE_INFORMATION ReturnedModes,
OUT PSTATUS_BLOCK StatusBlock) OUT PSTATUS_BLOCK StatusBlock)
{ {
/* Only one mode exists in VGA (640x480), so use VGAQueryCurrentMode */ /* Only one mode exists in VGA (640x480), so use VGAQueryCurrentMode */
return VGAQueryCurrentMode(ReturnedModes, StatusBlock); return VGAQueryCurrentMode(ReturnedModes, StatusBlock);
} }
BOOL VGAQueryCurrentMode(OUT PVIDEO_MODE_INFORMATION CurrentMode, BOOLEAN VGAQueryCurrentMode(OUT PVIDEO_MODE_INFORMATION CurrentMode,
OUT PSTATUS_BLOCK StatusBlock) OUT PSTATUS_BLOCK StatusBlock)
{ {
CurrentMode->Length = sizeof(VIDEO_MODE_INFORMATION); CurrentMode->Length = sizeof(VIDEO_MODE_INFORMATION);
@ -464,7 +465,7 @@ BOOL VGAQueryCurrentMode(OUT PVIDEO_MODE_INFORMATION CurrentMode,
return TRUE; return TRUE;
} }
BOOL VGAQueryNumAvailModes(OUT PVIDEO_NUM_MODES NumberOfModes, BOOLEAN VGAQueryNumAvailModes(OUT PVIDEO_NUM_MODES NumberOfModes,
OUT PSTATUS_BLOCK StatusBlock) OUT PSTATUS_BLOCK StatusBlock)
{ {
NumberOfModes->NumModes = 1; NumberOfModes->NumModes = 1;
@ -473,7 +474,7 @@ BOOL VGAQueryNumAvailModes(OUT PVIDEO_NUM_MODES NumberOfModes,
return TRUE; return TRUE;
} }
BOOL VGASetPaletteRegisters(IN PWORD PaletteRegisters, BOOLEAN VGASetPaletteRegisters(IN PUSHORT PaletteRegisters,
OUT PSTATUS_BLOCK StatusBlock) OUT PSTATUS_BLOCK StatusBlock)
{ {
; ;
@ -502,7 +503,7 @@ BOOL VGASetPaletteRegisters(IN PWORD PaletteRegisters,
return TRUE; return TRUE;
} }
BOOL VGASetColorRegisters(IN PVIDEO_CLUT ColorLookUpTable, BOOLEAN VGASetColorRegisters(IN PVIDEO_CLUT ColorLookUpTable,
OUT PSTATUS_BLOCK StatusBlock) OUT PSTATUS_BLOCK StatusBlock)
{ {
int i; int i;
@ -518,7 +519,7 @@ BOOL VGASetColorRegisters(IN PVIDEO_CLUT ColorLookUpTable,
return TRUE; return TRUE;
} }
BOOL VGASetCurrentMode(IN PVIDEO_MODE RequestedMode, BOOLEAN VGASetCurrentMode(IN PVIDEO_MODE RequestedMode,
OUT PSTATUS_BLOCK StatusBlock) OUT PSTATUS_BLOCK StatusBlock)
{ {
if(RequestedMode->RequestedMode == 12) if(RequestedMode->RequestedMode == 12)
@ -531,17 +532,17 @@ BOOL VGASetCurrentMode(IN PVIDEO_MODE RequestedMode,
} }
} }
BOOL VGAShareVideoMemory(IN PVIDEO_SHARE_MEMORY RequestedMemory, BOOLEAN VGAShareVideoMemory(IN PVIDEO_SHARE_MEMORY RequestedMemory,
OUT PVIDEO_MEMORY_INFORMATION ReturnedMemory, OUT PVIDEO_MEMORY_INFORMATION ReturnedMemory,
OUT PSTATUS_BLOCK StatusBlock) OUT PSTATUS_BLOCK StatusBlock)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
StatusBlock->Status = STATUS_NOT_IMPLEMENTED; StatusBlock->Status = ERROR_INVALID_FUNCTION;
return FALSE; return FALSE;
} }
BOOL VGAUnmapVideoMemory(IN PVOID DeviceExtension, BOOLEAN VGAUnmapVideoMemory(IN PVOID DeviceExtension,
IN PVIDEO_MEMORY MemoryToUnmap, IN PVIDEO_MEMORY MemoryToUnmap,
OUT PSTATUS_BLOCK StatusBlock) OUT PSTATUS_BLOCK StatusBlock)
{ {
@ -553,11 +554,11 @@ BOOL VGAUnmapVideoMemory(IN PVOID DeviceExtension,
return FALSE; return FALSE;
} }
BOOL VGAUnshareVideoMemory(IN PVIDEO_MEMORY MemoryToUnshare, BOOLEAN VGAUnshareVideoMemory(IN PVIDEO_MEMORY MemoryToUnshare,
OUT PSTATUS_BLOCK StatusBlock) OUT PSTATUS_BLOCK StatusBlock)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
StatusBlock->Status = STATUS_NOT_IMPLEMENTED; StatusBlock->Status = ERROR_INVALID_FUNCTION;
return FALSE; return FALSE;
} }

44
reactos/drivers/video/miniport/vga/vgamp.h
View file

@ -23,9 +23,17 @@
/* INCLUDES *******************************************************************/ /* INCLUDES *******************************************************************/
#ifdef _MSC_VER
#include "dderror.h"
#include "devioctl.h"
#else
#include <ntddk.h> #include <ntddk.h>
#include <miniport.h> #endif
#include <video.h>
#include "miniport.h"
#include "ntddvdeo.h"
#include "video.h"
#include "vgavideo.h"
#define UNIMPLEMENTED \ #define UNIMPLEMENTED \
VideoPortDebugPrint(Error, "WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); VideoPortDebugPrint(Error, "WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__);
@ -33,7 +41,7 @@
void void
InitVGAMode(); InitVGAMode();
static VP_STATUS STDCALL VP_STATUS STDCALL
VGAFindAdapter( VGAFindAdapter(
PVOID DeviceExtension, PVOID DeviceExtension,
PVOID Context, PVOID Context,
@ -41,11 +49,11 @@ VGAFindAdapter(
PVIDEO_PORT_CONFIG_INFO ConfigInfo, PVIDEO_PORT_CONFIG_INFO ConfigInfo,
PUCHAR Again); PUCHAR Again);
static BOOLEAN STDCALL BOOLEAN STDCALL
VGAInitialize( VGAInitialize(
PVOID DeviceExtension); PVOID DeviceExtension);
static BOOLEAN STDCALL BOOLEAN STDCALL
VGAStartIO( VGAStartIO(
PVOID DeviceExtension, PVOID DeviceExtension,
PVIDEO_REQUEST_PACKET RequestPacket); PVIDEO_REQUEST_PACKET RequestPacket);
@ -53,7 +61,7 @@ VGAStartIO(
/*static BOOLEAN STDCALL /*static BOOLEAN STDCALL
VGAInterrupt(PVOID DeviceExtension);*/ VGAInterrupt(PVOID DeviceExtension);*/
static BOOLEAN STDCALL BOOLEAN STDCALL
VGAResetHw( VGAResetHw(
PVOID DeviceExtension, PVOID DeviceExtension,
ULONG Columns, ULONG Columns,
@ -63,59 +71,59 @@ VGAResetHw(
VGATimer(PVOID DeviceExtension);*/ VGATimer(PVOID DeviceExtension);*/
/* Mandatory IoControl routines */ /* Mandatory IoControl routines */
BOOL BOOLEAN
VGAMapVideoMemory( VGAMapVideoMemory(
IN PVOID DeviceExtension, IN PVOID DeviceExtension,
IN PVIDEO_MEMORY RequestedAddress, IN PVIDEO_MEMORY RequestedAddress,
OUT PVIDEO_MEMORY_INFORMATION MapInformation, OUT PVIDEO_MEMORY_INFORMATION MapInformation,
OUT PSTATUS_BLOCK StatusBlock); OUT PSTATUS_BLOCK StatusBlock);
BOOL BOOLEAN
VGAQueryAvailModes( VGAQueryAvailModes(
OUT PVIDEO_MODE_INFORMATION ReturnedModes, OUT PVIDEO_MODE_INFORMATION ReturnedModes,
OUT PSTATUS_BLOCK StatusBlock); OUT PSTATUS_BLOCK StatusBlock);
BOOL BOOLEAN
VGAQueryCurrentMode( VGAQueryCurrentMode(
OUT PVIDEO_MODE_INFORMATION CurrentMode, OUT PVIDEO_MODE_INFORMATION CurrentMode,
OUT PSTATUS_BLOCK StatusBlock); OUT PSTATUS_BLOCK StatusBlock);
BOOL BOOLEAN
VGAQueryNumAvailModes( VGAQueryNumAvailModes(
OUT PVIDEO_NUM_MODES NumberOfModes, OUT PVIDEO_NUM_MODES NumberOfModes,
OUT PSTATUS_BLOCK StatusBlock); OUT PSTATUS_BLOCK StatusBlock);
BOOL VOID
VGAResetDevice(OUT PSTATUS_BLOCK StatusBlock); VGAResetDevice(OUT PSTATUS_BLOCK StatusBlock);
BOOL BOOLEAN
VGASetColorRegisters( VGASetColorRegisters(
IN PVIDEO_CLUT ColorLookUpTable, IN PVIDEO_CLUT ColorLookUpTable,
OUT PSTATUS_BLOCK StatusBlock); OUT PSTATUS_BLOCK StatusBlock);
BOOL BOOLEAN
VGASetPaletteRegisters( VGASetPaletteRegisters(
IN PWORD PaletteRegisters, IN PUSHORT PaletteRegisters,
OUT PSTATUS_BLOCK StatusBlock); OUT PSTATUS_BLOCK StatusBlock);
BOOL BOOLEAN
VGASetCurrentMode( VGASetCurrentMode(
IN PVIDEO_MODE RequestedMode, IN PVIDEO_MODE RequestedMode,
OUT PSTATUS_BLOCK StatusBlock); OUT PSTATUS_BLOCK StatusBlock);
BOOL BOOLEAN
VGAShareVideoMemory( VGAShareVideoMemory(
IN PVIDEO_SHARE_MEMORY RequestedMemory, IN PVIDEO_SHARE_MEMORY RequestedMemory,
OUT PVIDEO_MEMORY_INFORMATION ReturnedMemory, OUT PVIDEO_MEMORY_INFORMATION ReturnedMemory,
OUT PSTATUS_BLOCK StatusBlock); OUT PSTATUS_BLOCK StatusBlock);
BOOL BOOLEAN
VGAUnmapVideoMemory( VGAUnmapVideoMemory(
IN PVOID DeviceExtension, IN PVOID DeviceExtension,
IN PVIDEO_MEMORY MemoryToUnmap, IN PVIDEO_MEMORY MemoryToUnmap,
OUT PSTATUS_BLOCK StatusBlock); OUT PSTATUS_BLOCK StatusBlock);
BOOL BOOLEAN
VGAUnshareVideoMemory( VGAUnshareVideoMemory(
IN PVIDEO_MEMORY MemoryToUnshare, IN PVIDEO_MEMORY MemoryToUnshare,
OUT PSTATUS_BLOCK StatusBlock); OUT PSTATUS_BLOCK StatusBlock);

1
reactos/drivers/video/miniport/vga/vgamp.xml
View file

@ -5,4 +5,5 @@
<file>initvga.c</file> <file>initvga.c</file>
<file>vgamp.c</file> <file>vgamp.c</file>
<file>vgamp.rc</file> <file>vgamp.rc</file>
<pch>vgamp.h</pch>
</module> </module>

2
reactos/drivers/video/miniport/vga/vgavideo.h
View file

@ -1,5 +1,3 @@
#include <ntddk.h>
#include <ntddvdeo.h>
#define VGA_NORMAL 0 #define VGA_NORMAL 0
#define VGA_AND 8 #define VGA_AND 8