2002-11-13 Rick Gaiser <RickG81@Wanadoo.nl>

	* drivers/bus/isapnp/isapnp.c (FindNextReadPort): Increment Port before
	checking wether port address is in NE2000 address space range and returning
	port address value.

svn path=/trunk/; revision=3754

diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index 012bdcd..c2936d4 100644 (file)
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-13  Rick Gaiser  <RickG81@Wanadoo.nl>\r
+\r
+       * drivers/bus/isapnp/isapnp.c (FindNextReadPort): Increment Port before\r
+       checking wether port address is in NE2000 address space range and returning\r
+       port address value.\r
+\r
 2002-11-10  Casper S. Hornstrup  <chorns@users.sourceforge.net>\r
 \r
        * drivers/bus/acpi/include/acpi.h: Include platform/types.h.\r

diff --git a/reactos/drivers/bus/isapnp/isapnp.c b/reactos/drivers/bus/isapnp/isapnp.c
index 894fef4..e5c5836 100644 (file)
--- a/reactos/drivers/bus/isapnp/isapnp.c
+++ b/reactos/drivers/bus/isapnp/isapnp.c
@@ -1,4 +1,4 @@
-/* $Id: isapnp.c,v 1.4 2002/09/08 10:22:03 chorns Exp $
+/* $Id: isapnp.c,v 1.5 2002/11/13 21:57:47 chorns Exp $
  *
  * PROJECT:         ReactOS ISA PnP Bus driver
  * FILE:            isapnp.c
@@ -215,21 +215,26 @@ VOID DeactivateLogicalDevice(UCHAR LogicalDevice)
 
 static ULONG FindNextReadPort(VOID)
 {
-       ULONG Port;
-
-  Port = (ULONG)IsaPnPReadPort;
-       while (Port <= ISAPNP_MAX_READ_PORT) {
-               /*
-                * We cannot use NE2000 probe spaces for
-     * ISAPnP or we will lock up machines
-                */
-               if ((Port < 0x280) || (Port > 0x380))
-               {
-                       return Port;
-               }
-               Port += READ_DATA_PORT_STEP;
-       }
-       return 0;
+       ULONG Port;\r
+\r
+       Port = (ULONG)IsaPnPReadPort;\r
+       while (TRUE) {\r
+               Port += READ_DATA_PORT_STEP;\r
+\r
+               if (Port > ISAPNP_MAX_READ_PORT)\r
+               {\r
+                       return 0;\r
+               }\r
+\r
+               /*\r
+                * We cannot use NE2000 probe spaces for\r
+                * ISAPnP or we will lock up machines\r
+                */\r
+               if ((Port < 0x280) || (Port > 0x380))\r
+               {\r
+                       return Port;\r
+               }\r
+       }\r
 }
 
 static BOOLEAN IsolateReadDataPortSelect(VOID)