Deleted Added
full compact
mcd.c (13438) mcd.c (13598)
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 * $Id: mcd.c,v 1.57 1995/12/22 15:52:07 phk Exp $
43 * $Id: mcd.c,v 1.58 1996/01/15 10:28:29 phk Exp $
44 */
45static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
46
47#include "mcd.h"
48#if NMCD > 0
49#include <sys/types.h>
50#include <sys/param.h>
51#include <sys/systm.h>

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

57#include <sys/uio.h>
58#include <sys/ioctl.h>
59#include <sys/cdio.h>
60#include <sys/errno.h>
61#include <sys/dkbad.h>
62#include <sys/disklabel.h>
63#include <sys/devconf.h>
64#include <sys/kernel.h>
44 */
45static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
46
47#include "mcd.h"
48#if NMCD > 0
49#include <sys/types.h>
50#include <sys/param.h>
51#include <sys/systm.h>

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

57#include <sys/uio.h>
58#include <sys/ioctl.h>
59#include <sys/cdio.h>
60#include <sys/errno.h>
61#include <sys/dkbad.h>
62#include <sys/disklabel.h>
63#include <sys/devconf.h>
64#include <sys/kernel.h>
65#include <machine/cpu.h>
65#ifdef DEVFS
66#include <sys/devfsext.h>
67#endif /*DEVFS*/
68
69#include <machine/clock.h>
70
71#include <i386/i386/cons.h>
72

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

737twiddle_thumbs(int port, int unit, int count, char *whine)
738{
739 int i;
740
741 for (i = 0; i < count; i++) {
742 if (!(inb(port+MCD_FLAGS) & MFL_STATUS_NOT_AVAIL))
743 return 1;
744 }
66#ifdef DEVFS
67#include <sys/devfsext.h>
68#endif /*DEVFS*/
69
70#include <machine/clock.h>
71
72#include <i386/i386/cons.h>
73

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

738twiddle_thumbs(int port, int unit, int count, char *whine)
739{
740 int i;
741
742 for (i = 0; i < count; i++) {
743 if (!(inb(port+MCD_FLAGS) & MFL_STATUS_NOT_AVAIL))
744 return 1;
745 }
745 printf("mcd%d: timeout %s\n", unit, whine);
746 if (bootverbose)
747 printf("mcd%d: timeout %s\n", unit, whine);
746 return 0;
747}
748
749/* check to see if a Mitsumi CD-ROM is attached to the ISA bus */
750
751int
752mcd_probe(struct isa_device *dev)
753{

--- 968 unchanged lines hidden ---
748 return 0;
749}
750
751/* check to see if a Mitsumi CD-ROM is attached to the ISA bus */
752
753int
754mcd_probe(struct isa_device *dev)
755{

--- 968 unchanged lines hidden ---