summaryrefslogtreecommitdiff
path: root/sys/scsi/scsiconf.h
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2008-06-21 21:11:35 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2008-06-21 21:11:35 +0000
commit7e3d01f6eb5ea37acdc9ae9c4000be332e19f7ca (patch)
treef9e59bfeb7bfc92017e0d19518053ef05d97d474 /sys/scsi/scsiconf.h
parentad9cbfe6ecb56a2e6038fc1d8747fd71ec1123fd (diff)
fgsch@ points out my last commit changed the retry limit for CD capacity
commands. Bump limit back to the standard 4, and at the same time eliminate SDRETRIES and CDRETRIES (both defined to 4) in favour of a new define, SCSI_RETRIES, also defined to 4.
Diffstat (limited to 'sys/scsi/scsiconf.h')
-rw-r--r--sys/scsi/scsiconf.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index 1f6c4dfd10d..d7e252fd042 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.h,v 1.92 2008/06/14 01:57:51 krw Exp $ */
+/* $OpenBSD: scsiconf.h,v 1.93 2008/06/21 21:11:34 krw Exp $ */
/* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */
/*
@@ -297,10 +297,15 @@ struct scsi_xfer {
#define XS_RESET 8 /* bus was reset; possible retry command */
/*
- * Possible retries numbers for scsi_test_unit_ready()
+ * Possible retries for scsi_test_unit_ready()
*/
#define TEST_READY_RETRIES 5
+/*
+ * Possible retries for most SCSI commands.
+ */
+#define SCSI_RETRIES 4
+
const void *scsi_inqmatch(struct scsi_inquiry_data *, const void *, int,
int, int *);