From owner-p4-projects@FreeBSD.ORG  Fri Nov 10 02:44:04 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C343116A494; Fri, 10 Nov 2006 02:44:04 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A1F2016A47E
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 02:44:04 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 72CCA43D45
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 02:44:04 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAA2i4a5094090
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 02:44:04 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAA2i4Vi094087
	for perforce@freebsd.org; Fri, 10 Nov 2006 02:44:04 GMT
	(envelope-from mjacob@freebsd.org)
Date: Fri, 10 Nov 2006 02:44:04 GMT
Message-Id: <200611100244.kAA2i4Vi094087@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109662 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Nov 2006 02:44:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=109662

Change 109662 by mjacob@newisp on 2006/11/10 02:43:10

	Initialize Gone Device Timer handle and parameter.

Affected files ...

.. //depot/projects/newisp/dev/isp/isp_pci.c#18 edit

Differences ...

==== //depot/projects/newisp/dev/isp/isp_pci.c#18 (text+ko) ====

@@ -433,6 +433,7 @@
 	int bitmap, unit;
 
 	callout_handle_init(&isp->isp_osinfo.ldt);
+	callout_handle_init(&isp->isp_osinfo.gdt);
 
 	unit = device_get_unit(dev);
 	if (getenv_int("isp_disable", &bitmap)) {
@@ -522,6 +523,14 @@
 		isp->isp_osinfo.loop_down_limit = isp_loop_down_limit;
 	}
 
+	bitmap = 0;
+	(void) getenv_int("isp_gone_device_time", &bitmap);
+	if (bitmap >= 0 && bitmap < 0xffff) {
+		isp->isp_osinfo.gone_device_time = bitmap;
+	} else {
+		isp->isp_osinfo.gone_device_time = isp_gone_device_time;
+	}
+
 
 #ifdef	ISP_FW_CRASH_DUMP
 	bitmap = 0;
@@ -582,6 +591,7 @@
 	const char *sptr;
 
 	callout_handle_init(&isp->isp_osinfo.ldt);
+	callout_handle_init(&isp->isp_osinfo.gdt);
 
 	/*
 	 * Figure out if we're supposed to skip this one.
@@ -747,6 +757,14 @@
 		isp->isp_osinfo.loop_down_limit = isp_loop_down_limit;
 	}
 
+	tval = -1;
+	(void) resource_int_value(device_get_name(dev), device_get_unit(dev),
+	    "gone_device_time", &tval);
+	if (tval >= 0 && tval < 0xffff) {
+		isp->isp_osinfo.gone_device_time = tval;
+	} else {
+		isp->isp_osinfo.gone_device_time = isp_gone_device_time;
+	}
 }
 
 static void