From owner-svn-src-stable-6@FreeBSD.ORG  Sat Aug 14 22:49:08 2010
Return-Path: <owner-svn-src-stable-6@FreeBSD.ORG>
Delivered-To: svn-src-stable-6@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3AAA106564A;
	Sat, 14 Aug 2010 22:49:07 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D52958FC12;
	Sat, 14 Aug 2010 22:49:07 +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 o7EMn75N041175;
	Sat, 14 Aug 2010 22:49:07 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7EMn7hA041173;
	Sat, 14 Aug 2010 22:49:07 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201008142249.o7EMn7hA041173@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Sat, 14 Aug 2010 22:49:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211321 - stable/6/sys/dev/digi
X-BeenThere: svn-src-stable-6@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 6-stable src tree
	<svn-src-stable-6.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-6>
List-Post: <mailto:svn-src-stable-6@freebsd.org>
List-Help: <mailto:svn-src-stable-6-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-6>, 
	<mailto:svn-src-stable-6-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Aug 2010 22:49:08 -0000

Author: andre
Date: Sat Aug 14 22:49:07 2010
New Revision: 211321
URL: http://svn.freebsd.org/changeset/base/211321

Log:
  MFC r150132:
  
    Increase boot-time DigiBIOS initialization timeout to allow
    for a larger number of chained port modules.
  
    PR:		kern/55018
    Submitted by:	Cyrill Shevchuk <cyrill at cyrills.net>

Modified:
  stable/6/sys/dev/digi/digi.c

Modified: stable/6/sys/dev/digi/digi.c
==============================================================================
--- stable/6/sys/dev/digi/digi.c	Sat Aug 14 22:35:20 2010	(r211320)
+++ stable/6/sys/dev/digi/digi.c	Sat Aug 14 22:49:07 2010	(r211321)
@@ -360,7 +360,7 @@ digi_init(struct digi_softc *sc)
 	DLOG(DIGIDB_INIT, (sc->dev, "BIOS started after %d us\n", i));
 
 	for (i = 0; vW(ptr) != *(u_short *)"GD"; i++) {
-		if (i > 2*hz) {
+		if (i > 5*hz) {
 			log(LOG_ERR, "digi%d: BIOS boot failed "
 			    "(0x%02x != 0x%02x)\n",
 			    sc->res.unit, vW(ptr), *(u_short *)"GD");