Deleted Added
full compact
mcd.c (56845) mcd.c (58345)
1/*
2 * Copyright 1993 by Holger Veit (data part)
3 * Copyright 1993 by Brian Moore (audio part)
4 * Changes Copyright 1993 by Gary Clark II
5 * Changes Copyright (C) 1994-1995 by Andrey A. Chernov, Moscow, Russia
6 *
7 * Rewrote probe routine to work on newer Mitsumi drives.
8 * Additional changes (C) 1994 by Jordan K. Hubbard

--- 26 unchanged lines hidden (view full) ---

35 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
36 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
37 * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
38 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
39 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
40 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
41 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
42 *
1/*
2 * Copyright 1993 by Holger Veit (data part)
3 * Copyright 1993 by Brian Moore (audio part)
4 * Changes Copyright 1993 by Gary Clark II
5 * Changes Copyright (C) 1994-1995 by Andrey A. Chernov, Moscow, Russia
6 *
7 * Rewrote probe routine to work on newer Mitsumi drives.
8 * Additional changes (C) 1994 by Jordan K. Hubbard

--- 26 unchanged lines hidden (view full) ---

35 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
36 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
37 * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
38 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
39 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
40 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
41 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
42 *
43 * $FreeBSD: head/sys/dev/mcd/mcd.c 56845 2000-01-29 16:17:36Z peter $
43 * $FreeBSD: head/sys/dev/mcd/mcd.c 58345 2000-03-20 10:44:49Z phk $
44 */
45static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
46
47#include "mcd.h"
48#include <sys/param.h>
49#include <sys/systm.h>
50#include <sys/conf.h>
51#include <sys/fcntl.h>

--- 357 unchanged lines hidden (view full) ---

409 /* if device invalidated (e.g. media change, door open), error */
410 if (!(cd->flags & MCDVALID)) {
411MCD_TRACE("strategy: drive not valid\n");
412 bp->b_error = EIO;
413 goto bad;
414 }
415
416 /* read only */
44 */
45static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
46
47#include "mcd.h"
48#include <sys/param.h>
49#include <sys/systm.h>
50#include <sys/conf.h>
51#include <sys/fcntl.h>

--- 357 unchanged lines hidden (view full) ---

409 /* if device invalidated (e.g. media change, door open), error */
410 if (!(cd->flags & MCDVALID)) {
411MCD_TRACE("strategy: drive not valid\n");
412 bp->b_error = EIO;
413 goto bad;
414 }
415
416 /* read only */
417 if (!(bp->b_flags & B_READ)) {
417 if (!(bp->b_iocmd == BIO_READ)) {
418 bp->b_error = EROFS;
419 goto bad;
420 }
421
422 /* no data to read */
423 if (bp->b_bcount == 0)
424 goto done;
425

--- 1408 unchanged lines hidden ---
418 bp->b_error = EROFS;
419 goto bad;
420 }
421
422 /* no data to read */
423 if (bp->b_bcount == 0)
424 goto done;
425

--- 1408 unchanged lines hidden ---