diff options
| author | Søren Schmidt <sos@FreeBSD.org> | 2003-10-12 13:11:57 +0000 |
|---|---|---|
| committer | Søren Schmidt <sos@FreeBSD.org> | 2003-10-12 13:11:57 +0000 |
| commit | ffd08d59ae2d99035a6703f22fd1869b33cb6e13 (patch) | |
| tree | 4227cee61114105ce801cf869b78ac095658e34b /sys/dev | |
| parent | 15749e8d06c72c9817ff0d3313e0c52a4a7c325b (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 3b4f26e281db6..6a8210cd6f464 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -94,7 +94,7 @@ static int acd_send_cue(struct acd_softc *, struct cdr_cuesheet *); static int acd_report_key(struct acd_softc *, struct dvd_authinfo *); static int acd_send_key(struct acd_softc *, struct dvd_authinfo *); static int acd_read_structure(struct acd_softc *, struct dvd_struct *); -static int acd_eject(struct acd_softc *, int); +static int acd_tray(struct acd_softc *, int); static int acd_blank(struct acd_softc *, int); static int acd_prevent_allow(struct acd_softc *, int); static int acd_start_stop(struct acd_softc *, int); @@ -651,13 +651,13 @@ acd_ioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td) error = EBUSY; break; } - error = acd_eject(cdp, 0); + error = acd_tray(cdp, 0); break; case CDIOCCLOSE: if (count_dev(dev) > 1) break; - error = acd_eject(cdp, 1); + error = acd_tray(cdp, 1); break; case CDIOREADTOCHEADER: @@ -1879,28 +1879,27 @@ acd_read_structure(struct acd_softc *cdp, struct dvd_struct *s) } static int -acd_eject(struct acd_softc *cdp, int close) +acd_tray(struct acd_softc *cdp, int close) { - int error; + int error = ENODEV; - if ((error = acd_start_stop(cdp, 0)) == EBUSY) { - if (!close) - return 0; - if ((error = acd_start_stop(cdp, 3))) - return error; - acd_read_toc(cdp); - acd_prevent_allow(cdp, 1); - cdp->flags |= F_LOCKED; - return 0; + if (cdp->cap.mechanism & MST_EJECT) { + if (close) { + if (!(error = acd_start_stop(cdp, 3))) { + acd_read_toc(cdp); + acd_prevent_allow(cdp, 1); + cdp->flags |= F_LOCKED; + } + } + else { + acd_start_stop(cdp, 0); + acd_prevent_allow(cdp, 0); + cdp->flags &= ~F_LOCKED; + cdp->device->flags |= ATA_D_MEDIA_CHANGED; + error = acd_start_stop(cdp, 2); + } } - if (error) - return error; - if (close) - return 0; - acd_prevent_allow(cdp, 0); - cdp->flags &= ~F_LOCKED; - cdp->device->flags |= ATA_D_MEDIA_CHANGED; - return acd_start_stop(cdp, 2); + return error; } static int |