From 8b1448af24c81db6f63a23e735604d4a6bd6cb46 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Fri, 2 Feb 1996 21:18:02 +0000 Subject: [PATCH] Remove close tray on open - works very bad with xcdplayer --- sys/dev/mcd/mcd.c | 4 ++-- sys/i386/isa/mcd.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index cc6b1d85da9a..740139314517 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.65 1996/02/01 19:15:41 ache Exp $ + * $Id: mcd.c,v 1.66 1996/02/02 20:50:03 ache Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -334,7 +334,7 @@ int mcdopen(dev_t dev, int flags, int fmt, struct proc *p) if (!(cd->flags & MCDVALID) && cd->openflags) return ENXIO; - if (mcd_close_tray(unit) == EIO) /* detect disk change too */ + if (mcd_getstat(unit,1) == -1) return EIO; if ( (cd->status & (MCDDSKCHNG|MCDDOOROPEN)) diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index cc6b1d85da9a..740139314517 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.65 1996/02/01 19:15:41 ache Exp $ + * $Id: mcd.c,v 1.66 1996/02/02 20:50:03 ache Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -334,7 +334,7 @@ int mcdopen(dev_t dev, int flags, int fmt, struct proc *p) if (!(cd->flags & MCDVALID) && cd->openflags) return ENXIO; - if (mcd_close_tray(unit) == EIO) /* detect disk change too */ + if (mcd_getstat(unit,1) == -1) return EIO; if ( (cd->status & (MCDDSKCHNG|MCDDOOROPEN))