diff options
| author | Marco Peereboom <marco@cvs.openbsd.org> | 2004-06-22 00:43:26 +0000 |
|---|---|---|
| committer | Marco Peereboom <marco@cvs.openbsd.org> | 2004-06-22 00:43:26 +0000 |
| commit | 2d753af24bc569d8c4842a6b59dab9a521acc7a7 (patch) | |
| tree | 54ee76b69ba29a4cb1baeee2c93739c24669b1e4 /sys/scsi | |
| parent | 1439cc176d3a6ad5c0ab3d4dab66b12cc76aece5 (diff) | |
Add additional retries in TUR to allow for tape devices to settle after a reset.
More informative failure message and silence "already open" message.
ok krw@
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/st.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 1c3bad57f60..7c9d5861ed3 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.39 2004/05/28 23:50:15 krw Exp $ */ +/* $OpenBSD: st.c,v 1.40 2004/06/22 00:43:25 marco Exp $ */ /* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */ /* @@ -409,11 +409,12 @@ stattach(parent, self, aux) */ printf("\n"); printf("%s: %s", st->sc_dev.dv_xname, st->quirkdata ? "rogue, " : ""); - if (scsi_test_unit_ready(sc_link, TEST_READY_RETRIES_DEFAULT, + if (scsi_test_unit_ready(sc_link, TEST_READY_RETRIES_TAPE, scsi_autoconf | SCSI_SILENT | SCSI_IGNORE_MEDIA_CHANGE) || st_mode_sense(st, - scsi_autoconf | SCSI_SILENT | SCSI_IGNORE_MEDIA_CHANGE)) - printf("drive empty\n"); + scsi_autoconf | SCSI_SILENT | SCSI_IGNORE_MEDIA_CHANGE)) { + printf("drive empty or not ready\n"); + } else { printf("density code 0x%x, ", st->media_density); if (st->media_blksize > 0) @@ -531,7 +532,7 @@ stopen(dev, flags, mode, p) * Only allow one at a time */ if (sc_link->flags & SDEV_OPEN) { - printf("%s: already open\n", st->sc_dev.dv_xname); + SC_DEBUG(sc_link, SDEV_DB4, ("already open\n")); return EBUSY; } |