From owner-svn-src-head@FreeBSD.ORG  Thu Jul  2 00:41:37 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6CB051065672;
	Thu,  2 Jul 2009 00:41:37 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5B1308FC18;
	Thu,  2 Jul 2009 00:41:37 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n620fbvb028761;
	Thu, 2 Jul 2009 00:41:37 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n620fbCI028759;
	Thu, 2 Jul 2009 00:41:37 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200907020041.n620fbCI028759@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 2 Jul 2009 00:41:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195274 - head/sys/dev/mpt
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jul 2009 00:41:37 -0000

Author: delphij
Date: Thu Jul  2 00:41:37 2009
New Revision: 195274
URL: http://svn.freebsd.org/changeset/base/195274

Log:
  Change explicit maximium numbers to the defined macro MPT_MAX_LUNS.
  
  Approved by:	re (kensmith)

Modified:
  head/sys/dev/mpt/mpt_cam.c

Modified: head/sys/dev/mpt/mpt_cam.c
==============================================================================
--- head/sys/dev/mpt/mpt_cam.c	Thu Jul  2 00:39:25 2009	(r195273)
+++ head/sys/dev/mpt/mpt_cam.c	Thu Jul  2 00:41:37 2009	(r195274)
@@ -2152,7 +2152,7 @@ mpt_start(struct cam_sim *sim, union ccb
 	mpt_req->TargetID = tgt;
 
 	/* We assume a single level LUN type */
-	if (ccb->ccb_h.target_lun >= 256) {
+	if (ccb->ccb_h.target_lun >= MPT_MAX_LUNS) {
 		mpt_req->LUN[0] = 0x40 | ((ccb->ccb_h.target_lun >> 8) & 0x3f);
 		mpt_req->LUN[1] = ccb->ccb_h.target_lun & 0xff;
 	} else {
@@ -4025,7 +4025,7 @@ mpt_scsi_send_tmf(struct mpt_softc *mpt,
 	tmf_req->MsgFlags = flags;
 	tmf_req->MsgContext =
 	    htole32(mpt->tmf_req->index | scsi_tmf_handler_id);
-	if (lun > 256) {
+	if (lun > MPT_MAX_LUNS) {
 		tmf_req->LUN[0] = 0x40 | ((lun >> 8) & 0x3f);
 		tmf_req->LUN[1] = lun & 0xff;
 	} else {
@@ -4499,7 +4499,7 @@ mpt_target_start_io(struct mpt_softc *mp
 		ta->Function = MPI_FUNCTION_TARGET_ASSIST;
 		ta->MsgContext = htole32(req->index | mpt->scsi_tgt_handler_id);
 		ta->ReplyWord = htole32(tgt->reply_desc);
-		if (csio->ccb_h.target_lun > 256) {
+		if (csio->ccb_h.target_lun > MPT_MAX_LUNS) {
 			ta->LUN[0] =
 			    0x40 | ((csio->ccb_h.target_lun >> 8) & 0x3f);
 			ta->LUN[1] = csio->ccb_h.target_lun & 0xff;
@@ -4651,7 +4651,7 @@ mpt_scsi_tgt_local(struct mpt_softc *mpt
 	ta->Function = MPI_FUNCTION_TARGET_ASSIST;
 	ta->MsgContext = htole32(req->index | mpt->scsi_tgt_handler_id);
 	ta->ReplyWord = htole32(tgt->reply_desc);
-	if (lun > 256) {
+	if (lun > MPT_MAX_LUNS) {
 		ta->LUN[0] = 0x40 | ((lun >> 8) & 0x3f);
 		ta->LUN[1] = lun & 0xff;
 	} else {