Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* In st_touch_tape(), don't bail out if the MODE SELECT fails since we are, 

after all, probing the device for acceptable parameters.

* In st_loadquirks(), copy mode-specific quirks from the quirk table
  to `st_softc'; otherwise all such quirks save ST_Q_FORCE_BLKSIZE are ignored.
This commit is contained in:
pk 2000-11-02 00:52:15 +00:00
parent 8c3f6a0d10
commit 3867a66a9a
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/scsipi/st.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: st.c,v 1.125 2000/08/16 19:22:25 matt Exp $ */
/* $NetBSD: st.c,v 1.126 2000/11/02 00:52:15 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -327,7 +327,7 @@ struct st_softc {
u_int8_t asc; /* last asc code seen */
u_int8_t ascq; /* last asc code seen */
/*--------------------device/scsi parameters---------------------------------*/
struct scsipi_link *sc_link; /* our link to the adpter etc. */
struct scsipi_link *sc_link; /* our link to the adapter etc. */
/*--------------------parameters reported by the device ---------------------*/
int blkmin; /* min blk size */
int blkmax; /* max blk size */
@ -569,6 +569,7 @@ st_loadquirks(st)
mode2->density = mode->density;
st->modeflags[i] |= DENSITY_SET_BY_QUIRK;
}
mode2->quirks |= mode->quirks;
mode++;
mode2++;
}
@ -2539,8 +2540,17 @@ st_touch_tape(st)
readsize = 1;
st->flags &= ~ST_FIXEDBLOCKS;
}
if ((error = st_mode_select(st, 0)) != 0)
goto bad;
if ((error = st_mode_select(st, 0)) != 0) {
/*
* The device did not agree with the proposed
* block size. If we exhausted our options,
* return failure, else try another.
*/
if (readsize == 1)
goto bad;
st->blksize -= 512;
continue;
}
st_read(st, buf, readsize, XS_CTL_SILENT); /* XXX */
if ((error = st_rewind(st, 0, 0)) != 0) {
bad: free(buf, M_TEMP);