modified drivers/input/i8042prt/createclose.c

modified   drivers/input/i8042prt/i8042prt.c
modified   drivers/input/i8042prt/keyboard.c
modified   drivers/input/i8042prt/misc.c
modified   drivers/input/i8042prt/mouse.c
modified   drivers/input/i8042prt/readwrite.c
   Silence "argument unused" and "unused variable" warnings
   Corrected several accesses to potentially uninitialized variables

Patch by Samuel Serapión <samdwise51@gmail.com>

svn path=/trunk/; revision=41456
This commit is contained in:
KJK::Hyperion 2009-06-19 00:17:15 +00:00
parent dc90252573
commit 82276953f4
6 changed files with 29 additions and 5 deletions

View file

@ -17,6 +17,7 @@ i8042Create(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
{
UNREFERENCED_PARAMETER(DeviceObject);
TRACE_(I8042PRT, "IRP_MJ_CREATE\n");
Irp->IoStatus.Status = STATUS_SUCCESS;
@ -30,6 +31,7 @@ i8042Cleanup(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
{
UNREFERENCED_PARAMETER(DeviceObject);
TRACE_(I8042PRT, "IRP_MJ_CLEANUP\n");
Irp->IoStatus.Status = STATUS_SUCCESS;
@ -43,6 +45,7 @@ i8042Close(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
{
UNREFERENCED_PARAMETER(DeviceObject);
TRACE_(I8042PRT, "IRP_MJ_CLOSE\n");
Irp->IoStatus.Status = STATUS_SUCCESS;

View file

@ -387,6 +387,8 @@ IrpStub(
{
NTSTATUS Status = Irp->IoStatus.Status;
UNREFERENCED_PARAMETER(DeviceObject);
/* Do nothing */
ASSERT(FALSE);
IoCompleteRequest(Irp, IO_NO_INCREMENT);
@ -399,7 +401,6 @@ i8042DeviceControl(
IN PIRP Irp)
{
PFDO_DEVICE_EXTENSION DeviceExtension;
NTSTATUS Status;
TRACE_(I8042PRT, "i8042DeviceControl(%p %p)\n", DeviceObject, Irp);
DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
@ -412,8 +413,6 @@ i8042DeviceControl(
default:
return IrpStub(DeviceObject, Irp);
}
return Status;
}
static NTSTATUS NTAPI

View file

@ -39,6 +39,7 @@ i8042DebugWorkItem(
IN PDEVICE_OBJECT DeviceObject,
IN PVOID Key)
{
UNREFERENCED_PARAMETER(DeviceObject);
INFO_(I8042PRT, "Debug key: p\n", Key);
if (!Key)
@ -213,6 +214,8 @@ i8042PowerWorkItem(
DeviceExtension = (PI8042_KEYBOARD_EXTENSION)Context;
UNREFERENCED_PARAMETER(DeviceObject);
/* See http://blogs.msdn.com/doronh/archive/2006/09/08/746961.aspx */
/* Register GUID_DEVICE_SYS_BUTTON interface and report capability */
@ -340,6 +343,10 @@ i8042KbdDpcRoutine(
ULONG KeysInBufferCopy;
KIRQL Irql;
UNREFERENCED_PARAMETER(Dpc);
UNREFERENCED_PARAMETER(SystemArgument1);
UNREFERENCED_PARAMETER(SystemArgument2);
DeviceExtension = (PI8042_KEYBOARD_EXTENSION)DeferredContext;
PortDeviceExtension = DeviceExtension->Common.PortDeviceExtension;
@ -787,10 +794,12 @@ i8042KbdInterruptService(
PPORT_DEVICE_EXTENSION PortDeviceExtension;
PKEYBOARD_INPUT_DATA InputData;
ULONG Counter;
UCHAR PortStatus, Output;
UCHAR PortStatus = 0, Output = 0;
BOOLEAN ToReturn = FALSE;
NTSTATUS Status;
UNREFERENCED_PARAMETER(Interrupt);
DeviceExtension = (PI8042_KEYBOARD_EXTENSION)Context;
PortDeviceExtension = DeviceExtension->Common.PortDeviceExtension;
InputData = DeviceExtension->KeyboardBuffer + DeviceExtension->KeysInBuffer;

View file

@ -19,6 +19,7 @@ ForwardIrpAndWaitCompletion(
IN PIRP Irp,
IN PVOID Context)
{
UNREFERENCED_PARAMETER(DeviceObject);
if (Irp->PendingReturned)
KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE);
return STATUS_MORE_PROCESSING_REQUIRED;

View file

@ -263,6 +263,10 @@ i8042MouDpcRoutine(
KIRQL Irql;
LARGE_INTEGER Timeout;
UNREFERENCED_PARAMETER(Dpc);
UNREFERENCED_PARAMETER(SystemArgument1);
UNREFERENCED_PARAMETER(SystemArgument2);
DeviceExtension = (PI8042_MOUSE_EXTENSION)DeferredContext;
PortDeviceExtension = DeviceExtension->Common.PortDeviceExtension;
@ -348,6 +352,10 @@ i8042DpcRoutineMouseTimeout(
PPORT_DEVICE_EXTENSION PortDeviceExtension;
KIRQL Irql;
UNREFERENCED_PARAMETER(Dpc);
UNREFERENCED_PARAMETER(SystemArgument1);
UNREFERENCED_PARAMETER(SystemArgument2);
DeviceExtension = (PI8042_MOUSE_EXTENSION)DeferredContext;
PortDeviceExtension = DeviceExtension->Common.PortDeviceExtension;
@ -872,9 +880,11 @@ i8042MouInterruptService(
PI8042_MOUSE_EXTENSION DeviceExtension;
PPORT_DEVICE_EXTENSION PortDeviceExtension;
ULONG Counter;
UCHAR Output, PortStatus;
UCHAR Output = 0, PortStatus = 0;
NTSTATUS Status;
UNREFERENCED_PARAMETER(Interrupt);
DeviceExtension = (PI8042_MOUSE_EXTENSION)Context;
PortDeviceExtension = DeviceExtension->Common.PortDeviceExtension;
Counter = PortDeviceExtension->Settings.PollStatusIterations;

View file

@ -127,6 +127,8 @@ i8042SynchReadPort(
{
PPORT_DEVICE_EXTENSION DeviceExtension;
UNREFERENCED_PARAMETER(WaitForAck);
DeviceExtension = (PPORT_DEVICE_EXTENSION)Context;
return i8042ReadDataWait(DeviceExtension, Value);