Fixed typos and warnings.

svn path=/trunk/; revision=2013
This commit is contained in:
Eric Kohl 2001-06-26 12:54:58 +00:00
parent edd3aa06a7
commit b8e0d46292
8 changed files with 37 additions and 36 deletions

View file

@ -103,7 +103,7 @@ DWORD getAvailableModes(HANDLE Driver,
BOOL InitVGA(PPDEV ppdev, BOOL bFirst)
{
UINT ReturnedDataLength;
ULONG ReturnedDataLength;
VIDEO_MEMORY VideoMemory;
VIDEO_MEMORY_INFORMATION VideoMemoryInfo;

View file

@ -195,7 +195,7 @@ typedef VOID (*PFN_ScreenToScreenBlt)(PDEVSURF, PRECTL, PPOINTL, INT);
BOOL InitVGA(PPDEV ppdev, BOOL bFirst); // screen.c: initialize VGA mode
#define DRIVER_EXTRA_SIZE 0
#define ALLOC_TAG 'agvD' // Dvga reversed
#define ALLOC_TAG TAG('D', 'v', 'g', 'a') // Dvga tag
#define DLL_NAME L"vga" // DLL name in Unicode
#define MAX_SCAN_WIDTH 2048 // pixels

View file

@ -2,11 +2,11 @@
#include <debug.h>
#include "vgavideo.h"
void outxay(USHORT ad, UCHAR x, UCHAR y)
void outxay(PUSHORT ad, UCHAR x, UCHAR y)
{
USHORT xy = (x << 8) + y;
VideoPortWritePortUshort((PUSHORT)ad, xy);
VideoPortWritePortUshort(ad, xy);
}
void setMode(VideoMode mode)
@ -20,7 +20,7 @@ void setMode(VideoMode mode)
for(x=0; x<5; x++)
{
outxay(SEQ, mode.Seq[x], x);
outxay((PUSHORT)SEQ, mode.Seq[x], x);
}
VideoPortWritePortUshort((PUSHORT)CRTC, 0x11);
@ -28,12 +28,12 @@ void setMode(VideoMode mode)
for(x=0; x<25; x++)
{
outxay(CRTC, mode.Crtc[x], x);
outxay((PUSHORT)CRTC, mode.Crtc[x], x);
}
for(x=0; x<9; x++)
{
outxay(GRAPHICS, mode.Gfx[x], x);
outxay((PUSHORT)GRAPHICS, mode.Gfx[x], x);
}
x=VideoPortReadPortUchar((PUCHAR)FEATURE);
@ -103,6 +103,7 @@ VOID VGAResetDevice(OUT PSTATUS_BLOCK StatusBlock)
NTSTATUS Status;
VIDEO_X86_BIOS_ARGUMENTS vxba;
VP_STATUS vps;
ULONG ThreadRelease = 1;
CHECKPOINT;
Event = 0;
@ -115,7 +116,7 @@ VOID VGAResetDevice(OUT PSTATUS_BLOCK StatusBlock)
if( !NT_SUCCESS( Status ) )
DbgPrint( "VGA: Failed to open refresh event\n" );
else {
NtSetEvent( Event, 1 );
NtSetEvent( Event, &ThreadRelease );
NtClose( Event );
}
}

View file

@ -217,56 +217,56 @@ VGAStartIO(PVOID DeviceExtension,
VGAMapVideoMemory((PVIDEO_MEMORY) RequestPacket->InputBuffer,
(PVIDEO_MEMORY_INFORMATION)
RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock);
RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_QUERY_AVAIL_MODES:
VGAQueryAvailModes((PVIDEO_MODE_INFORMATION) RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock);
RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_QUERY_CURRENT_MODE:
VGAQueryCurrentMode((PVIDEO_MODE_INFORMATION) RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock);
RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES:
VGAQueryNumAvailModes((PVIDEO_NUM_MODES) RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock);
RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_RESET_DEVICE:
VGAResetDevice(&RequestPacket->StatusBlock);
VGAResetDevice(RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_SET_COLOR_REGISTERS:
VGASetColorRegisters((PVIDEO_CLUT) RequestPacket->InputBuffer,
&RequestPacket->StatusBlock);
RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_SET_CURRENT_MODE:
VGASetCurrentMode((PVIDEO_MODE) RequestPacket->InputBuffer,
&RequestPacket->StatusBlock);
RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_SHARE_VIDEO_MEMORY:
VGAShareVideoMemory((PVIDEO_SHARE_MEMORY) RequestPacket->InputBuffer,
(PVIDEO_MEMORY_INFORMATION) RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock);
RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_UNMAP_VIDEO_MEMORY:
VGAUnmapVideoMemory((PVIDEO_MEMORY) RequestPacket->InputBuffer,
&RequestPacket->StatusBlock);
RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY:
VGAUnshareVideoMemory((PVIDEO_MEMORY) RequestPacket->InputBuffer,
&RequestPacket->StatusBlock);
RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_SET_PALETTE_REGISTERS:
VGASetPaletteRegisters((PVIDEO_CLUT) RequestPacket->InputBuffer,
&RequestPacket->StatusBlock);
VGASetPaletteRegisters((PWORD) RequestPacket->InputBuffer,
RequestPacket->StatusBlock);
break;
#if 0
@ -278,7 +278,7 @@ VGAStartIO(PVOID DeviceExtension,
case IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES:
VGAFreePublicAccessRanges((PVIDEO_PUBLIC_ACCESS_RANGES)
RequestPacket->InputBuffer,
&RequestPacket->StatusBlock);
RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_GET_BANK_SELECT_CODE:
@ -294,7 +294,7 @@ VGAStartIO(PVOID DeviceExtension,
case IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES:
VGAQueryPublicAccessRanges((PVIDEO_PUBLIC_ACCESS_RANGES)
RequestPacket->OutputBuffer,
&RequestPacket->StatusBlock);
RequestPacket->StatusBlock);
break;
case IOCTL_VIDEO_RESTORE_HARDWARE_STATE:
@ -430,10 +430,10 @@ VOID VGASetColorRegisters(IN PVIDEO_CLUT ColorLookUpTable,
for (i=ColorLookUpTable->FirstEntry; i<ColorLookUpTable->NumEntries; i++)
{
VideoPortWritePortUchar(0x03c8, i);
VideoPortWritePortUchar(0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Red);
VideoPortWritePortUchar(0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Green);
VideoPortWritePortUchar(0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Blue);
VideoPortWritePortUchar((PUCHAR)0x03c8, i);
VideoPortWritePortUchar((PUCHAR)0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Red);
VideoPortWritePortUchar((PUCHAR)0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Green);
VideoPortWritePortUchar((PUCHAR)0x03c9, ColorLookUpTable->LookupTable[i].RgbArray.Blue);
}
}

View file

@ -1,4 +1,4 @@
/* $Id: vidport.c,v 1.19 2001/05/02 12:37:06 jfilby Exp $
/* $Id: vidport.c,v 1.20 2001/06/26 12:51:00 ekohl Exp $
*
* VideoPort driver
* Written by Rex Jolliff
@ -24,7 +24,7 @@ static struct _EPROCESS* Csrss;
PBYTE ReturnCsrssAddress(void)
{
return Csrss;
return (PBYTE)Csrss;
}
// ------------------------------------------------------- Public Interface
@ -295,7 +295,7 @@ VideoPortInitialize(IN PVOID Context1,
while (Again);
/* Find a process handle for csrss */
Cid.UniqueProcess = 3;
Cid.UniqueProcess = (HANDLE)3;
Cid.UniqueThread = 0;
Status = ZwOpenProcess(&CsrssHandle,
PROCESS_ALL_ACCESS,
@ -806,7 +806,7 @@ VidDispatchDeviceControl(IN PDEVICE_OBJECT DeviceObject,
vrp->OutputBufferLength = Irp->Stack[0].Parameters.DeviceIoControl.OutputBufferLength;
// Call the Miniport Driver with the VRP
DeviceObject->DriverObject->DriverStartIo(DeviceObject->DeviceExtension, vrp);
DeviceObject->DriverObject->DriverStartIo(DeviceObject->DeviceExtension, (PIRP)vrp);
// Translate the VRP back into the IRP for OutputBuffer
Irp->UserBuffer = vrp->OutputBuffer;

View file

@ -1,4 +1,4 @@
/* $Id: finfo.c,v 1.2 2001/06/12 12:33:42 ekohl Exp $
/* $Id: finfo.c,v 1.3 2001/06/26 12:46:57 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -143,7 +143,7 @@ MsfsSetInformation(PDEVICE_OBJECT DeviceObject,
PMSFS_FCB Fcb;
PMSFS_MAILSLOT Mailslot;
PVOID SystemBuffer;
PULONG BufferLength;
ULONG BufferLength;
NTSTATUS Status;
DPRINT("MsfsSetInformation(DeviceObject %p Irp %p)\n", DeviceObject, Irp);

View file

@ -1,4 +1,4 @@
/* $Id: volume.c,v 1.1 2001/06/12 12:35:05 ekohl Exp $
/* $Id: volume.c,v 1.2 2001/06/26 12:47:26 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -21,7 +21,7 @@
static NTSTATUS
NpfsQueryFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo,
PULONG *BufferLength)
PULONG BufferLength)
{
DPRINT("NpfsQueryFsDeviceInformation()\n");
DPRINT("FsDeviceInfo = %p\n", FsDeviceInfo);

View file

@ -137,7 +137,7 @@ NTSTATUS ConnectMousePortDriver(PDEVICE_OBJECT ClassDeviceObject)
return ioStatus.Status;
}
NTSTATUS MouseClassDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
NTSTATUS STDCALL MouseClassDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
{
PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp);
NTSTATUS Status;
@ -218,7 +218,7 @@ VOID MouseClassStartIo(PDEVICE_OBJECT DeviceObject, PIRP Irp)
}
}
NTSTATUS MouseClassInternalDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
NTSTATUS STDCALL MouseClassInternalDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
{
// Retrieve GDI's callback