diff options
| author | rgrimes <rgrimes@FreeBSD.org> | 1994-01-29 10:30:41 +0000 |
|---|---|---|
| committer | rgrimes <rgrimes@FreeBSD.org> | 1994-01-29 10:30:41 +0000 |
| commit | a3e76b107d028854c76e23751c764a554a0cceac (patch) | |
| tree | d86ec8739b84cc647c8c5bd6e85c4a14d66c646a /sys/scsi/st.c | |
| parent | f0a631d52235cfabec2ccc253ed0cbeae0e78571 (diff) | |
| download | FreeBSD-src-a3e76b107d028854c76e23751c764a554a0cceac.zip FreeBSD-src-a3e76b107d028854c76e23751c764a554a0cceac.tar.gz | |
Patch from Julian. Commit message by me.
cd.c:
Initialize channel info in CDIOCSETVOL ioctl.
Correct CDIOCSTOP and CDIOCEJCET ioctls to use scsi_stop_unit
instead of scsi_start_unit.
Add CDIOCALLOW and CDIOCPREVENT ioctls.
ch.h:
Return EBUSY instead of ENXIO if the device is already in use.
scsi_base.c:
Add scsi_stop_unit routine.
sd.c:
Add mising indirection through sc_link to sd_get_parms routine
when checking for media loaded.
st.c:
Return EBUSY instead of ENXIO if the device is already in use.
Clear the SDEV_WAITING flag in ststart if we do the wakeup call.
Diffstat (limited to 'sys/scsi/st.c')
| -rw-r--r-- | sys/scsi/st.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 686337a..871614d 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -21,13 +21,13 @@ * 16 Feb 93 Julian Elischer ADDED for SCSI system * 1.15 is the last version to support MACH and OSF/1 */ -/* $Revision: 1.13 $ */ +/* $Revision: 1.14 $ */ /* * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * major changes by Julian Elischer (julian@jules.dialix.oz.au) May 1993 * - * $Id: st.c,v 1.13 1993/11/18 05:03:05 rgrimes Exp $ + * $Id: st.c,v 1.14 1993/12/19 00:54:59 wollman Exp $ */ /* @@ -485,7 +485,7 @@ stopen(dev, flags) * Only allow one at a time */ if (st->flags & ST_OPEN) { - return (ENXIO); + return (EBUSY); } /* * Throw out a dummy instruction to catch 'Unit attention @@ -975,6 +975,7 @@ ststart(unit) /* if a special awaits, let it proceed first */ if (sc_link->flags & SDEV_WAITING) { + sc_link->flags &= ~SDEV_WAITING; wakeup((caddr_t)sc_link); return; } |
