From owner-svn-src-all@FreeBSD.ORG  Tue Mar 29 12:38:13 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AE6B1106566C;
	Tue, 29 Mar 2011 12:38:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9DE9D8FC16;
	Tue, 29 Mar 2011 12:38:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2TCcDPS028657;
	Tue, 29 Mar 2011 12:38:13 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2TCcDDB028655;
	Tue, 29 Mar 2011 12:38:13 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201103291238.p2TCcDDB028655@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 29 Mar 2011 12:38:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220126 - head/sys/isa
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Mar 2011 12:38:13 -0000

Author: jhb
Date: Tue Mar 29 12:38:13 2011
New Revision: 220126
URL: http://svn.freebsd.org/changeset/base/220126

Log:
  - 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.
  
  Tested by:	Steven Nikkel  steven_nikkel ertyu org
  MFC after:	1 week

Modified:
  head/sys/isa/pnp.c

Modified: head/sys/isa/pnp.c
==============================================================================
--- head/sys/isa/pnp.c	Tue Mar 29 11:54:22 2011	(r220125)
+++ head/sys/isa/pnp.c	Tue Mar 29 12:38:13 2011	(r220126)
@@ -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;