Sync FreeBSD ISP with mercurial tree. Minor changes having to do with

a macro for minima.

4 files changed, 9 insertions, 6 deletions

diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index b63b057ecf1a..95f2add24743 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -4377,7 +4377,7 @@ isp_start(XS_T *xs)
 	if (IS_SCSI(isp)) {
 		reqp->req_target = target | (XS_CHANNEL(xs) << 7);
 		reqp->req_lun_trn = XS_LUN(xs);
-		cdblen = MIN(cdblen, sizeof (reqp->req_cdb));
+		cdblen = ISP_MIN(cdblen, sizeof (reqp->req_cdb));
 		cdbp = reqp->req_cdb;
 		reqp->req_cdblen = cdblen;
 	} else if (IS_24XX(isp)) {
@@ -4396,25 +4396,25 @@ isp_start(XS_T *xs)
 		t7->req_lun[1] = XS_LUN(xs);
 		tptr = &t7->req_time;
 		cdbp = t7->req_cdb;
-		cdblen = MIN(cdblen, sizeof (t7->req_cdb));
+		cdblen = ISP_MIN(cdblen, sizeof (t7->req_cdb));
 	} else if (ISP_CAP_2KLOGIN(isp)) {
 		ispreqt2e_t *t2e = (ispreqt2e_t *)local;
 		t2e->req_target = target;
 		t2e->req_scclun = XS_LUN(xs);
 		cdbp = t2e->req_cdb;
-		cdblen = MIN(cdblen, sizeof (t2e->req_cdb));
+		cdblen = ISP_MIN(cdblen, sizeof (t2e->req_cdb));
 	} else if (ISP_CAP_SCCFW(isp)) {
 		ispreqt2_t *t2 = (ispreqt2_t *)local;
 		t2->req_target = target;
 		t2->req_scclun = XS_LUN(xs);
 		cdbp = t2->req_cdb;
-		cdblen = MIN(cdblen, sizeof (t2->req_cdb));
+		cdblen = ISP_MIN(cdblen, sizeof (t2->req_cdb));
 	} else {
 		ispreqt2_t *t2 = (ispreqt2_t *)local;
 		t2->req_target = target;
 		t2->req_lun_trn = XS_LUN(xs);
 		cdbp = t2->req_cdb;
-		cdblen = MIN(cdblen, sizeof (t2->req_cdb));
+		cdblen = ISP_MIN(cdblen, sizeof (t2->req_cdb));
 	}
 	ISP_MEMCPY(cdbp, XS_CDBP(xs), cdblen);
 
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index 6234fc3b33a5..4a664bfb9a33 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -1865,7 +1865,7 @@ isp_handle_platform_atio(ispsoftc_t *isp, at_entry_t *aep)
 	}
 
 	if (status & QLTM_SVALID) {
-		size_t amt = imin(QLTM_SENSELEN, sizeof (atiop->sense_data));
+		size_t amt = ISP_MIN(QLTM_SENSELEN, sizeof (atiop->sense_data));
 		atiop->sense_len = amt;
 		ISP_MEMCPY(&atiop->sense_data, aep->at_sense, amt);
 	} else {
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 5d2153584032..c47f12b93bf7 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -325,6 +325,8 @@ struct isposinfo {
 #define	ISP_DELAY		DELAY
 #define	ISP_SLEEP(isp, x)	DELAY(x)
 
+#define	ISP_MIN			imin
+
 #ifndef	DIAGNOSTIC
 #define	ISP_INLINE		__inline
 #else
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index c243f1bec937..d7937949c488 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -997,6 +997,7 @@ void isp_async(ispsoftc_t *, ispasync_t, ...);
  *
  *	ISP_INLINE				___inline or not- depending on how
  *						good your debugger is
+ *	ISP_MIN					shorthand for ((a) < (b))? (a) : (b)
  *
  *	NANOTIME_T				nanosecond time type
  *