summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-07-02 20:18:52 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-07-02 20:18:52 +0000
commita2aebbd450dbf492be9ae399a78ae0a6ddcc4a3f (patch)
tree86b20eff6137340fd7c8b2a573d6a3401af24974
parent8569bd72a51885d19306de1eb6cbaf7c5af1e672 (diff)
handle SCSI_QUEUE_FULL correctly
-rw-r--r--sys/dev/ic/aic7xxx.c4
-rw-r--r--sys/scsi/scsi_all.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 40deee1acc4..6e866ac6e89 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: aic7xxx.c,v 1.7 1996/06/27 21:15:47 shawn Exp $
+ * $Id: aic7xxx.c,v 1.8 1996/07/02 20:18:51 deraadt Exp $
*/
/*
* TODO:
@@ -1499,7 +1499,6 @@ pagein_done:
sc_print_addr(xs->sc_link);
printf("Target Busy\n");
break;
-#ifdef __FreeBSD__
case SCSI_QUEUE_FULL:
/*
* The upper level SCSI code will someday
@@ -1511,7 +1510,6 @@ pagein_done:
STAILQ_INSERT_TAIL(&ahc->assigned_scbs,
scb, links);
break;
-#endif
default:
sc_print_addr(xs->sc_link);
printf("unexpected targ_status: %x\n",
diff --git a/sys/scsi/scsi_all.h b/sys/scsi/scsi_all.h
index 5cf1d9f75a1..c9492a5bb48 100644
--- a/sys/scsi/scsi_all.h
+++ b/sys/scsi/scsi_all.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_all.h,v 1.3 1996/06/16 23:53:15 downsj Exp $ */
+/* $OpenBSD: scsi_all.h,v 1.4 1996/07/02 20:18:49 deraadt Exp $ */
/* $NetBSD: scsi_all.h,v 1.7 1996/03/19 03:06:10 mycroft Exp $ */
/*
@@ -293,5 +293,6 @@ struct scsi_mode_header_big {
#define SCSI_CHECK 0x02
#define SCSI_BUSY 0x08
#define SCSI_INTERM 0x10
+#define SCSI_QUEUE_FULL 0x28
#endif /* _SCSI_SCSI_ALL_H */