diff options
| author | mjacob <mjacob@FreeBSD.org> | 1998-09-17 21:05:40 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 1998-09-17 21:05:40 +0000 |
| commit | 1f41f720c75f81a3d649090aea1368393a5ecaaa (patch) | |
| tree | 876f4fecb5242eb60f4d8a30dbe776b737d15eed /sys/dev/isp | |
| parent | 4d3cd8e51f8765ea72377bfbdb7025382eaae1fd (diff) | |
| download | FreeBSD-src-1f41f720c75f81a3d649090aea1368393a5ecaaa.zip FreeBSD-src-1f41f720c75f81a3d649090aea1368393a5ecaaa.tar.gz | |
Remove commented out and no longer pertinent EAGAIN message. Redo CMD_COMPLETE
logic for returns from inner layer (just make sure that a CAM_REQ_INPROG
doesn't get xpt_done'd).
Diffstat (limited to 'sys/dev/isp')
| -rw-r--r-- | sys/dev/isp/isp_freebsd.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index a6ef17c..37bbf13 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -1,5 +1,4 @@ /* $FreeBSD$ */ -/* $Id: isp_freebsd.c,v 1.4 1998/09/16 16:42:40 mjacob Exp $ */ /* * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. * @@ -213,11 +212,6 @@ isp_action(sim, ccb) ccb->ccb_h.status |= CAM_SIM_QUEUED; break; case CMD_EAGAIN: -#if 0 - printf("%s: EAGAINed %d.%d\n", isp->isp_name, - ccb->ccb_h.target_id, ccb->ccb_h.target_lun); - printf("%s: %d EAGAIN\n", __FILE__, __LINE__); -#endif if (isp->isp_osinfo.simqfrozen == 0) { xpt_freeze_simq(sim, 1); isp->isp_osinfo.simqfrozen = 1; @@ -227,12 +221,13 @@ isp_action(sim, ccb) xpt_done(ccb); break; case CMD_COMPLETE: - printf("%s: COMPLETEd for %d.%d with cam status 0%x\n", - isp->isp_name, ccb->ccb_h.target_id, - ccb->ccb_h.target_lun, ccb->ccb_h.status); - if ((ccb->ccb_h.status & CAM_STATUS_MASK) != + /* + * Just make sure that we didn't get it returned + * as completed, but with the request still in + * progress. In theory, 'cannot happen'. + */ + if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG) { - /* XXX: Cannot Happen */ ccb->ccb_h.status &= ~CAM_STATUS_MASK; ccb->ccb_h.status |= CAM_REQ_CMP_ERR; } |
