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

fix msvc build by replacing DDKAPI with NTAPI (both __stdcall)

Browse source 
fix some format strings

svn path=/trunk/; revision=30667
This commit is contained in:
Christoph von Wittich 2007-11-22 11:27:17 +00:00
parent fd1d7e0437
commit 485fb49bc0
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/drivers/input/i8042prt/i8042prt.h
View file

@ -303,7 +303,7 @@ DRIVER_DISPATCH i8042Close;
/* keyboard.c */ /* keyboard.c */
NTSTATUS DDKAPI NTSTATUS NTAPI
i8042SynchWritePortKbd( i8042SynchWritePortKbd(
IN PVOID Context, IN PVOID Context,
IN UCHAR Value, IN UCHAR Value,
@ -414,7 +414,7 @@ i8042ReadStatus(
IN PPORT_DEVICE_EXTENSION DeviceExtension, IN PPORT_DEVICE_EXTENSION DeviceExtension,
OUT PUCHAR Status); OUT PUCHAR Status);
NTSTATUS DDKAPI NTSTATUS NTAPI
i8042SynchReadPort( i8042SynchReadPort(
IN PVOID Context, IN PVOID Context,
OUT PUCHAR Value, OUT PUCHAR Value,

4
reactos/drivers/input/i8042prt/keyboard.c
View file

@ -39,7 +39,7 @@ i8042DebugWorkItem(
IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_OBJECT DeviceObject,
IN PVOID Key) IN PVOID Key)
{ {
DPRINT("Debug key: 0x%02x\n", Key); DPRINT("Debug key: %p\n", Key);
if (!Key) if (!Key)
return; return;
@ -97,7 +97,7 @@ i8042KbdQueuePacket(
* These functions are callbacks for filter driver custom * These functions are callbacks for filter driver custom
* initialization routines. * initialization routines.
*/ */
NTSTATUS DDKAPI NTSTATUS NTAPI
i8042SynchWritePortKbd( i8042SynchWritePortKbd(
IN PVOID Context, IN PVOID Context,
IN UCHAR Value, IN UCHAR Value,

6
reactos/drivers/input/i8042prt/pnp.c
View file

@ -515,18 +515,18 @@ i8042PnpStartDevice(
if (!FoundDataPort) if (!FoundDataPort)
{ {
PortDeviceExtension->DataPort = ULongToPtr(ResourceDescriptor->u.Port.Start.u.LowPart); PortDeviceExtension->DataPort = ULongToPtr(ResourceDescriptor->u.Port.Start.u.LowPart);
DPRINT("Found data port: 0x%lx\n", PortDeviceExtension->DataPort); DPRINT("Found data port: %p\n", PortDeviceExtension->DataPort);
FoundDataPort = TRUE; FoundDataPort = TRUE;
} }
else if (!FoundControlPort) else if (!FoundControlPort)
{ {
PortDeviceExtension->ControlPort = ULongToPtr(ResourceDescriptor->u.Port.Start.u.LowPart); PortDeviceExtension->ControlPort = ULongToPtr(ResourceDescriptor->u.Port.Start.u.LowPart);
DPRINT("Found control port: 0x%lx\n", PortDeviceExtension->ControlPort); DPRINT("Found control port: %p\n", PortDeviceExtension->ControlPort);
FoundControlPort = TRUE; FoundControlPort = TRUE;
} }
else else
{ {
DPRINT("Too much I/O ranges provided\n", ResourceDescriptor->u.Port.Length); DPRINT("Too much I/O ranges provided: 0x%lx\n", ResourceDescriptor->u.Port.Length);
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
} }

4
reactos/drivers/input/i8042prt/readwrite.c
View file

@ -111,7 +111,7 @@ i8042ReadDataWait(
* is enough this time. Note how MSDN specifies the * is enough this time. Note how MSDN specifies the
* WaitForAck parameter to be ignored. * WaitForAck parameter to be ignored.
*/ */
NTSTATUS DDKAPI NTSTATUS NTAPI
i8042SynchReadPort( i8042SynchReadPort(
IN PVOID Context, IN PVOID Context,
OUT PUCHAR Value, OUT PUCHAR Value,
@ -205,7 +205,7 @@ i8042Write(
if (ResendIterations) if (ResendIterations)
{ {
WRITE_PORT_UCHAR(addr, data); WRITE_PORT_UCHAR(addr, data);
DPRINT("Sent 0x%x to port 0x%x\n", data, addr); DPRINT("Sent 0x%x to port %p\n", data, addr);
return TRUE; return TRUE;
} }
return FALSE; return FALSE;