diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2006-03-13 16:02:24 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2006-03-13 16:02:24 +0000 |
| commit | 718b68a6c38d41688053233a80037eaa6a2c030c (patch) | |
| tree | f971d89a38134010cfa2cce48343cbfcc388497a | |
| parent | 61a95b9f21a862d7ea5e5066fa900ee8a32eb210 (diff) | |
repair commands w/ no scsi_xfer but the affected code was currently dead anyway; pointed out by Tonnerre LOMBARD <tonnerre@thebsh.sygroup.ch>
| -rw-r--r-- | sys/dev/ic/ciss.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c index ea7ceb9fe61..17695b0390e 100644 --- a/sys/dev/ic/ciss.c +++ b/sys/dev/ic/ciss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciss.c,v 1.13 2006/02/02 22:13:04 brad Exp $ */ +/* $OpenBSD: ciss.c,v 1.14 2006/03/13 16:02:23 mickey Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -401,7 +401,7 @@ cissminphys(struct buf *bp) bp->b_bcount = CISS_MAXFER; #endif minphys(bp); -} +} /* * submit a command and optionally wait for completition. @@ -549,6 +549,7 @@ ciss_done(struct ciss_ccb *ccb) { struct ciss_softc *sc = ccb->ccb_sc; struct scsi_xfer *xs = ccb->ccb_xs; + struct ciss_cmd *cmd; ciss_lock_t lock; int error = 0; @@ -567,9 +568,10 @@ ciss_done(struct ciss_ccb *ccb) if (ccb->ccb_cmd.id & CISS_CMD_ERR) error = ciss_error(ccb); + cmd = &ccb->ccb_cmd; if (ccb->ccb_data) { bus_dmamap_sync(sc->dmat, ccb->ccb_dmamap, 0, - ccb->ccb_dmamap->dm_mapsize, (xs->flags & SCSI_DATA_IN) ? + ccb->ccb_dmamap->dm_mapsize, (cmd->flags & CISS_CDB_IN) ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(sc->dmat, ccb->ccb_dmamap); ccb->ccb_xs = NULL; @@ -655,6 +657,7 @@ ciss_inq(struct ciss_softc *sc, struct ciss_inquiry *inq) ccb = ciss_get_ccb(sc); ccb->ccb_len = sizeof(*inq); ccb->ccb_data = inq; + ccb->ccb_xs = NULL; cmd = &ccb->ccb_cmd; cmd->tgt = htole32(CISS_CMD_MODE_PERIPH); cmd->tgt2 = 0; @@ -687,6 +690,7 @@ ciss_ldmap(struct ciss_softc *sc) ccb = ciss_get_ccb(sc); ccb->ccb_len = total; ccb->ccb_data = lmap; + ccb->ccb_xs = NULL; cmd = &ccb->ccb_cmd; cmd->tgt = CISS_CMD_MODE_PERIPH; cmd->tgt2 = 0; @@ -727,6 +731,7 @@ ciss_sync(struct ciss_softc *sc) ccb = ciss_get_ccb(sc); ccb->ccb_len = sizeof(*flush); ccb->ccb_data = flush; + ccb->ccb_xs = NULL; cmd = &ccb->ccb_cmd; cmd->tgt = CISS_CMD_MODE_PERIPH; cmd->tgt2 = 0; @@ -781,8 +786,6 @@ ciss_scsi_raw_cmd(struct scsi_xfer *xs) /* TODO */ ccb->ccb_data = xs->data; ccb->ccb_xs = xs; - - cmd->cdblen = xs->cmdlen; cmd->flags = CISS_CDB_CMD | CISS_CDB_SIMPL; if (xs->flags & SCSI_DATA_IN) |