- Create another branch for networking fixes

[reactos.git] / drivers / bus / isapnp / isapnp.c

diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c
index 656e28d..2c27302 100644 (file)
--- a/drivers/bus/isapnp/isapnp.c
+++ b/drivers/bus/isapnp/isapnp.c
@@ -301,7 +301,7 @@ static ULONG IsolatePnPCards(VOID)
 
   DPRINT("Called\n");
 
-       IsaPnPReadPort = (PUCHAR)ISAPNP_MIN_READ_PORT;
+       IsaPnPReadPort = (PUCHAR)(ISAPNP_MIN_READ_PORT - READ_DATA_PORT_STEP);
   if (!IsolateReadDataPortSelect()) {
     DPRINT("Could not set read data port\n");
                return 0;
@@ -340,7 +340,6 @@ static ULONG IsolatePnPCards(VOID)
                        goto next;
                }
                if (iteration == 1) {
-                       IsaPnPReadPort += READ_DATA_PORT_STEP;
       if (!IsolateReadDataPortSelect()) {
         DPRINT("Could not set read data port\n");
                                return 0;
@@ -1574,7 +1573,7 @@ ISAPNPStopDevice(
 
 static DRIVER_DISPATCH ISAPNPDispatchOpenClose;
 static NTSTATUS
-STDCALL
+NTAPI
 ISAPNPDispatchOpenClose(
   IN PDEVICE_OBJECT DeviceObject,
   IN PIRP Irp)
@@ -1590,7 +1589,7 @@ ISAPNPDispatchOpenClose(
 
 static DRIVER_DISPATCH ISAPNPDispatchReadWrite;
 static NTSTATUS
-STDCALL
+NTAPI
 ISAPNPDispatchReadWrite(
   IN PDEVICE_OBJECT PhysicalDeviceObject,
   IN PIRP Irp)
@@ -1606,7 +1605,7 @@ ISAPNPDispatchReadWrite(
 
 static DRIVER_DISPATCH ISAPNPDispatchDeviceControl;
 static NTSTATUS
-STDCALL
+NTAPI
 ISAPNPDispatchDeviceControl(
   IN PDEVICE_OBJECT DeviceObject,
   IN PIRP Irp)
@@ -1638,7 +1637,7 @@ ISAPNPDispatchDeviceControl(
 
 static DRIVER_DISPATCH ISAPNPControl;
 static NTSTATUS
-STDCALL
+NTAPI
 ISAPNPControl(
   IN PDEVICE_OBJECT DeviceObject,
   IN PIRP Irp)
@@ -1662,6 +1661,12 @@ ISAPNPControl(
     Status = ISAPNPStopDevice(DeviceObject, Irp, IrpSp);
     break;
 
+  case IRP_MN_FILTER_RESOURCE_REQUIREMENTS:
+    /* Nothing to do here */
+    DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n");
+    Status = Irp->IoStatus.Status;
+    break;
+
   default:
     DPRINT("Unknown IOCTL 0x%X\n", IrpSp->MinorFunction);
     Status = STATUS_NOT_IMPLEMENTED;
@@ -1680,7 +1685,7 @@ ISAPNPControl(
 
 
 static NTSTATUS
-STDCALL
+NTAPI
 ISAPNPAddDevice(
   IN PDRIVER_OBJECT DriverObject,
   IN PDEVICE_OBJECT PhysicalDeviceObject)
@@ -1721,7 +1726,7 @@ ISAPNPAddDevice(
 
 
 NTSTATUS
-STDCALL
+NTAPI
 DriverEntry(
   IN PDRIVER_OBJECT DriverObject,
   IN PUNICODE_STRING RegistryPath)