svn commit: r220673 - stable/8/sys/isa

[John Baldwin]

Author: jhb
Date: Fri Apr 15 20:28:38 2011
New Revision: 220673
URL: http://svn.freebsd.org/changeset/base/220673

Log:
  MFC 220126:
  - Enable an extra debugging bootverbose printf when probing ISA PNP cards
    listing   each card as it is found on non-PC98 (PC98 already had this).
  - Increase the length of the DELAY() used before timing out while reading
    PNP resource data.

Modified:
  stable/8/sys/isa/pnp.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/isa/pnp.c
==============================================================================
--- stable/8/sys/isa/pnp.c	Fri Apr 15 20:26:36 2011	(r220672)
+++ stable/8/sys/isa/pnp.c	Fri Apr 15 20:28:38 2011	(r220673)
@@ -209,7 +209,7 @@ pnp_get_resource_info(u_char *buffer, in
 		for (j = 0; j < 100; j++) {
 			if ((inb((pnp_rd_port << 2) | 0x3)) & 0x1)
 				break;
-			DELAY(1);
+			DELAY(10);
 		}
 		if (j == 100) {
 			printf("PnP device failed to report resource data\n");
@@ -743,10 +743,10 @@ pnp_isolation_protocol(device_t parent)
 					printf("A Normal-ISA-PnP card (%s).\n",
 					    pnp_eisaformat(id.vendor_id));
 			}
+#endif
 			if (bootverbose)
 				printf("Reading PnP configuration for %s.\n",
 				    pnp_eisaformat(id.vendor_id));
-#endif
 			error = pnp_read_resources(&resources, &space, &len);
 			if (error)
 				break;