summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/hp300/dev/mb89352.c4
-rw-r--r--sys/arch/luna88k/dev/mb89352.c4
-rw-r--r--sys/arch/mac68k/dev/ncr5380.c4
-rw-r--r--sys/arch/macppc/dev/mesh.c4
-rw-r--r--sys/arch/mvme68k/dev/sbic.c4
-rw-r--r--sys/arch/mvme68k/dev/ssh.c4
-rw-r--r--sys/arch/mvme68k/dev/vs.c4
-rw-r--r--sys/arch/vax/dec/sii.c4
8 files changed, 16 insertions, 16 deletions
diff --git a/sys/arch/hp300/dev/mb89352.c b/sys/arch/hp300/dev/mb89352.c
index f6ccf0d97ba..53105a62fd0 100644
--- a/sys/arch/hp300/dev/mb89352.c
+++ b/sys/arch/hp300/dev/mb89352.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mb89352.c,v 1.15 2006/11/28 23:59:45 dlg Exp $ */
+/* $OpenBSD: mb89352.c,v 1.16 2008/11/25 17:52:02 krw Exp $ */
/* $NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
@@ -412,7 +412,7 @@ spc_scsi_cmd(struct scsi_xfer *xs)
flags = xs->flags;
if ((acb = spc_get_acb(sc, flags)) == NULL) {
- return TRY_AGAIN_LATER;
+ return (NO_CCB);
}
/* Initialize acb */
diff --git a/sys/arch/luna88k/dev/mb89352.c b/sys/arch/luna88k/dev/mb89352.c
index aaa17d259cc..e4064bd5b8b 100644
--- a/sys/arch/luna88k/dev/mb89352.c
+++ b/sys/arch/luna88k/dev/mb89352.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mb89352.c,v 1.7 2006/11/28 23:59:45 dlg Exp $ */
+/* $OpenBSD: mb89352.c,v 1.8 2008/11/25 17:52:02 krw Exp $ */
/* $NetBSD: mb89352.c,v 1.5 2000/03/23 07:01:31 thorpej Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
@@ -442,7 +442,7 @@ spc_scsi_cmd(xs)
flags = xs->flags;
if ((acb = spc_get_acb(sc, flags)) == NULL) {
- return TRY_AGAIN_LATER;
+ return (NO_CCB);
}
/* Initialize acb */
diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c
index 10b714bbac9..002cee9eefa 100644
--- a/sys/arch/mac68k/dev/ncr5380.c
+++ b/sys/arch/mac68k/dev/ncr5380.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr5380.c,v 1.33 2007/12/29 03:04:18 dlg Exp $ */
+/* $OpenBSD: ncr5380.c,v 1.34 2008/11/25 17:52:02 krw Exp $ */
/* $NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $ */
/*
@@ -311,7 +311,7 @@ mac68k_ncr5380_scsi_cmd(struct scsi_xfer *xs)
sps = splbio();
if ((reqp = free_head) == 0) {
splx(sps);
- return (TRY_AGAIN_LATER);
+ return (NO_CCB);
}
free_head = reqp->next;
reqp->next = NULL;
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index 3c01138c614..02b8a649909 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mesh.c,v 1.20 2008/10/15 19:12:19 blambert Exp $ */
+/* $OpenBSD: mesh.c,v 1.21 2008/11/25 17:52:02 krw Exp $ */
/* $NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $ */
/*-
@@ -1048,7 +1048,7 @@ mesh_scsi_cmd(struct scsi_xfer *xs)
scb = mesh_get_scb(sc);
splx(s);
if (scb == NULL)
- return (TRY_AGAIN_LATER);
+ return (NO_CCB);
DPRINTF("cmdlen: %d\n", xs->cmdlen);
scb->xs = xs;
scb->flags = 0;
diff --git a/sys/arch/mvme68k/dev/sbic.c b/sys/arch/mvme68k/dev/sbic.c
index 2ce2cc1cf9a..624f48722ce 100644
--- a/sys/arch/mvme68k/dev/sbic.c
+++ b/sys/arch/mvme68k/dev/sbic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbic.c,v 1.20 2008/09/12 11:14:02 miod Exp $ */
+/* $OpenBSD: sbic.c,v 1.21 2008/11/25 17:52:02 krw Exp $ */
/* $NetBSD: sbic.c,v 1.2 1996/04/23 16:32:54 chuck Exp $ */
/*
@@ -385,7 +385,7 @@ sbic_scsicmd(xs)
Debugger();
#endif
#endif
- return(TRY_AGAIN_LATER);
+ return (NO_CCB);
}
if ( flags & SCSI_DATA_IN )
diff --git a/sys/arch/mvme68k/dev/ssh.c b/sys/arch/mvme68k/dev/ssh.c
index 50386e3ba33..55161447cb1 100644
--- a/sys/arch/mvme68k/dev/ssh.c
+++ b/sys/arch/mvme68k/dev/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.19 2008/09/12 11:14:02 miod Exp $ */
+/* $OpenBSD: ssh.c,v 1.20 2008/11/25 17:52:02 krw Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -170,7 +170,7 @@ struct scsi_xfer *xs;
splx(s);
if (acb == NULL) {
- return (TRY_AGAIN_LATER);
+ return (NO_CCB);
}
acb->flags = ACB_ACTIVE;
diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index 2b7371b0e5d..f97f42753dc 100644
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs.c,v 1.25 2008/07/30 18:08:03 miod Exp $ */
+/* $OpenBSD: vs.c,v 1.26 2008/11/25 17:52:02 krw Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
@@ -297,7 +297,7 @@ vs_scsicmd(xs)
} else {
cqep = vs_getcqe(sc);
if (cqep == NULL) {
- return (TRY_AGAIN_LATER);
+ return (NO_CCB);
}
iopb = vs_getiopb(sc);
}
diff --git a/sys/arch/vax/dec/sii.c b/sys/arch/vax/dec/sii.c
index 1890c26cd23..1883e634827 100644
--- a/sys/arch/vax/dec/sii.c
+++ b/sys/arch/vax/dec/sii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sii.c,v 1.3 2008/08/30 20:13:03 miod Exp $ */
+/* $OpenBSD: sii.c,v 1.4 2008/11/25 17:52:02 krw Exp $ */
/* $NetBSD: sii.c,v 1.42 2000/06/02 20:20:29 mhitch Exp $ */
/*
* Copyright (c) 2008 Miodrag Vallat.
@@ -240,7 +240,7 @@ sii_scsi_cmd(xs)
#ifdef DEBUG
printf("[busy at start]\n");
#endif
- return (TRY_AGAIN_LATER);
+ return (NO_CCB);
}
/*
* Build a ScsiCmd for this command and start it.