From owner-p4-projects@FreeBSD.ORG  Tue Oct 24 16:36:34 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 79A4F16A530; Tue, 24 Oct 2006 16:36:34 +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 3BB9616A4A7
	for <perforce@freebsd.org>; Tue, 24 Oct 2006 16:36:34 +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 39F3743DFC
	for <perforce@freebsd.org>; Tue, 24 Oct 2006 16:34:16 +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 k9OGYAUt017308
	for <perforce@freebsd.org>; Tue, 24 Oct 2006 16:34:10 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9OGYANn017302
	for perforce@freebsd.org; Tue, 24 Oct 2006 16:34:10 GMT
	(envelope-from mjacob@freebsd.org)
Date: Tue, 24 Oct 2006 16:34:10 GMT
Message-Id: <200610241634.k9OGYANn017302@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 108354 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: Tue, 24 Oct 2006 16:36:34 -0000

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

Change 108354 by mjacob@newisp on 2006/10/24 16:33:32

	Make fields broad enough to have > 16 seconds worth of
	(usec defined) timeouts.

Affected files ...

.. //depot/projects/newisp/dev/isp/isp.c#23 edit
.. //depot/projects/newisp/dev/isp/ispreg.h#7 edit

Differences ...

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

@@ -3139,6 +3139,7 @@
 	mbs.param[6] = DMA_WD3(fcp->isp_scdma);
 	mbs.param[7] = DMA_WD2(fcp->isp_scdma);
 	mbs.logval = MBLOGALL;
+	mbs.timeout = 1000000;
 	isp_mboxcmd(isp, &mbs);
 	if (mbs.param[0] != MBOX_COMMAND_COMPLETE) {
 		if (mbs.param[0] == MBOX_INVALID_COMMAND) {
@@ -3786,6 +3787,7 @@
 	mbs.param[6] = DMA_WD3(fcp->isp_scdma);
 	mbs.param[7] = DMA_WD2(fcp->isp_scdma);
 	mbs.logval = MBLOGALL;
+	mbs.timeout = 1000000;
 	MEMORYBARRIER(isp, SYNC_SFORDEV, 0, SNS_RFT_ID_REQ_SIZE);
 	isp_mboxcmd(isp, &mbs);
 	FC_SCRATCH_RELEASE(isp);

==== //depot/projects/newisp/dev/isp/ispreg.h#7 (text+ko) ====

@@ -467,9 +467,9 @@
 	uint16_t param[MAILBOX_STORAGE];
 	uint16_t ibits;
 	uint16_t obits;
-	uint32_t
-	    	timeout : 28,
+	uint32_t	: 28,
 		logval	: 4;
+	uint32_t timeout;
 } mbreg_t;
 
 /*