From owner-p4-projects@FreeBSD.ORG  Mon Apr 23 05:59:59 2007
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 8F6CC16A40D; Mon, 23 Apr 2007 05:59:59 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 65C0E16A40A
	for <perforce@freebsd.org>; Mon, 23 Apr 2007 05:59:59 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 55CDC13C484
	for <perforce@freebsd.org>; Mon, 23 Apr 2007 05:59:59 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3N5xxBq043978
	for <perforce@freebsd.org>; Mon, 23 Apr 2007 05:59:59 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3N5xxxl043975
	for perforce@freebsd.org; Mon, 23 Apr 2007 05:59:59 GMT
	(envelope-from mjacob@freebsd.org)
Date: Mon, 23 Apr 2007 05:59:59 GMT
Message-Id: <200704230559.l3N5xxxl043975@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 118638 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: Mon, 23 Apr 2007 05:59:59 -0000

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

Change 118638 by mjacob@mjexp on 2007/04/23 05:59:33

	Fix inline -> __inline. Fix a LINT found compile problem
	for target mode.

Affected files ...

.. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#15 edit
.. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#25 edit

Differences ...

==== //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#15 (text+ko) ====

@@ -554,22 +554,16 @@
 	cam_sim_alloc(a, b, c, d, e, &(d)->isp_osinfo.lock, f, g, h)
 #endif
 
-#if __FreeBSD_version < 500000
-#define	INLINE	__inline
-#else
-#define	INLINE	inline
-#endif
-
 /* Should be BUS_SPACE_MAXSIZE, but MAXPHYS is larger than BUS_SPACE_MAXSIZE */
 #define ISP_NSEGS ((MAXPHYS / PAGE_SIZE) + 1)  
 
 /*
  * Platform specific inline functions
  */
-static INLINE int isp_get_pcmd(ispsoftc_t *, union ccb *);
-static INLINE void isp_free_pcmd(ispsoftc_t *, union ccb *);
+static __inline int isp_get_pcmd(ispsoftc_t *, union ccb *);
+static __inline void isp_free_pcmd(ispsoftc_t *, union ccb *);
 
-static INLINE int
+static __inline int
 isp_get_pcmd(ispsoftc_t *isp, union ccb *ccb)
 {
 	ISP_PCMD(ccb) = isp->isp_osinfo.pcmd_free;
@@ -580,7 +574,7 @@
 	return (0);
 }
 
-static INLINE void
+static __inline void
 isp_free_pcmd(ispsoftc_t *isp, union ccb *ccb)
 {
 	((struct isp_pcmd *)ISP_PCMD(ccb))->next = isp->isp_osinfo.pcmd_free;

==== //depot/projects/mjexp/sys/dev/isp/isp_pci.c#25 (text+ko) ====

@@ -1985,7 +1985,7 @@
 	cto->ct_resid = 0;
 	cto->ct_scsi_status = 0;
 
-	dp = &ISP_PCMD(csio)->dmap;
+	dp = &PISP_PCMD(csio)->dmap;
 	if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) {
 		bus_dmamap_sync(isp->isp_osinfo.dmat, *dp, BUS_DMASYNC_PREREAD);
 	} else {