From owner-p4-projects@FreeBSD.ORG Mon Feb 28 15:56:02 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29210106566C; Mon, 28 Feb 2011 15:56:02 +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 DF226106564A for ; Mon, 28 Feb 2011 15:56:01 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B22408FC1F for ; Mon, 28 Feb 2011 15:56:01 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p1SFu1uX093206 for ; Mon, 28 Feb 2011 15:56:01 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p1SFu11f093203 for perforce@freebsd.org; Mon, 28 Feb 2011 15:56:01 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 28 Feb 2011 15:56:01 GMT Message-Id: <201102281556.p1SFu11f093203@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 189280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Feb 2011 15:56:02 -0000 http://p4web.freebsd.org/@@189280?ac=10 Change 189280 by mjacob@mjacob-sandbox on 2011/02/28 15:55:46 Sync FreeBSD ISP with mercurial tree. Affected files ... .. //depot/projects/mjacob-dev/sys/dev/isp/isp.c#3 edit .. //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.c#4 edit .. //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.h#3 edit .. //depot/projects/mjacob-dev/sys/dev/isp/ispvar.h#3 edit Differences ... ==== //depot/projects/mjacob-dev/sys/dev/isp/isp.c#3 (text+ko) ==== @@ -4377,7 +4377,7 @@ 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 @@ 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); ==== //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.c#4 (text+ko) ==== @@ -1865,7 +1865,7 @@ } 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 { ==== //depot/projects/mjacob-dev/sys/dev/isp/isp_freebsd.h#3 (text+ko) ==== @@ -325,6 +325,8 @@ #define ISP_DELAY DELAY #define ISP_SLEEP(isp, x) DELAY(x) +#define ISP_MIN imin + #ifndef DIAGNOSTIC #define ISP_INLINE __inline #else ==== //depot/projects/mjacob-dev/sys/dev/isp/ispvar.h#3 (text+ko) ==== @@ -997,6 +997,7 @@ * * 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 *