Date: Mon, 23 Apr 2007 05:59:59 GMT From: Matt Jacob <mjacob@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 118638 for review Message-ID: <200704230559.l3N5xxxl043975@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704230559.l3N5xxxl043975>