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).
This commit is contained in:
Matt Jacob 1998-09-17 21:05:40 +00:00
parent 42b7427595
commit c6904df981
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=39433

View File

@ -1,5 +1,4 @@
/* $FreeBSD$ */ /* $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. * Platform (FreeBSD) dependent common attachment code for Qlogic adapters.
* *
@ -213,11 +212,6 @@ isp_action(sim, ccb)
ccb->ccb_h.status |= CAM_SIM_QUEUED; ccb->ccb_h.status |= CAM_SIM_QUEUED;
break; break;
case CMD_EAGAIN: 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) { if (isp->isp_osinfo.simqfrozen == 0) {
xpt_freeze_simq(sim, 1); xpt_freeze_simq(sim, 1);
isp->isp_osinfo.simqfrozen = 1; isp->isp_osinfo.simqfrozen = 1;
@ -227,12 +221,13 @@ isp_action(sim, ccb)
xpt_done(ccb); xpt_done(ccb);
break; break;
case CMD_COMPLETE: case CMD_COMPLETE:
printf("%s: COMPLETEd for %d.%d with cam status 0%x\n", /*
isp->isp_name, ccb->ccb_h.target_id, * Just make sure that we didn't get it returned
ccb->ccb_h.target_lun, ccb->ccb_h.status); * as completed, but with the request still in
if ((ccb->ccb_h.status & CAM_STATUS_MASK) != * progress. In theory, 'cannot happen'.
*/
if ((ccb->ccb_h.status & CAM_STATUS_MASK) ==
CAM_REQ_INPROG) { CAM_REQ_INPROG) {
/* XXX: Cannot Happen */
ccb->ccb_h.status &= ~CAM_STATUS_MASK; ccb->ccb_h.status &= ~CAM_STATUS_MASK;
ccb->ccb_h.status |= CAM_REQ_CMP_ERR; ccb->ccb_h.status |= CAM_REQ_CMP_ERR;
} }