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/ch.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/ch.c')
-rw-r--r-- | sys/scsi/ch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index ceec9d2..315dab9 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -2,7 +2,7 @@ * Written by grefen@????? * Based on scsi drivers by Julian Elischer (julian@tfs.com) * - * $Id: ch.c,v 1.6 1993/11/25 01:37:31 wollman Exp $ + * $Id: ch.c,v 1.7 1993/12/19 00:54:49 wollman Exp $ */ #include <sys/types.h> @@ -148,7 +148,7 @@ chopen(dev) */ if (ch_data[unit].flags & CH_OPEN) { printf("ch%d: already open\n", unit); - return ENXIO; + return EBUSY; } /* * Make sure the device has been initialised |