[ros-diffs] [cwittich] 30667: fix msvc build by replacing DDKAPI with NTAPI (both __stdcall) fix some format strings

[cwittich at svn.reactos.org]

Author: cwittich
Date: Thu Nov 22 14:27:17 2007
New Revision: 30667

URL: http://svn.reactos.org/svn/reactos?rev=30667&view=rev
Log:
fix msvc build by replacing DDKAPI with NTAPI (both __stdcall)
fix some format strings

Modified:
    trunk/reactos/drivers/input/i8042prt/i8042prt.h
    trunk/reactos/drivers/input/i8042prt/keyboard.c
    trunk/reactos/drivers/input/i8042prt/pnp.c
    trunk/reactos/drivers/input/i8042prt/readwrite.c

Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i8042prt.h?rev=30667&r1=30666&r2=30667&view=diff
==============================================================================
--- trunk/reactos/drivers/input/i8042prt/i8042prt.h (original)
+++ trunk/reactos/drivers/input/i8042prt/i8042prt.h Thu Nov 22 14:27:17 2007
@@ -303,7 +303,7 @@
 
 /* keyboard.c */
 
-NTSTATUS DDKAPI
+NTSTATUS NTAPI
 i8042SynchWritePortKbd(
 	IN PVOID Context,
 	IN UCHAR Value,
@@ -414,7 +414,7 @@
 	IN PPORT_DEVICE_EXTENSION DeviceExtension,
 	OUT PUCHAR Status);
 
-NTSTATUS DDKAPI
+NTSTATUS NTAPI
 i8042SynchReadPort(
 	IN PVOID Context,
 	OUT PUCHAR Value,

Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/keyboard.c?rev=30667&r1=30666&r2=30667&view=diff
==============================================================================
--- trunk/reactos/drivers/input/i8042prt/keyboard.c (original)
+++ trunk/reactos/drivers/input/i8042prt/keyboard.c Thu Nov 22 14:27:17 2007
@@ -39,7 +39,7 @@
 	IN PDEVICE_OBJECT DeviceObject,
 	IN PVOID Key)
 {
-	DPRINT("Debug key: 0x%02x\n", Key);
+	DPRINT("Debug key: %p\n", Key);
 
 	if (!Key)
 		return;
@@ -97,7 +97,7 @@
  * These functions are callbacks for filter driver custom
  * initialization routines.
  */
-NTSTATUS DDKAPI
+NTSTATUS NTAPI
 i8042SynchWritePortKbd(
 	IN PVOID Context,
 	IN UCHAR Value,

Modified: trunk/reactos/drivers/input/i8042prt/pnp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp.c?rev=30667&r1=30666&r2=30667&view=diff
==============================================================================
--- trunk/reactos/drivers/input/i8042prt/pnp.c (original)
+++ trunk/reactos/drivers/input/i8042prt/pnp.c Thu Nov 22 14:27:17 2007
@@ -515,18 +515,18 @@
 					if (!FoundDataPort)
 					{
 						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;
 					}
 					else if (!FoundControlPort)
 					{
 						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;
 					}
 					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;
 					}
 				}

Modified: trunk/reactos/drivers/input/i8042prt/readwrite.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/readwrite.c?rev=30667&r1=30666&r2=30667&view=diff
==============================================================================
--- trunk/reactos/drivers/input/i8042prt/readwrite.c (original)
+++ trunk/reactos/drivers/input/i8042prt/readwrite.c Thu Nov 22 14:27:17 2007
@@ -111,7 +111,7 @@
  * is enough this time. Note how MSDN specifies the
  * WaitForAck parameter to be ignored.
  */
-NTSTATUS DDKAPI
+NTSTATUS NTAPI
 i8042SynchReadPort(
 	IN PVOID Context,
 	OUT PUCHAR Value,
@@ -205,7 +205,7 @@
 	if (ResendIterations)
 	{
 		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 FALSE;