diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2006-03-18 03:13:44 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2006-03-18 03:13:44 +0000 |
| commit | 443de9a991a760206bf9e462bc9bf3df4b1e343d (patch) | |
| tree | d38e4c63e851fa56a76e21c566328210dfc7df50 /sys/dev/ic | |
| parent | 9128c7357b587cf6a120ec0e03c9d89b684631eb (diff) | |
use polling for the synchronise command while i move the xs setup and
completion stuff around.
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/ami.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index 083d74ced3d..f1e8c4f8f9d 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.123 2006/03/18 02:28:29 dlg Exp $ */ +/* $OpenBSD: ami.c,v 1.124 2006/03/18 03:13:43 dlg Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -1441,19 +1441,13 @@ ami_scsi_cmd(struct scsi_xfer *xs) cmd->acc_cmd = AMI_FLUSH; s = splbio(); - error = ami_start_xs(ccb, (xs->flags & SCSI_NOSLEEP) ? - BUS_DMA_NOWAIT : BUS_DMA_WAITOK, xs->flags & SCSI_POLL); + error = ami_poll(sc, ccb); splx(s); - if (error) { + if (error) xs->error = XS_DRIVER_STUFFUP; - scsi_done(xs); - return (COMPLETE); - } - if (xs->flags & SCSI_POLL) - return (COMPLETE); - else - return (SUCCESSFULLY_QUEUED); + scsi_done(xs); + return (COMPLETE); case TEST_UNIT_READY: /* save off sd? after autoconf */ |