From owner-p4-projects@FreeBSD.ORG  Mon Jan 18 14:49:29 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2970C1065672; Mon, 18 Jan 2010 14:49:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D723C106566C
	for <perforce@freebsd.org>; Mon, 18 Jan 2010 14:49:28 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C50678FC15
	for <perforce@freebsd.org>; Mon, 18 Jan 2010 14:49:28 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0IEnS2f071552
	for <perforce@freebsd.org>; Mon, 18 Jan 2010 14:49:28 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0IEnSQY071550
	for perforce@freebsd.org; Mon, 18 Jan 2010 14:49:28 GMT
	(envelope-from mav@freebsd.org)
Date: Mon, 18 Jan 2010 14:49:28 GMT
Message-Id: <201001181449.o0IEnSQY071550@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 173319 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 18 Jan 2010 14:49:29 -0000

http://p4web.freebsd.org/chv.cgi?CH=173319

Change 173319 by mav@mav_mavtest on 2010/01/18 14:48:32

	Do not refetch number of ports on initalization restart.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#29 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#29 (text+ko) ====

@@ -431,7 +431,7 @@
 	
 	if (softc->restart) {
 		softc->restart = 0;
-		softc->state = PMP_STATE_PORTS;
+		softc->state = min(softc->state, PMP_STATE_PRECONFIG);
 	}
 	/* Fetch user wanted device speed. */
 	if (softc->state == PMP_STATE_RESET ||
@@ -577,7 +577,7 @@
 			xpt_free_ccb(done_ccb);
 		} else
 			xpt_release_ccb(done_ccb);
-		softc->state = PMP_STATE_PORTS;
+		softc->state = min(softc->state, PMP_STATE_PRECONFIG);
 		xpt_schedule(periph, priority);
 		return;
 	}