summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormjacob <mjacob@NetBSD.org>1998-09-17 23:10:20 +0000
committermjacob <mjacob@NetBSD.org>1998-09-17 23:10:20 +0000
commit6d8a22890e975fec2f99f9d6083390a006e4c513 (patch)
tree46726017d1c9db14901ee7cd18ed142e83dda7a3 /sys/dev
parent1dac5b529110c02dbacb68b3ebacdf26e43442ad (diff)
dma setup now returns CMD_QUEUED or CMD_COMPLETE. Clarify a ternary
operation that needed some parentheses.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/isp_pci.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index b74a88d67c8..011eb3835cb 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_pci.c,v 1.29 1998/09/08 07:16:46 mjacob Exp $ */
+/* $NetBSD: isp_pci.c,v 1.30 1998/09/17 23:10:20 mjacob Exp $ */
/*
* PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
*
@@ -490,7 +490,7 @@ isp_pci_dmasetup(isp, xs, rq, iptrp, optr)
NULL, xs->flags & SCSI_NOSLEEP ? BUS_DMA_NOWAIT : BUS_DMA_WAITOK);
if (error) {
XS_SETERR(xs, HBA_BOTCH);
- return (error);
+ return (CMD_COMPLETE);
}
segcnt = dmap->dm_nsegs;
@@ -524,7 +524,7 @@ isp_pci_dmasetup(isp, xs, rq, iptrp, optr)
isp->isp_name);
bus_dmamap_unload(pci->pci_dmat, dmap);
XS_SETERR(xs, HBA_BOTCH);
- return (EFBIG);
+ return (CMD_COMPLETE);
}
rq->req_header.rqs_entry_count++;
bzero((void *)crq, sizeof (*crq));
@@ -542,14 +542,14 @@ isp_pci_dmasetup(isp, xs, rq, iptrp, optr)
dmasync:
bus_dmamap_sync(pci->pci_dmat, dmap, 0, dmap->dm_mapsize,
- xs->flags & SCSI_DATA_IN ?
- BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE);
+ (xs->flags & SCSI_DATA_IN) ? BUS_DMASYNC_PREREAD :
+ BUS_DMASYNC_PREWRITE);
mbxsync:
bus_dmamap_sync(pci->pci_dmat, pci->pci_rquest_dmap, 0,
pci->pci_rquest_dmap->dm_mapsize, BUS_DMASYNC_PREWRITE);
- return (0);
+ return (CMD_QUEUED);
}
static int