summaryrefslogtreecommitdiff
path: root/sys/scsi/scsiconf.c
diff options
context:
space:
mode:
authorAlexander Yurchenko <grange@cvs.openbsd.org>2002-12-30 21:50:30 +0000
committerAlexander Yurchenko <grange@cvs.openbsd.org>2002-12-30 21:50:30 +0000
commitf42b75705cee14f2b28c309ad80c9f9924d0771b (patch)
treeac588c5b1b609712beca44d9cbc887e58ba8662d /sys/scsi/scsiconf.c
parent0b5fa73158ff68f27d1b67abfcc38579b2e82ea3 (diff)
Add new parameter to scsi_test_unit_ready(): retries number.
Use increased retries number and don't ignore SCSI_IGNORE_NOT_READY when call scsi_test_unit_ready() for cd-rom, this makes system wait if drive is loading media. Tested by millert@ and fgsch@; some input and ok from krw@. Problem reported by The lord of the CD-writers Igor Grabin <violent@death.kiev.ua>.
Diffstat (limited to 'sys/scsi/scsiconf.c')
-rw-r--r--sys/scsi/scsiconf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 2973c5c299a..dabdb3f2ef2 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.69 2002/09/04 23:11:10 tdeval Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.70 2002/12/30 21:50:28 grange Exp $ */
/* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
/*
@@ -802,7 +802,7 @@ scsi_probedev(scsi, target, lun)
sc_link->flags |= scsidebug_level;
#endif /* SCSIDEBUG */
- (void) scsi_test_unit_ready(sc_link,
+ (void) scsi_test_unit_ready(sc_link, TEST_READY_RETRIES_DEFAULT,
scsi_autoconf | SCSI_IGNORE_ILLEGAL_REQUEST | SCSI_IGNORE_NOT_READY | SCSI_IGNORE_MEDIA_CHANGE);
#ifdef SCSI_2_DEF
@@ -932,7 +932,7 @@ scsi_probedev(scsi, target, lun)
* any messages generated by config_attach() do not have
* negotiation messages inserted into their midst.
*/
- (void) scsi_test_unit_ready(sc_link,
+ (void) scsi_test_unit_ready(sc_link, TEST_READY_RETRIES_DEFAULT,
scsi_autoconf | SCSI_IGNORE_ILLEGAL_REQUEST | SCSI_IGNORE_NOT_READY | SCSI_IGNORE_MEDIA_CHANGE);
config_attach((struct device *)scsi, cf, &sa, scsibusprint);