PERFORCE change 105739 for review

[Matt Jacob]

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

Change 105739 by mjacob at 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);