diff options
| author | mjacob <mjacob@FreeBSD.org> | 1998-09-16 16:42:40 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 1998-09-16 16:42:40 +0000 |
| commit | c773a864d944a92d827625cb1300c52652a203d4 (patch) | |
| tree | 17d5834aee36a08102895c14e2fd2b4ea29b5f74 /sys/dev/isp | |
| parent | 76ada56e70e50478b977a38fbac7042c54fdcfca (diff) | |
| download | FreeBSD-src-c773a864d944a92d827625cb1300c52652a203d4.zip FreeBSD-src-c773a864d944a92d827625cb1300c52652a203d4.tar.gz | |
alpha port fixes from Doug.
Reviewed by: dfr
Diffstat (limited to 'sys/dev/isp')
| -rw-r--r-- | sys/dev/isp/isp_freebsd.c | 4 | ||||
| -rw-r--r-- | sys/dev/isp/isp_freebsd_cam.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index 14546b8..d9f7ff4 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $Id: isp_freebsd.c,v 1.11 1998/09/14 23:22:12 mjacob Exp $ */ +/* $Id: isp_freebsd.c,v 1.3 1998/09/15 08:42:55 gibbs Exp $ */ /* * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. * @@ -248,7 +248,7 @@ isp_action(sim, ccb) case XPT_RESET_DEV: /* BDR the specified SCSI device */ tgt = ccb->ccb_h.target_id; s = splcam(); - error = isp_control(isp, ISPCTL_RESET_DEV, (void *) tgt); + error = isp_control(isp, ISPCTL_RESET_DEV, (void *)(intptr_t) tgt); (void) splx(s); if (error) { ccb->ccb_h.status = CAM_REQ_CMP_ERR; diff --git a/sys/dev/isp/isp_freebsd_cam.h b/sys/dev/isp/isp_freebsd_cam.h index d661f82..d1c8684 100644 --- a/sys/dev/isp/isp_freebsd_cam.h +++ b/sys/dev/isp/isp_freebsd_cam.h @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $Id: isp_freebsd_cam.h,v 1.1 1998/09/15 08:42:55 gibbs Exp $ */ +/* $Id: isp_freebsd_cam.h,v 1.2 1998/09/15 09:59:37 gibbs Exp $ */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions (CAM version) *--------------------------------------- @@ -111,8 +111,8 @@ struct isposinfo { #define XS_RESID(ccb) (ccb)->resid #define XS_XFRLEN(ccb) (ccb)->dxfer_len #define XS_CDBLEN(ccb) (ccb)->cdb_len -#define XS_CDBP(ccb) ((ccb)->ccb_h.flags & CAM_CDB_POINTER)? \ - (ccb)->cdb_io.cdb_ptr : (ccb)->cdb_io.cdb_bytes +#define XS_CDBP(ccb) (((ccb)->ccb_h.flags & CAM_CDB_POINTER)? \ + (ccb)->cdb_io.cdb_ptr : (ccb)->cdb_io.cdb_bytes) #define XS_STS(ccb) (ccb)->scsi_status #define XS_TIME(ccb) (ccb)->ccb_h.timeout #define XS_SNSP(ccb) (&(ccb)->sense_data) |
