summaryrefslogtreecommitdiff
path: root/sys/dev/ic/iha.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2001-11-11 21:59:20 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2001-11-11 21:59:20 +0000
commit6916b480bce82c1dc07719d41631a38c56a6a62c (patch)
tree4319e49fb9d88f23070990c77c56cfc4a80229d3 /sys/dev/ic/iha.c
parent2724970bafb70b3309e7bce0a52a619fce5dfac2 (diff)
Remove local defines for SCSI status codes and use those now
defined in scsi_all.h.
Diffstat (limited to 'sys/dev/ic/iha.c')
-rw-r--r--sys/dev/ic/iha.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c
index 76a108aa76e..c54a1e1d59d 100644
--- a/sys/dev/ic/iha.c
+++ b/sys/dev/ic/iha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iha.c,v 1.11 2001/11/05 17:25:58 art Exp $ */
+/* $OpenBSD: iha.c,v 1.12 2001/11/11 21:59:19 krw Exp $ */
/*
* Initio INI-9xxxU/UW SCSI Device Driver
*
@@ -864,7 +864,7 @@ iha_scsi_label:
while ((pScb = iha_pop_done_scb(sc)) != NULL) {
switch (pScb->SCB_TaStat) {
- case SCSI_CMD_TERMINATED:
+ case SCSI_TERMINATED:
case SCSI_ACA_ACTIVE:
case SCSI_CHECK:
pScb->SCB_Tcs->TCS_Flags &=
@@ -2417,20 +2417,20 @@ iha_done_scb(sc, pScb)
case HOST_OK:
switch (pScb->SCB_TaStat) {
case SCSI_OK:
- case SCSI_CONDITION_MET:
+ case SCSI_COND_MET:
case SCSI_INTERM:
case SCSI_INTERM_COND_MET:
xs->resid = pScb->SCB_BufLen;
xs->error = XS_NOERROR;
break;
- case SCSI_RSERV_CONFLICT:
+ case SCSI_RESV_CONFLICT:
case SCSI_BUSY:
case SCSI_QUEUE_FULL:
xs->error = XS_BUSY;
break;
- case SCSI_CMD_TERMINATED:
+ case SCSI_TERMINATED:
case SCSI_ACA_ACTIVE:
case SCSI_CHECK:
s1 = &pScb->SCB_ScsiSenseData;