diff options
Diffstat (limited to 'sys/dev/advansys')
| -rw-r--r-- | sys/dev/advansys/advansys.c | 19 | ||||
| -rw-r--r-- | sys/dev/advansys/advlib.c | 8 | ||||
| -rw-r--r-- | sys/dev/advansys/adwlib.c | 5 |
3 files changed, 12 insertions, 20 deletions
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c index f0588f8916372..ac47f8d7bac4e 100644 --- a/sys/dev/advansys/advansys.c +++ b/sys/dev/advansys/advansys.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: advansys.c,v 1.6 1998/12/04 22:54:44 archie Exp $ + * $Id: advansys.c,v 1.3 1998/10/07 03:32:56 gibbs Exp $ */ /* * Ported from: @@ -134,7 +134,7 @@ adv_name(struct adv_softc *adv) { static char name[10]; - snprintf(name, sizeof(name), "adv%d", adv->unit); + sprintf(name, "adv%d", adv->unit); return (name); } @@ -554,10 +554,8 @@ adv_alloc_ccb_info(struct adv_softc *adv) struct adv_ccb_info *cinfo; cinfo = malloc(sizeof(*cinfo), M_DEVBUF, M_NOWAIT); - if (cinfo == NULL) { + if (cinfo == NULL) printf("%s: Can't malloc CCB info\n", adv_name(adv)); - return (NULL); - } cinfo->state = ACCB_FREE; error = bus_dmamap_create(adv->buffer_dmat, /*flags*/0, &cinfo->dmamap); @@ -1050,9 +1048,7 @@ adv_done(struct adv_softc *adv, union ccb *ccb, u_int done_stat, ccb->ccb_h.status = CAM_SEL_TIMEOUT; break; default: - xpt_print_path(ccb->ccb_h.path); - printf("adv_done - queue done without error, " - "unknown host status %x\n", host_stat); + /* QHSTA error occurred */ /* XXX Can I get more explicit information here? */ ccb->ccb_h.status = CAM_REQ_CMP_ERR; break; @@ -1088,9 +1084,6 @@ adv_done(struct adv_softc *adv, union ccb *ccb, u_int done_stat, ccb->ccb_h.status = CAM_SEL_TIMEOUT; break; default: - xpt_print_path(ccb->ccb_h.path); - printf("adv_done - queue done with error, " - "unknown host status %x\n", host_stat); /* XXX Can I get more explicit information here? */ ccb->ccb_h.status = CAM_REQ_CMP_ERR; break; @@ -1104,9 +1097,7 @@ adv_done(struct adv_softc *adv, union ccb *ccb, u_int done_stat, break; default: - xpt_print_path(ccb->ccb_h.path); - printf("adv_done - queue done with unknown status %x:%x\n", - done_stat, host_stat); + printf("adv_done: Unknown done status 0x%x\n", done_stat); ccb->ccb_h.status = CAM_REQ_CMP_ERR; break; } diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c index e612974c44aa4..617266a6aa876 100644 --- a/sys/dev/advansys/advlib.c +++ b/sys/dev/advansys/advlib.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: advlib.c,v 1.9 1998/10/29 17:41:34 gibbs Exp $ + * $Id: advlib.c,v 1.7 1998/10/07 03:32:57 gibbs Exp $ */ /* * Ported from: @@ -1031,8 +1031,7 @@ adv_isr_chip_halted(struct adv_softc *adv) ccb = (union ccb *) adv_read_lram_32(adv, halt_q_addr + ADV_SCSIQ_D_CCBPTR); xpt_freeze_devq(ccb->ccb_h.path, /*count*/1); - ccb->ccb_h.status |= CAM_DEV_QFRZN|CAM_SCSI_STATUS_ERROR; - ccb->csio.scsi_status = SCSI_STATUS_QUEUE_FULL; + ccb->ccb_h.status |= CAM_DEV_QFRZN; adv_abort_ccb(adv, tid_no, ADV_TIX_TO_LUN(target_ix), /*ccb*/NULL, CAM_REQUEUE_REQ, /*queued_only*/TRUE); @@ -1971,6 +1970,7 @@ adv_abort_ccb(struct adv_softc *adv, int target, int lun, union ccb *ccb, struct adv_ccb_info *cinfo; scsiq->q_status |= QS_ABORTED; + scsiq->d3.done_stat = QD_ABORTED_BY_HOST; adv_write_lram_8(adv, q_addr + ADV_SCSIQ_B_STATUS, scsiq->q_status); aborted_ccb = (union ccb *)scsiq->d2.ccb_ptr; @@ -2009,6 +2009,8 @@ adv_reset_bus(struct adv_softc *adv) count = 0; while ((ccb = (union ccb *)LIST_FIRST(&adv->pending_ccbs)) != NULL) { + struct adv_ccb_info *cinfo; + if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG) ccb->ccb_h.status |= CAM_SCSI_BUS_RESET; adv_done(adv, ccb, QD_ABORTED_BY_HOST, 0, 0, 0); diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c index c727ca633b751..e2b93ac0fc2ce 100644 --- a/sys/dev/advansys/adwlib.c +++ b/sys/dev/advansys/adwlib.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adwlib.c,v 1.1 1998/10/07 03:20:46 gibbs Exp $ + * $Id$ */ /* * Ported from: @@ -43,8 +43,7 @@ * code retain the above copyright notice and this comment without * modification. */ - -#include <sys/types.h> +#include <sys/queue.h> #include <sys/systm.h> #include <machine/bus_pio.h> |