From owner-p4-projects@FreeBSD.ORG  Wed Sep  6 21:29:55 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 07FFA16A4E6; Wed,  6 Sep 2006 21:29:55 +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 DA8B816A4DF
	for <perforce@freebsd.org>; Wed,  6 Sep 2006 21:29:54 +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 ECCF243D76
	for <perforce@freebsd.org>; Wed,  6 Sep 2006 21:29:50 +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 k86LTort066147
	for <perforce@freebsd.org>; Wed, 6 Sep 2006 21:29:50 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k86LToDn066144
	for perforce@freebsd.org; Wed, 6 Sep 2006 21:29:50 GMT
	(envelope-from mjacob@freebsd.org)
Date: Wed, 6 Sep 2006 21:29:50 GMT
Message-Id: <200609062129.k86LToDn066144@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 105739 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: Wed, 06 Sep 2006 21:29:55 -0000

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

Change 105739 by mjacob@newisp on 2006/09/06 21:29:49

	Some internal function rototilling.

Affected files ...

.. //depot/projects/newisp/dev/isp/isp_library.c#4 edit

Differences ...

==== //depot/projects/newisp/dev/isp/isp_library.c#4 (text) ====

@@ -48,7 +48,7 @@
 int
 isp_save_xs(ispsoftc_t *isp, XS_T *xs, uint32_t *handlep)
 {
-	uint32_t i, j;
+	uint16_t i, j;
 
 	for (j = isp->isp_lasthdls, i = 0; i < isp->isp_maxcmds; i++) {
 		if (isp->isp_xflist[j] == NULL) {
@@ -83,27 +83,21 @@
 uint32_t
 isp_find_handle(ispsoftc_t *isp, XS_T *xs)
 {
-	int i;
+	uint16_t i;
 	if (xs != NULL) {
 		for (i = 0; i < isp->isp_maxcmds; i++) {
 			if (isp->isp_xflist[i] == xs) {
-				return ((uint32_t) i+1);
+				return ((uint32_t) (i+1));
 			}
 		}
 	}
 	return (0);
 }
 
-int
+uint32_t
 isp_handle_index(uint32_t handle)
 {
-	return (handle-1);
-}
-
-uint32_t
-isp_index_handle(int index)
-{
-	return (index+1);
+	return (handle - 1);
 }
 
 void
@@ -206,22 +200,30 @@
 	fcp = FCPARAM(isp);
 	tptr = &tval;
 	if (isp_control(isp, ISPCTL_FCLINK_TEST, tptr) != 0) {
+		isp_prt(isp, ISP_LOGINFO, "isp_fc_runstate: linktest failed");
 		return (-1);
 	}
 	if (fcp->isp_fwstate != FW_READY ||
 	    fcp->isp_loopstate < LOOP_PDB_RCVD) {
+		isp_prt(isp, ISP_LOGINFO, "isp_fc_runstate: f/w not ready");
 		return (-1);
 	}
 	if (isp_control(isp, ISPCTL_SCAN_LOOP, NULL) != 0) {
+		isp_prt(isp, ISP_LOGINFO, "isp_fc_runstate: scan loop fails");
 		return (-1);
 	}
 	if (isp_control(isp, ISPCTL_SCAN_FABRIC, NULL) != 0) {
+		isp_prt(isp, ISP_LOGINFO,
+		    "isp_fc_runstate: scan fabric fails");
 		return (-1);
 	}
 	if (isp_control(isp, ISPCTL_PDB_SYNC, NULL) != 0) {
+		isp_prt(isp, ISP_LOGINFO, "isp_fc_runstate: pdb_sync fails");
 		return (-1);
 	}
 	if (fcp->isp_fwstate != FW_READY || fcp->isp_loopstate != LOOP_READY) {
+		isp_prt(isp, ISP_LOGINFO,
+		    "isp_fc_runstate: f/w not ready again");
 		return (-1);
 	}
 	return (0);