Deleted Added
full compact
mcd.c (112946) mcd.c (115477)
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 112946 2003-04-01 15:06:26Z phk $
43 * $FreeBSD: head/sys/dev/mcd/mcd.c 115477 2003-05-31 18:21:40Z phk $
44 */
45static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
46
47#include <sys/param.h>
48#include <sys/systm.h>
49#include <sys/kernel.h>
50#include <sys/conf.h>
51#include <sys/fcntl.h>

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

59#include <machine/resource.h>
60#include <sys/rman.h>
61
62#include <isa/isavar.h>
63
64#include <dev/mcd/mcdreg.h>
65#include <dev/mcd/mcdvar.h>
66
44 */
45static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
46
47#include <sys/param.h>
48#include <sys/systm.h>
49#include <sys/kernel.h>
50#include <sys/conf.h>
51#include <sys/fcntl.h>

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

59#include <machine/resource.h>
60#include <sys/rman.h>
61
62#include <isa/isavar.h>
63
64#include <dev/mcd/mcdreg.h>
65#include <dev/mcd/mcdvar.h>
66
67#define MCD_TRACE(format, args...) \
67#define MCD_TRACE(format, args...) \
68{ \
69 if (sc->debug) { \
70 device_printf(sc->dev, "status=0x%02x: ", \
71 sc->data.status); \
72 printf(format, ## args); \
73 } \
74}
75

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

441 if (!(sc->data.flags & MCDVALID))
442 return (ENXIO);
443 }
444
445 switch (cmd) {
446 case DIOCGMEDIASIZE:
447 *(off_t *)addr = (off_t)sc->data.disksize * sc->data.blksize;
448 return (0);
68{ \
69 if (sc->debug) { \
70 device_printf(sc->dev, "status=0x%02x: ", \
71 sc->data.status); \
72 printf(format, ## args); \
73 } \
74}
75

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

441 if (!(sc->data.flags & MCDVALID))
442 return (ENXIO);
443 }
444
445 switch (cmd) {
446 case DIOCGMEDIASIZE:
447 *(off_t *)addr = (off_t)sc->data.disksize * sc->data.blksize;
448 return (0);
449 break;
450 case DIOCGSECTORSIZE:
451 *(u_int *)addr = sc->data.blksize;
452 return (0);
449 case DIOCGSECTORSIZE:
450 *(u_int *)addr = sc->data.blksize;
451 return (0);
453 break;
454
455 case CDIOCPLAYTRACKS:
456 return mcd_playtracks(sc, (struct ioc_play_track *) addr);
457 case CDIOCPLAYBLOCKS:
458 return mcd_playblocks(sc, (struct ioc_play_blocks *) addr);
459 case CDIOCPLAYMSF:
460 return mcd_playmsf(sc, (struct ioc_play_msf *) addr);
461 case CDIOCREADSUBCHANNEL:

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

537 return (0);
538}
539
540/* check to see if a Mitsumi CD-ROM is attached to the ISA bus */
541
542int
543mcd_probe(struct mcd_softc *sc)
544{
452
453 case CDIOCPLAYTRACKS:
454 return mcd_playtracks(sc, (struct ioc_play_track *) addr);
455 case CDIOCPLAYBLOCKS:
456 return mcd_playblocks(sc, (struct ioc_play_blocks *) addr);
457 case CDIOCPLAYMSF:
458 return mcd_playmsf(sc, (struct ioc_play_msf *) addr);
459 case CDIOCREADSUBCHANNEL:

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

535 return (0);
536}
537
538/* check to see if a Mitsumi CD-ROM is attached to the ISA bus */
539
540int
541mcd_probe(struct mcd_softc *sc)
542{
545 int unit;
546 int i, j;
547 unsigned char stbytes[3];
548
543 int i, j;
544 unsigned char stbytes[3];
545
549 unit = device_get_unit(sc->dev);
550 sc->data.flags = MCDPROBING;
551
552#ifdef NOTDEF
553 /* get irq/drq configuration word */
554 sc->data.config = irqs[dev->id_irq]; /* | drqs[dev->id_drq];*/
555#else
556 sc->data.config = 0;
557#endif

--- 1060 unchanged lines hidden ---
546 sc->data.flags = MCDPROBING;
547
548#ifdef NOTDEF
549 /* get irq/drq configuration word */
550 sc->data.config = irqs[dev->id_irq]; /* | drqs[dev->id_drq];*/
551#else
552 sc->data.config = 0;
553#endif

--- 1060 unchanged lines hidden ---