Author: sginsberg
Date: Sat Oct 25 12:50:42 2008
New Revision: 36958
URL:
http://svn.reactos.org/svn/reactos?rev=36958&view=rev
Log:
- Fix isapnp compilation for 64-bit
Modified:
branches/ros-amd64-bringup/reactos/drivers/bus/isapnp/isapnp.c
Modified: branches/ros-amd64-bringup/reactos/drivers/bus/isapnp/isapnp.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1] Sat Oct 25
12:50:42 2008
@@ -153,7 +153,7 @@
}
#endif
-static __inline VOID SetReadDataPort(ULONG Port)
+static __inline VOID SetReadDataPort(ULONG_PTR Port)
{
IsaPnPReadPort = (PUCHAR)Port;
WriteUchar(0x00, (UCHAR) (Port >> 2));
@@ -214,13 +214,13 @@
#define READ_DATA_PORT_STEP 32 /* Minimum is 4 */
-static ULONG FindNextReadPort(VOID)
-{
- ULONG Port;
-
-
-
- Port = (ULONG)IsaPnPReadPort;
+static ULONG_PTR FindNextReadPort(VOID)
+{
+ ULONG_PTR Port;
+
+
+
+ Port = (ULONG_PTR)IsaPnPReadPort;
while (TRUE) {
@@ -260,7 +260,7 @@
static BOOLEAN IsolateReadDataPortSelect(VOID)
{
- ULONG Port;
+ ULONG_PTR Port;
SendWait();
SendKey();
@@ -333,7 +333,7 @@
KeStallExecutionProcessor(250);
iteration++;
SendWake(0x00);
- SetReadDataPort((ULONG)IsaPnPReadPort);
+ SetReadDataPort((ULONG_PTR)IsaPnPReadPort);
KeStallExecutionProcessor(1000);
WriteAddress(0x01);
KeStallExecutionProcessor(1000);
@@ -1305,7 +1305,7 @@
do {
Status = BuildResourceList(LogicalDevice, p, Priority);
if (NT_SUCCESS(Status)) {
- p = (PIO_RESOURCE_LIST)((ULONG)p + SingleListSize);
+ p = (PIO_RESOURCE_LIST)((ULONG_PTR)p + SingleListSize);
Priority++;
}
} while (Status != STATUS_NOT_FOUND);
@@ -1477,7 +1477,7 @@
CurrentEntry = CurrentEntry->Flink;
}
- Irp->IoStatus.Information = (ULONG)Relations;
+ Irp->IoStatus.Information = (ULONG_PTR)Relations;
return Status;
}