This is the new submission of the matcd driver. In addition to the

new driver code, there are diffs to several other existing files
on the system and a man page.

This version of matcd implements the rest of the key ioctls related to
playing audio CDs and reading table of contents information from any
type of disc.

This update also corrects several problems detected since the original
version 1(10) was released.  These include:
1.	Jordons report on the kernel -c string problem.
2.	A problem with the driver being confused by other types of
	devices located at addresses it probes.
3.	An old CD TOC wouldn't always be cleared after a disc change.
4.	Cleaned up code so -Wall yields no warnings on 2.0 and later.
5.	A problem with drive getting out of sync with the driver when
	changing between CD-Data and CD-DA.

There have only been two reports from the field relating to problems
so either the first release isn't really being used or doesn't have
many problems.

If there are any problems with this submission, please let me know.

Submitted by:	Frank Durda IV <uhclem%nemesis@fw.ast.com>

6 files changed, 3724 insertions, 0 deletions

diff --git a/sys/i386/isa/matcd/TODO b/sys/i386/isa/matcd/TODO
new file mode 100644
index 0000000..62035fc
--- /dev/null
+++ b/sys/i386/isa/matcd/TODO
@@ -0,0 +1,50 @@
+Things to do for the matcd driver			6-Apr-95
+
+1.	Just as I was finishing Edit 16, I discovered that there
+	may be a way to cause a drive to go "offline", allowing the host
+	to send a command to one or more other drives on the same
+	interface, similar to the SCSI disconnect mechanism.  The changes
+	to the driver to take advantage of this aren't huge, but will have
+	to wait until after 2.1.  Too much risk of breaking something.
+	Unless you have multiple drives, you won't see a difference.
+
+2.	Someone wants to switch all drivers from disklabel and
+	its assorted mechanisms over to disk slicing and its mechanisms,
+	but I was unable to find any useful documentation on how to 
+	implement the changes for a read-only, single-partition,
+	removable (ie, partition can change size) device.
+	So this will have to wait until after 2.1.
+
+3.	Support for reading R-W subcodes while playing audio.  This would be
+	useful if you have any CD+G or CD+MIDI discs, but the demand for this
+	is pretty low, unless you like Karaoke.  Someone will also have to
+	write a CD+G viewer for X.  The code for the driver to add this is
+	pretty minor but there aren't any precedents on how to handle the
+	data transfer to the application.
+
+4.	Support for reading the ISBN and UPC labels.   The ioctl structures
+	for these appear to be defined but no other driver seems to do this.
+
+5.	Multi-session support.  There are two forms of this; what
+	Philips defined and what Kodak uses.  This will be quite
+	complicated and will probably require changes in the filesystem
+	layer.   The drive support for Kodak multi-session is known to work.
+
+6.	Multiple data tracks.  My vision here was to add an ioctl
+	that caused a track offset to be inserted into block requests,
+	effectively shifting the base to the specified track.  Very
+	easy to add but not a big deal since I have only two discs
+	in my collection that have multiple data tracks and I mastered
+	one of them.
+
+7.	A curses-based CD-Player app (ie, not X).  I will probably do this
+	mainly for its value as a debugging tool.  It was pretty annoying
+	not finding a single application that actually issued all the
+	defined ioctls, let alone any new ones.
+
+If you feel the urge to work on one or more of these remaining items,
+please contact the author first at    bsdmail@nemesis.lonestar.org
+to make sure the work hasn't already been done or started.
+
+					Frank Durda IV
+
diff --git a/sys/i386/isa/matcd/audio.c b/sys/i386/isa/matcd/audio.c
new file mode 100644
index 0000000..837689a
--- /dev/null
+++ b/sys/i386/isa/matcd/audio.c
@@ -0,0 +1,514 @@
+/*audio.c--------------------------------------------------------------------
+
+	Matsushita(Panasonic) / Creative CD-ROM Driver	(matcd)
+	Authored by Frank Durda IV
+
+	Copyright 1994, 1995  Frank Durda IV.  All rights reserved.
+	"FDIV" is a trademark of Frank Durda IV.
+
+
+	Redistribution and use in source and binary forms, with or
+	without modification, are permitted provided that the following
+	conditions are met:
+	1.  Redistributions of source code must retain the above copyright
+	    notice positioned at the very beginning of this file without
+	    modification, all copyright strings, all related programming
+	    codes that display the copyright strings, this list of
+	    conditions and the following disclaimer.
+	2.  Redistributions in binary form must contain all copyright strings
+	    and related programming code that display the copyright strings.
+	3.  Redistributions in binary form must reproduce the above copyright
+	    notice, this list of conditions and the following disclaimer in
+	    the documentation and/or other materials provided with the
+	    distribution.
+	4.  All advertising materials mentioning features or use of this
+	    software must display the following acknowledgement:
+		"The Matsushita/Panasonic CD-ROM driver  was developed
+		 by Frank Durda IV for use with "FreeBSD" and similar
+		 operating systems."
+	    "Similar operating systems" includes mainly non-profit oriented
+	    systems for research and education, including but not restricted
+	    to "NetBSD", "386BSD", and "Mach" (by CMU).  The wording of the
+	    acknowledgement (in electronic form or printed text) may not be
+	    changed without permission from the author.
+	5.  Absolutely no warranty of function, fitness or purpose is made
+	    by the author Frank Durda IV.
+	6.  Neither the name of the author nor the name "FreeBSD" may
+	    be used to endorse or promote products derived from this software
+	    without specific prior written permission.
+	    (The author can be reached at   bsdmail@nemesis.lonestar.org)
+	7.  The product containing this software must meet all of these
+	    conditions even if it is unsupported, not a complete system
+	    and/or does not contain compiled code.
+	8.  These conditions will be in force for the full life of the
+	    copyright.  
+	9.  If all the above conditions are met, modifications to other
+	    parts of this file may be freely made, although any person
+	    or persons making changes do not receive the right to add their
+	    name or names to the copyright strings and notices in this
+	    software.  Persons making changes are encouraged to insert edit
+	    history in matcd.c and to put your name and details of the
+	    change there.  
+	10. You must have prior written permission from the author to
+	    deviate from these terms.
+
+	Vendors who produce product(s) containing this code are encouraged 
+	(but not required) to provide copies of the finished product(s) to
+	the author and to correspond with the author about development
+	activity relating to this code.   Donations of development hardware
+	and/or software are also welcome.  (This is one of the faster ways
+	to get a driver developed for a device.)
+
+ 	THIS SOFTWARE IS PROVIDED BY THE DEVELOPER(S) ``AS IS'' AND ANY
+ 	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ 	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ 	PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE DEVELOPER(S) BE
+ 	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ 	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ 	OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ 	OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ 	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ 	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+-----No changes are allowed above this line------------------------------------
+
+	The following functions are related to the audio playback
+	capabilities of the drive.   They can be omitted from the
+	finished driver using the FULLDRIVER conditional.
+
+	The full set of features the drive is capable of are currently
+	not implemented but will be added in upcoming releases.
+-----------------------------------------------------------------------------*/
+/*-----------------------------------------------------------------------------
+	matcd_playtracks - Plays one or more audio tracks
+-----------------------------------------------------------------------------*/
+
+static int matcd_playtracks(int ldrive, int cdrive, int controller,
+			    struct ioc_play_track *pt)
+{
+	struct	matcd_data *cd;
+	int	start,end;
+	int	i,port;
+	unsigned char cmd[MAXCMDSIZ];
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;
+
+	if ((cd->flags & MATCDLABEL)==0)
+		return(EIO);		/*Refuse after chg error*/
+
+	start=pt->start_track;
+	end=pt->end_track;
+
+	if (start < 1 ||		/*Starting track valid?*/
+	    end < 1 ||			/*Ending track valid?*/
+	    start > end || 		/*Start higher than end?*/
+	    end > cd->volinfo.trk_high)	/*End track higher than disc size?*/
+		return(ESPIPE);		/*Track out of range*/
+
+	lockbus(controller, ldrive);	/*<16>Request bus*/
+	i=matcd_setmode(ldrive, MODE_DA);/*Force drive into audio mode*/
+	unlockbus(controller, ldrive);	/*<16>Release bus*/
+	if (i!=0) {
+		return(i);		/*Not legal for this media?*/
+	}
+	zero_cmd(cmd);
+	cmd[0]=PLAYTRKS;		/*Play Audio Track/Index*/
+	cmd[1]=start;
+	cmd[2]=pt->start_index;
+	cmd[3]=end;
+	cmd[4]=pt->end_index;
+	i=docmd(cmd,ldrive,cdrive,controller,port);	/*Issue command*/
+#ifdef DEBUGIOCTL
+	printf("matcd%d: Play track results %d \n",ldrive,i);
+#endif /*DEBUGIOCTL*/
+	if (i==0) cd->status=CD_AS_PLAY_IN_PROGRESS;	/*<14>*/
+	return(i);
+}
+
+
+/*-----------------------------------------------------------------------------
+	matcd_playmsf - Plays between a range of blocks
+-----------------------------------------------------------------------------*/
+
+static int matcd_playmsf(int ldrive, int cdrive, int controller,
+			    struct ioc_play_msf *pt)
+{
+	struct matcd_data *cd;
+	int	i,port;
+	unsigned char cmd[MAXCMDSIZ];
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;
+
+#ifdef DEBUGIOCTL
+	printf("matcd%d: playmsf %2x %2x %2x -> %2x %2x %2x\n",
+	       ldrive,pt->start_m, pt->start_s, pt->start_f, pt->end_m,
+	       pt->end_s,pt->end_f);
+#endif /*DEBUGIOCTL*/
+
+	if ((cd->flags & MATCDLABEL)==0)
+		return(EIO);		/*Refuse after chg error*/
+
+	if ((cd->volinfo.vol_msf[0]==0 &&
+	     cd->volinfo.vol_msf[1]<2) ||	/*Must be after 0'1"75F*/
+	     msf_to_blk((char *)&pt->start_m) >
+	     msf_to_blk((char *)&cd->volinfo.vol_msf)) {
+#ifdef DEBUGIOCTL
+	printf("matcd%d: Invalid block combination\n",ldrive);
+#endif /*DEBUGIOCTL*/
+		return(ESPIPE);		/*Track out of range*/
+	}
+
+
+	lockbus(controller, ldrive);	/*<16>Request bus*/
+	i=matcd_setmode(ldrive, MODE_DA);/*Force drive into audio mode*/
+	unlockbus(controller, ldrive);	/*<16>Release bus*/
+	if (i!=0) {
+		return(i);		/*Not legal for this media?*/
+	}
+	zero_cmd(cmd);
+	cmd[0]=PLAYBLOCKS;		/*Play Audio Blocks*/
+	cmd[1]=pt->start_m;
+	cmd[2]=pt->start_s;
+	cmd[3]=pt->start_f;
+	cmd[4]=pt->end_m;
+	cmd[5]=pt->end_s;
+	cmd[6]=pt->end_f;
+	i=docmd(cmd,ldrive,cdrive,controller,port);	/*Issue command*/
+	if (i==0) cd->status=CD_AS_PLAY_IN_PROGRESS;	/*<14>*/
+	return(i);
+}
+
+
+/*-----------------------------------------------------------------------------
+	matcd_pause - Pause or Resume audio playback
+-----------------------------------------------------------------------------*/
+
+static int matcd_pause(int ldrive, int cdrive, int controller, int action)
+{
+	struct	matcd_data *cd;
+	int	i,z,port;
+	unsigned char cmd[MAXCMDSIZ];
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;
+
+	if ((cd->flags & MATCDLABEL)==0)
+		return(EIO);		/*Refuse after chg error*/
+
+	zero_cmd(cmd);
+	cmd[0]=NOP;			/*<14>Just find out whats going on*/
+
+	lockbus(controller, ldrive);	/*<16>Request bus*/
+	matcd_slowcmd(port,ldrive,cdrive,cmd);	/*<14>*/
+	i=waitforit(10*TICKRES,DTEN,port,"sense");	/*<14>*/
+	z=get_stat(port,ldrive);	/*<14>Read status byte*/
+	if ((z & MATCD_ST_ERROR)) {	/*<14>Something went wrong*/
+		i=get_error(port, ldrive, cdrive);	/*<14>*/
+		unlockbus(controller, ldrive);	/*<16>Release bus*/
+		return(EIO);		/*<14>*/
+	}				/*<14>*/
+	unlockbus(controller, ldrive);	/*<16>Release bus*/
+
+	if (z & MATCD_ST_AUDIOBSY==0 &&	/*<14>If drive is idle*/
+	    cd->status==CD_AS_PLAY_IN_PROGRESS) {	/*<14>but was playing*/
+		cd->status=CD_AS_PLAY_COMPLETED;	/*<14>then its done*/
+		return(0);
+	}
+
+	if (action) {			/*<14>Set state for subq ioctl*/
+#ifndef KRYTEN
+		if (cd->status==CD_AS_PLAY_IN_PROGRESS) {/*<14>Don't resume*/
+			return(0);	/*<14>if already playing*/
+		}			/*<14>Max Headroom sound occurs*/
+#endif /*KRYTEN*/
+		cd->status=CD_AS_PLAY_IN_PROGRESS;	/*<14>to read*/
+	} else {			/*<14>There is no way to ask the*/
+		cd->status=CD_AS_PLAY_PAUSED;/*<14>drive if it is paused*/
+	}				/*<14>*/
+
+	cmd[0]=PAUSE;			/*Pause or Resume playing audio*/
+	cmd[1]=action;
+	i=docmd(cmd,ldrive,cdrive,controller,port);	/*Issue command*/
+#ifdef DEBUGIOCTL
+	printf("matcd%d: Pause / Resume results %d \n",ldrive,i);
+#endif /*DEBUGIOCTL*/
+	return(i);
+}
+
+
+
+/*-----------------------------------------------------------------------------
+	matcd_stop  - Stop audio playback
+-----------------------------------------------------------------------------*/
+
+static int matcd_stop(int ldrive, int cdrive, int controller)
+{
+	struct	matcd_data *cd;
+	int	i,port;
+	unsigned char cmd[MAXCMDSIZ];
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;
+
+	if ((cd->flags & MATCDLABEL)==0)
+		return(EIO);		/*Refuse after chg error*/
+
+	zero_cmd(cmd);
+	cmd[0]=ABORT;			/*Abort playing audio*/
+	i=docmd(cmd,ldrive,cdrive,controller,port);	/*Issue command*/
+#ifdef DEBUGIOCTL
+	printf("matcd%d: Abort results %d \n",ldrive,i);
+#endif /*DEBUGIOCTL*/
+	cd->status=CD_AS_PLAY_COMPLETED;/*<14>the drive if it is paused*/
+	return(i);
+}
+
+
+/*-----------------------------------------------------------------------------
+	matcd_level - Read or set the audio levels
+<12>	New for Edit 12
+-----------------------------------------------------------------------------*/
+
+static int matcd_level(int ldrive, int cdrive, int controller,
+		       struct ioc_vol * level, int action)
+{
+	struct	matcd_data *cd;
+	int	i,z,port;
+	unsigned char c;
+	unsigned char cmd[MAXCMDSIZ];
+	unsigned char data[5];
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;
+
+	zero_cmd(cmd);
+	if (action==CDIOCSETVOL) {	/*We are setting new volume settings*/
+
+/*	Here we set the volume levels.  Note that the same command
+	also sets the patching (routing) of audio, so we have to rely
+	on previously-stored settings to fill in these fields.
+*/
+		cmd[0]=MODESELECT;	/*Write drive settings*/
+		cmd[1]=AUDIOPARM;	/*Audio/routing settings*/
+
+/*	Although the drive allows a left and right channel volume to be
+	specified separately, the drive refuses the settings if the
+	values are different.
+*/
+		c=level->vol[0] | level->vol[1];	/*Or them together*/
+
+		cmd[4]=cd->volume[0]=c;	/*Channel 0 (Left) volume*/
+		cmd[6]=cd->volume[1]=c;	/*Channel 1 (Right) volume*/
+		cmd[3]=cd->patch[0];	/*Channel 0 (Left)  patching*/
+		cmd[5]=cd->patch[1];	/*Channel 1 (Right)  patching*/
+		i=docmd(cmd,ldrive,cdrive,controller,port);/*Issue cmd*/
+#ifdef DEBUGIOCTL
+		printf("matcd%d: Volume set %d\n",ldrive,i);
+#endif /*DEBUGIOCTL*/
+		return(i);
+	} else {			/*Read existing settings*/
+
+
+/*	This code reads the settings for the drive back - note that
+	volume and patching are both returned so we have to keep
+	both internally.
+*/
+		cmd[0]=MODESENSE;	/*Read drive settings*/
+		cmd[1]=AUDIOPARM;	/*Audio/routing settings*/
+		lockbus(controller, ldrive);	/*<16>Request bus*/
+		matcd_slowcmd(port,ldrive,cdrive,cmd);
+		i=waitforit(10*TICKRES,DTEN,port,"sense");
+		matcd_pread(port, 5, data);	/*Read data returned*/
+		z=get_stat(port,ldrive);/*Read status byte*/
+		unlockbus(controller, ldrive);	/*<16>Release bus*/
+#ifdef DEBUGIOCTL
+		printf("matcd%d: Data got was %x %x %x %x %x   ",ldrive,
+		       data[0],data[1],data[2], data[3],data[4]);
+		printf("status byte %x\n",z);
+#endif	/*DEBUGIOCTL*/
+		cd->volume[0]=level->vol[0]=	/*Channel 0 (Left) volume*/
+			      data[2];
+		cd->volume[1]=level->vol[1]=	/*Channel 1 (Right) volume*/
+			      data[4];
+		level->vol[2]=level->vol[3]=0;	/*Channel 2 & 3 not avail*/
+
+		cd->patch[0]=data[1];	/*Channel 0 (Left) patching*/
+		cd->patch[1]=data[3];	/*Channel 1 (Right) patching*/
+
+		return(0);
+	}
+
+}
+
+
+/*-----------------------------------------------------------------------------
+	matcd_routing - Set the audio routing (patching)
+<12>	New for Edit 12
+-----------------------------------------------------------------------------*/
+
+static int matcd_route(int ldrive, int cdrive, int controller,
+		       int command)
+{
+	struct	matcd_data *cd;
+	int	i,port;
+	unsigned char l,r;
+	unsigned char cmd[MAXCMDSIZ];
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;
+
+	zero_cmd(cmd);
+	switch (command) {
+	case	CDIOCSETMUTE:
+		l=r=0;
+		break;
+
+	case	CDIOCSETLEFT:
+		l=r=OUTLEFT;
+		break;
+
+	case	CDIOCSETRIGHT:
+		l=r=OUTRIGHT;
+		break;
+
+	default:
+	case	CDIOCSETSTEREO:
+		l=OUTLEFT;
+		r=OUTRIGHT;
+		break;
+	}
+
+/*	Here we set the volume levels.  Note that the same command
+	also sets the patching (routing) of audio, so we have to rely
+	on previously-stored settings to fill in these fields.
+*/
+	cmd[0]=MODESELECT;		/*Write drive settings*/
+	cmd[1]=AUDIOPARM;		/*Audio/routing settings*/
+
+
+/*	Although the drive allows a left and right channel volume to be
+	specified separately, the drive refuses the settings if the
+	values are different.
+*/
+	cmd[4]=cd->volume[0];		/*Channel 0 (Left) volume*/
+	cmd[6]=cd->volume[1];		/*Channel 1 (Right) volume*/
+	cmd[3]=cd->patch[0]=l;		/*Channel 0 (Left)  patching*/
+	cmd[5]=cd->patch[1]=r;		/*Channel 1 (Right)  patching*/
+	i=docmd(cmd,ldrive,cdrive,controller,port);/*Issue cmd*/
+#ifdef DEBUGIOCTL
+	printf("matcd%d: Routing set %d\n",ldrive,i);
+#endif /*DEBUGIOCTL*/
+	return(i);
+
+}
+
+
+/*-----------------------------------------------------------------------------
+	matcd_patch - Set the audio routing (patching)
+<12>	New for Edit 12
+-----------------------------------------------------------------------------*/
+
+static int matcd_patch(int ldrive, int cdrive, int controller,
+		       struct ioc_patch * routing)
+{
+	struct	matcd_data *cd;
+	int	i,port;
+	unsigned char cmd[MAXCMDSIZ];
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;
+
+	zero_cmd(cmd);
+
+/*	Here we set the volume levels.  Note that the same command
+	also sets the patching (routing) of audio, so we have to rely
+	on previously-stored settings to fill in these fields.
+*/
+	cmd[0]=MODESELECT;		/*Write drive settings*/
+	cmd[1]=AUDIOPARM;		/*Audio/routing settings*/
+
+
+/*	Although the drive allows a left and right channel volume to be
+	specified separately, the drive refuses the settings if the
+	values are different.
+*/
+	cmd[4]=cd->volume[0];		/*Channel 0 (Left) volume*/
+	cmd[6]=cd->volume[1];		/*Channel 1 (Right) volume*/
+	cmd[3]=cd->patch[0]=		/*Channel 0 (Left)  patching*/
+	       (routing->patch[0] & 0x03);
+	cmd[5]=cd->patch[1]=		/*Channel 1 (Right)  patching*/
+	       (routing->patch[1] & 0x03);
+	i=docmd(cmd,ldrive,cdrive,controller,port);/*Issue cmd*/
+#ifdef DEBUGIOCTL
+	printf("matcd%d: Routing set %d\n",ldrive,i);
+#endif /*DEBUGIOCTL*/
+	return(i);
+
+}
+
+/*-----------------------------------------------------------------------------
+	matcd_pitch - Change audio playback rate
+		      Apart from making things sound funny, the only
+		      other application might be Karaoke.  Ugh.
+<12>	New for Edit 12
+-----------------------------------------------------------------------------*/
+
+static int matcd_pitch(int ldrive, int cdrive, int controller,
+		       struct ioc_pitch * speed)
+{
+	struct	matcd_data *cd;
+	short	i;
+	int	z,port;
+	unsigned char cmd[MAXCMDSIZ];
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;
+
+	zero_cmd(cmd);
+
+/*	This function sets the audio playback rate.  In SCSI devices this is
+	referred to as the logical block addresses per second parameter.
+	Uh huh.  Sounds like they didn't want anyone to find it.
+	Anyway, a study found that no one else has implemented this ioctl
+	but the capability does exist in the SCSI standard so I am following
+	the SCSI scheme even though it really doesn't fit this drive well.
+
+	I define the parameter to this ioctl as -32767 to -1 being
+	"play slower", 0x0000 flat and 1 to 32767 being "play faster"
+	within the scale allowed by the device.  The value is scaled to fit
+	the allowed by the device and any excess is treated as being
+	the positive or negative limit.  No ioctl input value is considered 
+	invalid.
+
+	This device has a +/- 13% playback pitch specified by a range
+	-130 to +130.  The drive does a hard enforcement on this.
+
+	SCSI defines a 16 bit LBAS count, and a "multiplier" that
+	is either x1 or x(1/256).  The Matsushita drive only provides
+	10 bits total for indicating pitch so the LSbits are discarded.
+*/
+
+	cmd[0]=MODESELECT;		/*Write drive settings*/
+	cmd[1]=SPEEDPARM;		/*Audio speed settings*/
+
+	i=speed->speed>>7;		/*Scale down to our usable range*/
+
+	if (i!=0) {			/*Real pitch value*/
+		if (i < -130) i=-130;	/*Force into range we support*/
+		else if (i > 130) i=130;
+		cmd[3]=((i>>8)&0x03) | 0x04;	/*Get upper bits*/
+		cmd[4]=(i & 0xff);	/*Set lower bits*/
+	}
+	z=docmd(cmd,ldrive,cdrive,controller,port);/*Issue cmd*/
+#ifdef DEBUGIOCTL
+	printf("matcd%d: Pitch set %d\n",ldrive,i);
+#endif /*DEBUGIOCTL*/
+	return(z);
+}
+
+/*End of audio.c*/
+
diff --git a/sys/i386/isa/matcd/creative.h b/sys/i386/isa/matcd/creative.h
new file mode 100644
index 0000000..152128c
--- /dev/null
+++ b/sys/i386/isa/matcd/creative.h
@@ -0,0 +1,134 @@
+/*creative.h-------------------------------------------------------------------
+
+	Matsushita(Panasonic) / Creative CD-ROM Driver	(matcd)
+	Authored by Frank Durda IV
+
+	Copyright 1994, 1995  Frank Durda IV.  All rights reserved.
+	"FDIV" is a trademark of Frank Durda IV.
+
+
+	Redistribution and use in source and binary forms, with or
+	without modification, are permitted provided that the following
+	conditions are met:
+	1.  Redistributions of source code must retain the above copyright
+	    notice positioned at the very beginning of this file without
+	    modification, all copyright strings, all related programming
+	    codes that display the copyright strings, this list of
+	    conditions and the following disclaimer.
+	2.  Redistributions in binary form must contain all copyright strings
+	    and related programming code that display the copyright strings.
+	3.  Redistributions in binary form must reproduce the above copyright
+	    notice, this list of conditions and the following disclaimer in
+	    the documentation and/or other materials provided with the
+	    distribution.
+	4.  All advertising materials mentioning features or use of this
+	    software must display the following acknowledgement:
+		"The Matsushita/Panasonic CD-ROM driver  was developed
+		 by Frank Durda IV for use with "FreeBSD" and similar
+		 operating systems."
+	    "Similar operating systems" includes mainly non-profit oriented
+	    systems for research and education, including but not restricted
+	    to "NetBSD", "386BSD", and "Mach" (by CMU).  The wording of the
+	    acknowledgement (in electronic form or printed text) may not be
+	    changed without permission from the author.
+	5.  Absolutely no warranty of function, fitness or purpose is made
+	    by the author Frank Durda IV.
+	6.  Neither the name of the author nor the name "FreeBSD" may
+	    be used to endorse or promote products derived from this software
+	    without specific prior written permission.
+	    (The author can be reached at   bsdmail@nemesis.lonestar.org)
+	7.  The product containing this software must meet all of these
+	    conditions even if it is unsupported, not a complete system
+	    and/or does not contain compiled code.
+	8.  These conditions will be in force for the full life of the
+	    copyright.  
+	9.  If all the above conditions are met, modifications to other
+	    parts of this file may be freely made, although any person
+	    or persons making changes do not receive the right to add their
+	    name or names to the copyright strings and notices in this
+	    software.  Persons making changes are encouraged to insert edit
+	    history in matcd.c and to put your name and details of the
+	    change there.  
+	10. You must have prior written permission from the author to
+	    deviate from these terms.
+
+	Vendors who produce product(s) containing this code are encouraged 
+	(but not required) to provide copies of the finished product(s) to
+	the author and to correspond with the author about development
+	activity relating to this code.   Donations of development hardware
+	and/or software are also welcome.  (This is one of the faster ways
+	to get a driver developed for a device.)
+
+ 	THIS SOFTWARE IS PROVIDED BY THE DEVELOPER(S) ``AS IS'' AND ANY
+ 	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ 	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ 	PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE DEVELOPER(S) BE
+ 	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ 	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ 	OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ 	OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ 	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ 	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+-----No changes are allowed above this line------------------------------------
+
+See matcd.c for Edit History
+
+	These are the I/O port mapping offsets and bit assignments used
+	by Creative Labs in their implementation of the host interface for
+	the Matsushita CD-ROM drive.  These may be different in the adapter
+	cards (including sound cards) made by other vendors.
+	It is unknown if the Creative interface is based on a reference design
+	provided by Matsushita (other interface vendors would similar or
+	identical if this was the case).
+
+	The drive is actually capable of some things that the Creative
+	interface doesn't implement, such as DMA and interrupts.
+
+	See matcd.h for defines related to the Matsushita drive itself.
+*/
+	
+
+/*	Creative Labs (and compatible) I/O port mapping offsets
+*/
+
+#define NUMPORTS	4		/*Four ports are decoded by the i/f*/
+
+#define	CMD		0		/*Write - commands*/
+#define	DATA		0		/*Read - data/status from drive*/
+#define	PHASE		1		/*Write - switch between data/status*/
+#define STATUS		1		/*Read - bus status*/
+#define RESET		2		/*Write - reset all attached drives*/
+					/*Any value written will reset*/
+#define SELECT		3		/*Write - drive select*/
+
+
+/*	Creative PHASE port bit assignments
+*/
+
+#define	PHASENA		1		/*Access data bytes instead of status*/
+
+
+/*	Creative STATUS port register bits
+*/
+
+#define	DTEN		2		/*When low, in data xfer phase*/
+#define STEN		4		/*When low, in status phase*/
+#define TEST		1		/*Function is unknown*/
+
+
+/*	Creative drive SELECT port bit assignments
+	Note that in the Creative interface, DS0==Bit 1 and
+	DS1==Bit 0   (DS is Drive Select).
+*/
+
+#define CRDRIVE0	0x00
+#define CRDRIVE1	0x02
+#define CRDRIVE2	0x01
+#define CRDRIVE3	0x03
+
+/*End of creative.h*/
+
+
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
new file mode 100644
index 0000000..e2d642c
--- /dev/null
+++ b/sys/i386/isa/matcd/matcd.c
@@ -0,0 +1,2557 @@
+/*matcd.c--------------------------------------------------------------------
+
+	Matsushita(Panasonic) / Creative CD-ROM Driver	(matcd)
+	Authored by Frank Durda IV
+
+	Copyright 1994, 1995  Frank Durda IV.  All rights reserved.
+	"FDIV" is a trademark of Frank Durda IV.
+
+
+	Redistribution and use in source and binary forms, with or
+	without modification, are permitted provided that the following
+	conditions are met:
+	1.  Redistributions of source code must retain the above copyright
+	    notice positioned at the very beginning of this file without
+	    modification, all copyright strings, all related programming
+	    codes that display the copyright strings, this list of
+	    conditions and the following disclaimer.
+	2.  Redistributions in binary form must contain all copyright strings
+	    and related programming code that display the copyright strings.
+	3.  Redistributions in binary form must reproduce the above copyright
+	    notice, this list of conditions and the following disclaimer in
+	    the documentation and/or other materials provided with the
+	    distribution.
+	4.  All advertising materials mentioning features or use of this
+	    software must display the following acknowledgement:
+		"The Matsushita/Panasonic CD-ROM driver  was developed
+		 by Frank Durda IV for use with "FreeBSD" and similar
+		 operating systems."
+	    "Similar operating systems" includes mainly non-profit oriented
+	    systems for research and education, including but not restricted
+	    to "NetBSD", "386BSD", and "Mach" (by CMU).  The wording of the
+	    acknowledgement (in electronic form or printed text) may not be
+	    changed without permission from the author.
+	5.  Absolutely no warranty of function, fitness or purpose is made
+	    by the author Frank Durda IV.
+	6.  Neither the name of the author nor the name "FreeBSD" may
+	    be used to endorse or promote products derived from this software
+	    without specific prior written permission.
+	    (The author can be reached at   bsdmail@nemesis.lonestar.org)
+	7.  The product containing this software must meet all of these
+	    conditions even if it is unsupported, not a complete system
+	    and/or does not contain compiled code.
+	8.  These conditions will be in force for the full life of the
+	    copyright.  
+	9.  If all the above conditions are met, modifications to other
+	    parts of this file may be freely made, although any person
+	    or persons making changes do not receive the right to add their
+	    name or names to the copyright strings and notices in this
+	    software.  Persons making changes are encouraged to insert edit
+	    history in matcd.c and to put your name and details of the
+	    change there.  
+	10. You must have prior written permission from the author to
+	    deviate from these terms.
+
+	Vendors who produce product(s) containing this code are encouraged 
+	(but not required) to provide copies of the finished product(s) to
+	the author and to correspond with the author about development
+	activity relating to this code.   Donations of development hardware
+	and/or software are also welcome.  (This is one of the faster ways
+	to get a driver developed for a device.)
+
+ 	THIS SOFTWARE IS PROVIDED BY THE DEVELOPER(S) ``AS IS'' AND ANY
+ 	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ 	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ 	PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE DEVELOPER(S) BE
+ 	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ 	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ 	OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ 	OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ 	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ 	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+-----------------------------------------------------------------------------
+Dedicated to:	My family, my Grandfather,
+		and Max, my Golden Retriever
+
+Thanks to:	Jordon Hubbard (jkh) for getting me ramped-up to 2.x system
+		quickly enough to make the 2.1 release.  He put up with
+		plenty of silly questions and might get the post of
+		ambassador some day.
+
+and 		The people who donated equipment and other material to make
+		development of this driver possible.  Donations and
+		sponsors for projects are appreciated.
+
+
+-----No changes are allowed above this line------------------------------------
+
+Edit History - (should be in sync with any source control log entries)
+
+	Never seen one of these before?  Ok, here is how it works.
+	Every time you change the code, you increment the edit number,
+	that number over there in the <%d> and in the (%d) in the
+	version string.  You never set this number lower than it is.
+	Near, or preferably on lines that change, insert the edit
+	number.  If there is a number there already, you can replace it
+	with a newer one.  This makes searches for code changes very fast.
+
+	In the edit history, start with the edit number, and a good
+	description of what changes were made.  Then follow it with
+	the date, your name and an EMAIL address where you can be reached.
+
+	Please follow this practice; it helps leave understandable code in
+	your wake.
+
+	FYI, you have major and minor release codes.  Major releases numbered
+	1 thru n.  Major feature additions should get a new major release
+	number.  Minor releases start with a null and then letters
+	A thru Z.  So  3A(456) is Major release 3, Minor release 1,
+	Edit 456 (in Microsoft-ese that would be 03.01.456), and 5(731)
+	is Major release 5, Minor release 0, Edit 731.  Typically only the
+	author will change the major and minor release codes in small
+	projects.
+
+				EDIT edit Edit HISTORY history History
+
+<1>	This initial version is to get basic filesystem I/O working
+	using the SoundBlaster 16 interface.  The stand-alone adapter
+	card doesn't work yet.
+	December 1994  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<2>	Corrections to resolve a race condition when multiple drives
+	on the same controller was active.  Fixed drive 1 & 2 swap
+	problem.  See selectdrive().
+	21-Jan-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<3>	Added automatic probing and support for all Creative Labs sound
+	cards with the Creative/Panasonic interface and the stand-alone
+	interface adapters.  See AUTOHUNT and FULLCONFIG conditionals
+	for more information.
+	21-Jan-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<4>	Rebundled debug conditionals.
+	14-Feb-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<5>	Changes needed to work on FreeBSD 2.1.  Also added draincmd
+	since some conditions cause the drive to produce surprise data.
+	See setmode and draincmd
+	19-Feb-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<6>	Got rid of some redundant error code by creating chk_error().
+	Also built a nice generic bus-lock function.
+	20-Feb-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<7>	Improved comments, general structuring.
+	Fixed a problem with disc eject not working if LOCKDRIVE was set.
+	Apparently the drive will reject an EJECT command if the drive
+	is LOCKED.
+	21-Feb-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+Edit number code marking begins here - earlier edits were during development.
+
+<8>	Final device name selected and actually made to compile under
+	>2.0. For newer systems, it is "matcd", for older it is "mat".
+	24-Feb-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<9>	Added some additional disk-related ioctl functions that didn't
+	make it into earlier versions.  
+	26-Feb-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<10>	Updated some conditionals so the code will compile under
+	1.1.5.1, although this is not the supported platform.
+	Also found that some other devices probe code was changing the
+	settings for the port 0x302 debug board, so added code to set it
+	to a sane state before we use it.
+	26-Feb-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<11>	The Copyright and Use statement has been replaced in all files
+	with a new version.
+	1-Mar-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<12>	Added ioctls having to do with audio volume, routing and playback
+	speed.  Also added some code I think is for dynamic loading.
+	12-Mar-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<13>	Added ioctls to return TOC headers and entries.
+	19-Mar-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<14>	More ioctls to finish out general audio support and some clean-up.
+	Also fixed a bug in open where CD label information would not
+	always be cleared after a disc change.
+
+	Added a check to block attempts to resume audio if already playing.
+	The resulting sound is a cross between Kryten and Max Headroom.
+	But, if you *want* this "feature", enable #define KRYTEN
+	in options.h.
+
+	So it is not BSD-ish enough, eh?  What, too many comments?  :-)
+	21-Mar-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<15>	LOCKDRIVE has been modified so that a new series of minor
+	numbers are created.  When these are opened, the selected
+	drive will have its door locked and the device must be completely
+	closed to unlock the media.  The EJECT ioctl will be refused
+	when the drive is locked this way.   This is useful for
+	servers and other places where the media needs to remain in the
+	drive.  Bit 7 of the minor number controls locking.
+
+	As of this edit, the code compiles with no warnings with -Wall set.
+	22-Mar-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+<16>	Added a new check in the probe code that looks for the drive
+	interface being in an idle state after issuing a reset.  If this
+	isn't the case, then the device at this location isn't a
+	Matsushita CD-ROM drive.  This will prevent hangs in draincmd later.
+	Added the tray close ioctl.  This required modifications to open
+	to allow the character devices to be "partially" opened so that
+	the close ioctl could be issued when the open would otherwise fail.
+	Close also delays slightly after completing because the drive
+	doesn't update its disc and media status instantly.
+	Also created the capability ioctl that lets an application find out
+	up front what things a drive can do.
+	Fixed a global spelling error.
+	Changed matcddriver structure to simply say "matcd".  The original
+	string "matcd interface " broke the kernel -c boot mechanism.
+	Updated the #includes in response to a complaint in first release.
+	Updated and tested conditionals so that driver will still compile
+	under FreeBSD 1.1.5.1 as well as 2.0 and early 2.1.
+	4-Apr-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
+
+---------------------------------------------------------------------------*/
+
+/*Match this format:		Version_dc(d)__dd-mmm-yy	*/
+static char	MATCDVERSION[]="Version  1(16)  4-Apr-95";
+
+/*	The following strings may not be changed*/
+static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
+/*	The proceeding strings may not be changed*/
+
+
+/*---------------------------------------------------------------------------
+	Include declarations
+---------------------------------------------------------------------------*/
+
+#include	<sys/param.h>		/*<16>*/
+#include	<sys/systm.h>		/*<16>*/
+
+#include	<sys/buf.h>		/*<16>*/
+#include	<sys/dkbad.h>		/*<16>*/
+#include	<sys/cdio.h>		/*<16>*/
+#include	<sys/disklabel.h>	/*<16>*/
+#include	<sys/file.h>		/*<16>*/
+#include	<sys/ioctl.h>		/*<16>*/
+#include	<sys/proc.h>		/*<16>*/
+
+#include	"i386/isa/matcd/options.h"	/*Conditional compile options
+						  and probe port hints*/
+#include	"i386/isa/matcd/matcd.h"	/*Drive-related defs & strings*/
+#include	"i386/isa/matcd/creative.h"	/*Host interface related defs*/
+
+#ifdef	FREE2
+#include 	<sys/devconf.h>		/*<16>*/
+#else	/*FREE2*/
+#include	"i386/isa/isa.h"	/*<16>*/
+#include	"i386/isa/isa_device.h"	/*<16>*/
+#endif	/*FREE2*/
+
+/*---------------------------------------------------------------------------
+	Defines and structures
+---------------------------------------------------------------------------*/
+
+#ifdef FULLCONFIG
+#define NUMCTRLRS	4		/*With modern boards, four is max*/
+#else /*FULLCONFIG*/
+#define NUMCTRLRS	1		/*Produces a slightly smaller kernel*/
+#endif	/*FULLCONFIG*/
+#define DRIVESPERC	4		/*This is a constant*/
+#define TOTALDRIVES	NUMCTRLRS*DRIVESPERC	/*Max possible drives*/
+#if DIAGPORT > 0xff			/*<10>*/
+#define DIAGOUT	outw			/*<10>*/
+#else /*DIAGPORT*/			/*<10>*/
+#define DIAGOUT	outb			/*<10>*/
+#endif /*DIAGPORT*/			/*<10>*/
+#ifdef DIAGPORT
+int	diagloop;			/*Used to show looping*/
+#endif /*DIAGPORT*/
+
+
+#define	TICKRES		10		/*Our coarse timer resolution*/
+#define ISABUSKHZ	8330		/*Number of IN/OUT ISA/sec*/
+#define MAXTRKS		101		/*Maximum possible tracks*/
+
+#ifndef FREE2
+#define	RAW_PART	2		/*Needs to be defined in 1.1.5.1*/
+#endif /*FREE2*/
+#define	RAW_DEVICE	46		/*<16>Dev number for raw device*/
+
+
+#define MATCDBLK	2048		/*Standard block size*/
+#define MATCDRBLK	2352		/*Raw and/or DA block size*/
+#define	MATCD_RETRYS	5		/*Number of retries for read ops*/
+#define	MATCD_READ_1	0x80		/*Read state machine defines*/
+#define	MATCD_READ_2	0x90		/*Read state machine defines*/
+
+struct matcd_volinfo {
+	unsigned char	type;		/*00 CD-DA or CD-ROM
+					  10 CD-I
+					  20 XA */
+	unsigned char	trk_low;	/*Normally 1*/
+	unsigned char	trk_high;	/*Highest track number*/
+	unsigned char	vol_msf[3];	/*Size of disc in min/sec/frame*/
+};
+
+
+struct	matcd_mbx {
+	short	controller;
+	short	ldrive;
+	short	partition;
+	short	port;
+	short	retry;
+	short	nblk;
+	int	sz;
+	u_long	skip;
+	struct	buf	*bp;
+	int	p_offset;
+	short	count;
+};
+
+struct matcd_data {
+	short	config;
+	short	drivemode;		/*Last state drive was set to*/
+	short	flags;
+	short	status;			/*Last audio-related function*/
+	int	blksize;
+	u_long	disksize;
+	int	iobase;
+	struct	disklabel dlabel;
+	int	partflags[MAXPARTITIONS];
+	int	openflags;
+	struct	matcd_volinfo volinfo;
+	struct	matcd_mbx mbx;
+	u_char	patch[2];		/*<12>Last known audio routing*/
+	u_char	volume[2];		/*<12>Last known volume setting*/
+} matcd_data[TOTALDRIVES];
+
+
+/*	Bit equates for matcd_data.flags*/
+
+#define	MATCDINIT	0x0001		/*Probe ran on host adapter*/
+#define	MATCDLABEL	0x0004		/*Valid TOC exists*/
+#define	MATCDLOCK	0x0008		/*<15>Drive door is locked*/
+#define	MATCDWARN	0x0020		/*Have reported an open disc change*/
+
+
+/*	Bit equates for matcd_data.partflags*/
+
+#define	MATCDOPEN	0x0001
+#define	MATCDREADRAW	0x0002
+
+
+/*	Error classes returned by chk_error()*/
+
+#define ERR_RETRY	1		/*A retry might recover this*/
+#define ERR_INIT	2		/*A retry certainly will get this*/
+#define ERR_FATAL	3		/*This cannot be recovered from*/
+
+
+struct	buf request_head[NUMCTRLRS];	/*A queue for each host interface*/
+	int	nextcontroller=0;	/*Number of interface units found*/
+	int	drivepresent=0; 	/*Don't change this - see license*/
+
+unsigned char	if_state[4]={0,0,0,0};	/*State of the host I/F and bus*/
+
+/*	Flags in the if_state array
+*/
+
+#define	BUSSBUSY	0x01		/*Buss is already busy*/
+
+
+struct matcd_read2 {
+	unsigned char	start_msf[3];
+	unsigned char	end_msf[3];
+};
+
+
+/*	This mystery structure is supposed to make dynamic driver
+	loading possible.
+*/
+
+#ifdef FREE2
+static struct kern_devconf kdc_matcd[TOTALDRIVES] = { {	/*<12>*/
+	0,0,0,				/*Filled in by dev_attach*/
+	"matcd",0,{MDDT_ISA,0,"bio"},	/*<12>*/
+	isa_generic_externalize,0,0,ISA_EXTERNALLEN,	/*<12>*/
+	&kdc_isa0,			/*<12>Parent*/
+	0,				/*<12>Parent Data*/
+	DC_IDLE,			/*<12>Status*/
+	"Matsushita CD-ROM Controller"	/*<12>This is the description*/
+} };					/*<12>*/
+#endif /*FREE2*/
+
+	
+/*---------------------------------------------------------------------------
+	These macros take apart the minor number and yield the
+	partition, drive on controller, and controller.
+	This must match the settings in /dev/MAKEDEV.
+---------------------------------------------------------------------------*/
+
+#define		matcd_partition(dev)	((minor(dev)) & 0x07)
+#define		matcd_ldrive(dev)	(((minor(dev)) & 0x78) >> 3)
+#define		matcd_cdrive(dev)	(((minor(dev)) & 0x18) >> 3)
+#define		matcd_controller(dev)	(((minor(dev)) & 0x60) >> 5)
+#ifdef LOCKDRIVE			/*<15>*/
+#define		matcd_lockable(dev)	((minor(dev)) & 0x80)	/*<15>*/
+#endif /*LOCKDRIVE*/			/*<15>*/
+
+
+#ifndef FREE2
+/*---------------------------------------------------------------------------
+	This makes the long function names shorter for systems
+	using the older kernel config program
+---------------------------------------------------------------------------*/
+#define	matcdopen	matopen		/*<8>*/
+#define matcdclose	matclose	/*<8>*/
+#define matcdstrategy	matstrategy	/*<8>*/
+#define matcdioctl	matioctl	/*<8>*/
+#define matcdsize	matsize		/*<8>*/
+#define matcddriver	matdriver	/*<10>*/
+#endif /*FREE2*/
+
+
+/*---------------------------------------------------------------------------
+	Entry points and other connections to/from kernel - see conf.c
+---------------------------------------------------------------------------*/
+
+	int	matcdopen(dev_t dev);
+	int	matcdclose(dev_t dev);
+	void	matcdstrategy(struct buf *bp);
+	int	matcdioctl(dev_t dev, int command, caddr_t addr, int flags);
+	int	matcdsize(dev_t dev);
+extern	int	hz;
+extern	int	matcd_probe(struct isa_device *dev);
+extern	int	matcd_attach(struct isa_device *dev);
+struct	isa_driver	matcddriver={matcd_probe, matcd_attach,	/*<16>*/
+				     "matcd"};	/*<16>*/
+
+
+/*---------------------------------------------------------------------------
+	Internal function declarations
+---------------------------------------------------------------------------*/
+
+static	void	matcd_start(struct buf *dp);
+static	void	zero_cmd(char *);
+static	void	matcd_pread(int port, int count, unsigned char * data); 
+static	int	matcd_fastcmd(int port,int ldrive,int cdrive,
+			      unsigned char * cp);
+static	void	matcd_slowcmd(int port,int ldrive,int cdrive,
+			      unsigned char * cp);
+static	void	matcd_blockread(int state);
+static	void	selectdrive(int port,int drive);
+static	void	doreset(int port,int cdrive);
+static	int	doprobe(int port,int cdrive);
+static	void	watchdog(int state, char * foo);
+static	void	lockbus(int controller, int ldrive);
+static	void	unlockbus(int controller, int ldrive);
+static	int	matcd_volinfo(int ldrive);
+static	void	draincmd(int port,int cdrive,int ldrive);
+static	int 	get_error(int port, int ldrive, int cdrive);
+static	int	chk_error(int errnum);
+static	int	msf_to_blk(unsigned char * cd);
+#ifdef	FULLDRIVER
+static	int	matcd_playtracks(int ldrive, int cdrive, int controller,
+				 struct ioc_play_track *pt);
+static	int	matcd_playmsf(int ldrive, int cdrive, int controller,
+				 struct ioc_play_msf *pt);
+static	int	matcd_pause(int ldrive, int cdrive, int controller,
+			    int action);			   /*<12>*/
+static	int	matcd_stop(int ldrive, int cdrive, int controller);
+static	int	matcd_level(int ldrive, int cdrive, int controller,/*<12>*/
+		            struct ioc_vol * volume, int action);  /*<12>*/
+static	int	matcd_patch(int ldrive, int cdrive, int controller,/*<12>*/
+		            struct ioc_patch * routing);/*<12>*/
+static	int	matcd_route(int ldrive, int cdrive, int controller,/*<12>*/
+		            int command);		/*<12>*/
+static	int	matcd_pitch(int ldrive, int cdrive, int controller,/*<12>*/
+		            struct ioc_pitch * speed);	/*<12>*/
+static	int	matcd_igot(struct ioc_capability * sqp);	/*<16>*/
+#endif /*FULLDRIVER*/
+static	int	matcd_toc_header(int ldrive, int cdrive, int controller,/*<13>*/
+		                 struct ioc_toc_header * toc);  /*<13>*/
+static	int	matcd_toc_entries(int ldrive, int cdrive,	/*<13>*/
+				  int controller,	/*<13>*/
+				  struct ioc_read_toc_entry *ioc_entry);/*<13>*/
+static	int	matcd_read_subq(int ldrive, int cdrive, int controller,/*<14>*/
+			        struct ioc_read_subchannel * sqp);/*<14>*/
+static	int	waitforit(int timelimit, int state, int port,
+			   char * where);	/*<14>*/
+static	int	get_stat(int port, int ldrive);	/*<14>*/
+static	int	media_chk(struct matcd_data *cd,int errnum,
+			  int ldrive,int test);	/*<14>*/
+static	int	matcd_eject(int ldrive, int cdrive, int controller);/*<14>*/
+static	int	matcd_doorclose(int ldrive, int cdrive, int controller);/*<16>*/
+static	int	docmd(char * cmd, int ldrive, int cdrive,	/*<14>*/
+		      int controller, int port);	/*<14>*/
+
+
+/*---------------------------------------------------------------------------
+	matcdopen - Open the device
+
+	This routine actually gets called every time anybody opens
+	any partition on a drive.  But the first call is the one that
+	does all the work.  
+
+<15>	If LOCKDRIVE is enabled, additional minor number devices allow
+<15>	the drive to be locked while being accessed.
+---------------------------------------------------------------------------*/
+int	matcdopen(dev_t dev)
+{
+	int cdrive,ldrive,partition,controller;
+	struct matcd_data *cd;
+	int	i,z,port;		/*<14>*/
+	unsigned char	cmd[MAXCMDSIZ];
+
+#if DIAGPORT == 0x302			/*<10>*/
+	DIAGOUT(0x300,0x00);		/*<10>Init diag board in case some
+					  other device probe scrambled it*/
+#endif /*<10>DIAGPORT*/
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0x10);		/*Show where we are*/
+#endif /*DIAGPORT*/
+	ldrive=matcd_ldrive(dev);	
+	cdrive=matcd_cdrive(dev);
+	partition=matcd_partition(dev);
+	controller=matcd_controller(dev);
+	cd= &matcd_data[ldrive];
+	port=cd->iobase;	/*and port#*/
+
+	if (ldrive >= TOTALDRIVES) return(ENXIO);
+
+
+#ifdef DEBUGOPEN
+	printf("matcd%d: Open: dev %x partition %x controller %x flags %x cdrive %x\n",
+	       ldrive,(int)dev,partition,controller,cd->flags,
+	       matcd_cdrive(dev));
+#endif /*DEBUGOPEN*/
+
+	if (!(cd->flags & MATCDINIT)) {	/*Did probe find this drive*/
+		return(ENXIO);	
+	}
+
+	if (!(cd->flags & MATCDLABEL) &&
+	    cd->openflags) {		/*Has drive completely closed?*/
+		return(ENXIO);		/*No, all partitions must close*/
+	}
+
+
+/*	Now, test to see if the media is ready
+*/
+
+	lockbus(controller,ldrive);
+	zero_cmd(cmd);
+	cmd[0]=NOP;			/*Test drive*/
+	matcd_slowcmd(port,ldrive,cdrive,cmd);
+	i=waitforit(10*TICKRES,DTEN,port,"matcdopen");
+	z=get_stat(port,ldrive);	/*Read status byte*/
+#ifdef DEBUGOPEN
+	printf("matcd%d Result of NOP is %x %x\n",ldrive,i,z);	/*<16>*/
+#endif /*DEBUGOPEN*/
+	if ((z & MATCD_ST_DSKIN)==0) {	/*Is there a disc in the drive?*/ 
+#ifdef DEBUGOPEN
+		printf("matcd%d: No Disc in open\n",ldrive);
+#endif /*DEBUGOPEN*/
+		unlockbus(controller, ldrive);	/*Release bus lock*/
+		cd->flags &= ~MATCDLABEL;	/*<16>Mark label as invalid*/
+		if (major(dev)==RAW_DEVICE) {	/*<16>Is the char device?*/
+			return(0);		/*<16>Allow Semi open*/
+		}
+		else {
+			return(ENXIO);		/*<16>Normally blow off*/
+		}
+	}
+	if (z & MATCD_ST_ERROR) {		/*Was there an error*/
+		i=get_error(port,ldrive,cdrive);/*Find out what it was*/
+#ifdef DEBUGOPEN
+		printf("matcd%d NOP Error was %x\n",ldrive,i);
+#endif /*DEBUGOPEN*/
+		if (cd->openflags) {		/*Any parts open?*/
+			if (media_chk(cd,i,ldrive,0)) {	/*<14>Was it a disc chg?*/
+#ifdef DEBUGOPEN
+				printf("matcd%d: Disc change detected i %x z %x\n",
+				       ldrive,i,z);
+#endif /*DEBUGOPEN*/
+				unlockbus(controller, ldrive);	/*Release bus lock*/
+				return(ENOTTY);
+			}
+
+		} else {
+			media_chk(cd,i,ldrive,1);/*<14>Was it a disc chg?*/
+						 /*<14>Clear volume info*/
+		}
+	}
+	unlockbus(controller, ldrive);	/*Release bus lock*/
+	
+/*	Here we fill in the disklabel structure although most is
+	hardcoded.
+*/
+
+	if ((cd->flags & MATCDLABEL)==0) {
+		bzero(&cd->dlabel,sizeof(struct disklabel));
+
+
+/*	Now we query the drive for the actual size of the media.
+	This is where we find out of there is any media or if the
+	media isn't a Mode 1 or Mode 2/XA disc.
+	See version information about Mode 2/XA support.
+*/
+		lockbus(controller,ldrive);
+		i=matcdsize(dev);
+		unlockbus(controller, ldrive);	/*Release bus lock*/
+#ifdef DEBUGOPEN
+		printf("matcd%d: Buss unlocked in open\n",ldrive);
+#endif /*DEBUGOPEN*/
+		if (i < 0) {
+			printf("matcd%d: Could not read the disc size\n",ldrive);
+			return(ENXIO);
+		}			/*matcdsize filled in rest of dlabel*/
+
+/*	Based on the results, fill in the variable entries in the disklabel
+*/
+		cd->dlabel.d_secsize=cd->blksize;
+		cd->dlabel.d_ncylinders=(cd->disksize/100)+1;
+		cd->dlabel.d_secperunit=cd->disksize;
+		cd->dlabel.d_partitions[0].p_size=cd->disksize;
+		cd->dlabel.d_checksum=dkcksum(&cd->dlabel);
+
+
+/*	Now fill in the hardcoded section
+*/
+					     /*123456789012345678*/
+		strncpy(cd->dlabel.d_typename,"Matsushita CDR ",16);
+		strncpy(cd->dlabel.d_packname,"(c) 1994, fdiv ",16);
+		cd->dlabel.d_magic=DISKMAGIC;
+		cd->dlabel.d_magic2=DISKMAGIC;
+		cd->dlabel.d_nsectors=100;
+		cd->dlabel.d_secpercyl=100;
+		cd->dlabel.d_ntracks=1;
+		cd->dlabel.d_interleave=1;
+		cd->dlabel.d_rpm=300;
+		cd->dlabel.d_npartitions=1;	/*See note below*/
+		cd->dlabel.d_partitions[0].p_offset=0;
+		cd->dlabel.d_partitions[0].p_fstype=9;
+		cd->dlabel.d_flags=D_REMOVABLE;
+
+/*	I originally considered allowing the partition match tracks or
+	sessions on the media, but since you are allowed up to 99
+	tracks in the RedBook world, this would not fit in with the
+	BSD fixed partition count scheme.  So ioctls will be used to shift
+	the track to be accessed into partition 1.
+*/
+
+		cd->flags |= MATCDLABEL;	/*Mark drive as having TOC*/
+	}
+	
+#ifdef DEBUGOPEN
+	printf("matcd%d open2: partition=%d disksize=%d blksize=%x flags=%x\n",
+	       ldrive,partition,(int)cd->disksize,cd->blksize,cd->flags);
+#endif /*DEBUGOPEN*/
+
+#ifdef LOCKDRIVE			/*<15>*/
+	if (cd->openflags==0 && matcd_lockable(dev)) {	/*<15>*/
+		zero_cmd(cmd);
+		cmd[0]=LOCK;		/*Lock drive*/
+		cmd[1]=1;
+		docmd(cmd,ldrive,cdrive,controller,port);/*<15>Issue cmd*/
+		cd->flags |= MATCDLOCK;	/*<15>Drive is now locked*/
+	}
+#endif /*LOCKDRIVE*/
+	cd->openflags |= (1<<partition);/*Mark partition open*/
+
+	if (partition==RAW_PART || 
+	    (partition < cd->dlabel.d_npartitions &&
+	     cd->dlabel.d_partitions[partition].p_fstype != FS_UNUSED)) {
+		cd->partflags[partition] |= MATCDOPEN;
+		if (partition == RAW_PART) {
+			cd->partflags[partition] |= MATCDREADRAW;
+		}
+#ifdef DEBUGOPEN
+		printf("matcd%d: Open is complete\n",ldrive);
+#endif /*DEBUGOPEN*/
+		return(0);
+	}
+#ifdef DEBUGOPEN
+	printf("matcd%d: Open FAILED\n",ldrive);
+#endif /*DEBUGOPEN*/
+	return(ENXIO);
+}
+
+
+/*---------------------------------------------------------------------------
+	matcdclose - Close the device
+
+	Close may not do much other than clear some driver settings.
+	Note that audio playback will continue.
+
+<15>	If you define LOCKDRIVE, and the drive has been opened using
+<15>	one of the locking minor numbers, code in close will unlock
+<15>	the drive.
+---------------------------------------------------------------------------*/
+
+int matcdclose(dev_t dev)
+{
+	int	ldrive,cdrive,port,partition,controller;
+	struct matcd_data *cd;
+#ifdef LOCKDRIVE
+	unsigned char cmd[MAXCMDSIZ];
+#endif /*LOCKDRIVE*/
+
+	ldrive=matcd_ldrive(dev);
+	cdrive=matcd_cdrive(dev);
+	cd=matcd_data+ldrive;
+	port=cd->iobase;		/*and port#*/
+
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0x20);		/*Show where we are*/
+#endif /*DIAGPORT*/
+	if (ldrive >= TOTALDRIVES) 
+		return(ENXIO);
+
+	partition = matcd_partition(dev);
+	controller=matcd_controller(dev);
+#ifdef DEBUGOPEN
+	printf("matcd%d: Close partition=%d\n", ldrive, partition);
+#endif /*DEBUGOPEN*/
+
+	if (!(cd->flags & MATCDINIT))
+		return(ENXIO);
+
+	cd->partflags[partition] &= ~(MATCDOPEN|MATCDREADRAW);
+	cd->openflags &= ~(1<<partition);
+#ifdef LOCKDRIVE
+	if (cd->openflags==0 && (cd->flags & MATCDLOCK)) {	/*<15>*/
+		zero_cmd(cmd);
+		cmd[0]=LOCK;		/*Unlock drive*/
+		docmd(cmd,ldrive,cdrive,controller,port);/*<14>Issue cmd*/
+	}
+#endif /*LOCKDRIVE*/
+	cd->flags &= ~(MATCDWARN|MATCDLOCK);	/*<15>Clear any warning flag*/
+	return(0);
+}
+
+
+/*---------------------------------------------------------------------------
+	matcdstrategy - Accepts I/O requests from kernel for processing
+
+	This routine accepts a read request block pointer (historically
+	but somewhat inaccurately called *bp for buffer pointer).
+	Various sanity checks are performed on the request.
+	When we are happy with the request and the state of the device,
+	the request is added to the queue of requests for the interface
+	that the drive is connected to.  We support multiple interfaces
+	so there are multiple queues.  Once the request is added, we
+	call the matcd_start routine to start the device in case it isn't
+	doing something already.   All I/O including ioctl requests
+	rely on the current request starting the next one before exiting.
+---------------------------------------------------------------------------*/
+
+void matcdstrategy(struct buf *bp)
+{
+	struct matcd_data *cd;
+	struct buf *dp;
+	int s;
+	int ldrive,controller;
+
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0x30);		/*Show where we are*/
+#endif /*DIAGPORT*/
+	ldrive=matcd_ldrive(bp->b_dev);
+	controller=matcd_controller(bp->b_dev);
+	cd= &matcd_data[ldrive];
+
+#ifdef DEBUGIO
+	printf("matcd%d: Strategy: buf=0x%lx, block#=%ld bcount=%ld\n",
+		ldrive,(unsigned long)bp,bp->b_blkno,bp->b_bcount);
+#endif /*DEBUGIO*/
+
+
+	if (ldrive >= TOTALDRIVES || bp->b_blkno < 0) {
+		printf("matcd%d: Bogus parameters received - kernel may be corrupted\n",ldrive);
+		bp->b_error=EINVAL;
+		goto bad;
+	}
+
+	if (!(cd->flags & MATCDLABEL)) {
+		bp->b_error = EIO;
+		goto bad;
+	}
+
+	if (!(bp->b_flags & B_READ)) {
+		bp->b_error = EROFS;
+		goto bad;
+	}
+
+	if (bp->b_bcount==0)		/*Request is zero-length - all done*/
+		goto done;
+
+	if (matcd_partition(bp->b_dev) != RAW_PART) {
+		if (bounds_check_with_label(bp,&cd->dlabel,1) <= 0) {
+			goto done;
+		}
+	} else {
+		bp->b_pblkno=bp->b_blkno;
+		bp->b_resid=0;
+	}
+
+	s=splbio();			/*Make sure we don't get intr'ed*/
+	dp=&request_head[controller];	/*Pointer to controller queue*/
+	disksort(dp,bp);		/*Add new request (bp) to queue (dp
+					  and sort the requests in a way that
+					  may not be ideal for CD-ROM media*/
+
+#ifdef DEBUGQUEUE
+	printf("matcd%d: Dump BP chain:  -------\n",ldrive);
+	while (bp) {
+		printf("Block %d\n",(int)bp->b_pblkno);
+#ifdef FREE2
+		bp=bp->b_actf;
+#else /*FREE2*/	
+		bp=bp->av_forw;
+#endif /*FREE2*/
+	}
+	printf("matcd%d: ---------------------\n",ldrive);
+#endif /*DEBUGQUEUE*/
+
+	matcd_start(dp);		/*Ok, with our newly sorted queue,
+					  see if we can start an I/O operation
+					  right now*/
+	splx(s);			/*Return priorities to normal*/
+	return;				/*All done*/
+
+bad:	bp->b_flags |= B_ERROR;		/*Request bad in some way*/
+done:	bp->b_resid = bp->b_bcount;	/*Show amount of data un read*/
+	biodone(bp);			/*Signal we have done all we plan to*/
+	return;
+}
+
+
+/*---------------------------------------------------------------------------
+	matcd_start - Pull a request from the queue and consider doing it.
+---------------------------------------------------------------------------*/
+
+static void matcd_start(struct buf *dp)
+{
+	struct matcd_data *cd;
+	struct buf *bp;
+	struct partition *p;
+	int part,ldrive,controller;
+
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0x40);		/*Show where we are*/
+	diagloop=0;
+#endif /*DIAGPORT*/
+	if ((bp=dp->b_actf) == NULL) {	/*Nothing on read queue to do?*/
+		wakeup((caddr_t)&matcd_data->status);	/*Wakeup any blocked*/
+		return;					/* opens, ioctls, etc*/
+	}
+
+	ldrive=matcd_ldrive(bp->b_dev);	/*Get logical drive#*/
+	cd=&matcd_data[ldrive];		/*Get pointer to data for this drive*/
+	controller=matcd_controller(bp->b_dev);	/*Also get interface #*/
+#ifdef DEBUGIO
+	printf("matcd%d: In start controller %d\n",ldrive,controller);
+#endif	/*DEBUGIO*/
+
+	if (if_state[controller] & BUSSBUSY) {
+#ifdef DEBUGIO
+		printf("matcd%d: Dropping thread in start,  controller %d\n",
+	       		ldrive,controller);
+#endif	/*DEBUGIO*/
+		return;
+	}
+
+/*	Ok, the controller is idle (not necessarily the drive) and so
+	get the command to do and issue it
+*/
+
+#ifdef FREE2
+	dp->b_actf = bp->b_actf;
+#else /*FREE2*/
+	dp->b_actf = bp->av_forw;	/*Get next request from queue*/
+#endif /*FREE2*/
+
+	part=matcd_partition(bp->b_dev);
+	p=cd->dlabel.d_partitions + part;
+
+	if_state[controller] |= BUSSBUSY;/*Mark bus as busy*/
+	cd->mbx.ldrive=ldrive;		/*Save current logical drive*/
+	cd->mbx.controller=controller;	/*and controller*/
+	cd->mbx.partition=part;		/*and partition (2048 vs 2532)*/
+	cd->mbx.port=cd->iobase;	/*and port#*/
+	cd->mbx.retry=MATCD_RETRYS;	/*and the retry count*/
+	cd->mbx.bp=bp;			/*and the bp*/
+	cd->mbx.p_offset=p->p_offset;	/*and where the data will go*/
+	matcd_blockread(MATCD_READ_1+ldrive);	/*Actually start the read*/
+	return;				/*Dropping thread.  matcd_blockread
+					  must have scheduled a timeout or
+					  we will go to sleep forever*/
+}
+
+
+/*---------------------------------------------------------------------------
+	matcdioctl - Process things that aren't block reads
+
+	In this driver, ioctls are used mainly to change
+	the mode the drive is running in, play audio and other
+	things that don't fit into the block read scheme of things.
+---------------------------------------------------------------------------*/
+
+int matcdioctl(dev_t dev, int command, caddr_t addr, int flags)
+{
+	struct	matcd_data *cd;
+	int	ldrive,cdrive,partition;
+	int	port, controller;
+#ifdef DEBUGIOCTL
+	int	i;
+#endif	/*DEBUGIOCTL*/
+
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0x50);		/*Show where we are*/
+#endif /*DIAGPORT*/
+	ldrive=matcd_ldrive(dev);
+	cdrive=matcd_cdrive(dev);
+	partition=matcd_partition(dev);
+	controller=ldrive>>2;
+	cd = &matcd_data[ldrive];
+	port=cd->iobase;
+
+#ifdef DEBUGIOCTL
+	printf("matcd%d: ioctl %x cdrive %x parms ",ldrive,command,cdrive);
+	for (i=0;i<10;i++) {
+		printf("%02x ",(unsigned int)addr[i]);
+	}
+	printf("  flags %x\n",cd->flags);
+#endif	/*DEBUGIOCTL*/
+
+	if (command==CDIOCCLOSE)	/*<16>Allow close if door open*/
+		return(matcd_doorclose(ldrive, cdrive, controller));/*<16>*/
+
+	if (!(cd->flags & MATCDLABEL))	/*Did we read TOC OK?*/
+		return(EIO);		/*<16>then drive really isn't ready*/
+
+	switch(command) {
+	case	DIOCSBAD:		/*<9>*/
+		return(EINVAL);		/*<9>*/
+
+	case	DIOCGDINFO:		/*<9>*/
+		*(struct disklabel *) addr = cd->dlabel;	/*<9>*/
+		return(0);		/*<9>*/
+
+	case	DIOCGPART:		/*<9>*/
+		((struct partinfo *) addr)->disklab=&cd->dlabel;/*<9>*/
+		((struct partinfo *) addr)->part=	/*<9>*/
+		    &cd->dlabel.d_partitions[matcd_partition(dev)];/*<9>*/
+		return(0);		/*<9>*/
+
+	case	DIOCWDINFO:		/*<9>*/
+	case	DIOCSDINFO:		/*<9>*/
+#ifdef FREE2				/*<10>*/
+		if ((flags & FWRITE) == 0) {	/*<9>*/
+			return(EBADF);	/*<9>*/
+		}			/*<9>*/
+		else {			/*<9>*/
+			return setdisklabel(&cd->dlabel,	/*<9>*/
+				            (struct disklabel *) addr, 0);/*<9>*/
+		}			/*<9>*/
+#endif /*<10>FREE2*/
+	case	DIOCWLABEL:		/*<9>*/
+		return(EBADF);		/*<9>*/
+
+	case	CDIOCEJECT:
+		return(matcd_eject(ldrive, cdrive, controller));
+
+#ifdef FULLDRIVER
+	case	CDIOCPLAYTRACKS:
+		return(matcd_playtracks(ldrive, cdrive, controller,
+		       (struct ioc_play_track *) addr));
+
+	case	CDIOCPLAYMSF:
+		return(matcd_playmsf(ldrive, cdrive, controller,
+		       (struct ioc_play_msf *) addr));
+
+	case	CDIOCRESUME:
+		return(matcd_pause(ldrive, cdrive, controller,RESUME)); /*<12>*/
+
+	case	CDIOCPAUSE:
+		return(matcd_pause(ldrive, cdrive, controller,0));	/*<12>*/
+
+	case	CDIOCSTOP:
+		return(matcd_stop(ldrive, cdrive, controller));	/*<12>*/
+
+	case	CDIOCGETVOL:
+	case	CDIOCSETVOL:
+		return(matcd_level(ldrive, cdrive, controller,	/*<12>*/
+		       (struct ioc_vol *) addr, command));	/*<12>*/
+
+	case	CDIOCSETMONO:		/*<12>This drive can't do mono*/
+		return(EINVAL);		/*<12>but it looks like it should*/
+
+					/*<12>SRC OUT	SRC OUT*/
+	case	CDIOCSETSTEREO:		/*<12>0 -> L	1 -> R*/
+	case	CDIOCSETMUTE:		/*<12>0 -> NULL	1 -> NULL*/
+	case	CDIOCSETLEFT:		/*<12>0 -> L&R	1 -> NULL*/
+	case	CDIOCSETRIGHT:		/*<12>0 -> NULL	1 -> L&R*/
+					/*<12>Adjust audio routing*/
+		return(matcd_route(ldrive, cdrive, controller,	/*<12>*/
+		       command));	/*<12>*/
+
+	case	CDIOCSETPATCH:		/*<12>Allow precise routing*/
+		return(matcd_patch(ldrive, cdrive, controller,	/*<12>*/
+		       (struct ioc_patch *) addr));	/*<12>*/
+
+	case	CDIOCPITCH:		/*<12>Adjust playback speed*/
+		return(matcd_pitch(ldrive, cdrive, controller,	/*<12>*/
+		       (struct ioc_pitch *) addr));	/*<12>*/
+
+	case	CDIOCSTART:		/*<12>Only reason this isn't*/
+		return(EINVAL);		/*<12>implemented is I can't find out*/
+					/*<12>what it should do!*/
+#endif	/*FULLDRIVER*/
+
+	case	CDIOREADTOCHEADER:
+		return(matcd_toc_header(ldrive, cdrive, controller,/*<13>*/
+		       (struct ioc_toc_header *) addr));	/*<13>*/
+
+	case	CDIOREADTOCENTRYS:
+		return(matcd_toc_entries(ldrive, cdrive, controller,/*<13>*/
+		       (struct ioc_read_toc_entry *) addr));	/*<13>*/
+
+	case	CDIOCREADSUBCHANNEL:
+		return(matcd_read_subq(ldrive, cdrive, controller,/*<14>*/
+		       (struct ioc_read_subchannel *) addr));/*<14>*/
+
+	case	CDIOCCAPABILITY:	/*<16>Request drive/driver capability*/
+		return(matcd_igot((struct ioc_capability *) addr));/*<16>*/
+
+	case	CDIOCRESET:		/*<12>There is no way to hard reset*/
+		return(EINVAL);		/*<12>just one drive*/
+
+	default:
+		return(ENOTTY);
+	}
+}
+
+/*---------------------------------------------------------------------------
+	matcdsize - Reports how many blocks exist on the disc.
+---------------------------------------------------------------------------*/
+
+int	matcdsize(dev_t dev)
+{
+	int	size,blksize;
+	int	ldrive,part;
+	struct	matcd_data *cd;
+
+	ldrive=matcd_ldrive(dev);
+	part=matcd_partition(dev);
+	if (part==RAW_PART) 
+		blksize=MATCDRBLK;	/*2352*/
+	else	
+		blksize=MATCDBLK;	/*2048*/
+
+	cd = &matcd_data[ldrive];
+
+	if (matcd_volinfo(ldrive) >= 0) {
+		cd->blksize=blksize;
+		size=msf_to_blk((char * )&cd->volinfo.vol_msf);
+
+		cd->disksize=size*(blksize/DEV_BSIZE);
+#ifdef DEBUGOPEN
+	printf("matcd%d: Media size %d\n",ldrive,size);
+#endif /*DEBUGOPEN*/
+		return(0);
+	}
+	return(-1);
+}
+
+/*---------------------------------------------------------------------------
+	matcd_probe - Search for host interface/adapters
+
+	The probe routine hunts for the first drive on the interface since
+	there is no way to locate just the adapter.   It also resets the
+	entire drive chain while it is there.  matcd_attach() takes care of
+	the rest of the initialization.
+
+	The probe routine can be compiled two ways.  In AUTOHUNT mode,
+	the kernel config file can say "port?" and we will check all ports
+	listed in the port_hint array (see above).  
+
+	Without AUTOHUNT set, the config file must list a specific port
+	address to check.  
+
+	Note that specifying the explicit addresses makes boot-up a lot
+	faster.
+
+	The probe will locate Panasonic/Creative interface on the following
+	Creative adapter boards:
+		#1330A	Sound Blaster PRO
+		#1730	Sound Blaster 16
+		#1740	Sound Blaster 16 (cost reduced)
+		#2230	Sound Blaster 16 (cost reduced)
+		#2770	Sound Blaster 16 Value (cost reduced)
+		#1810	omniCD upgrade kit adapter card (stand-alone CD)
+		#3100	PhoneBlaster SB16 + Sierra 14.4K modem combo
+	Creative releases a newer and cheaper-to-make Sound Blaster
+	board every few months, so by the original release date of this
+	software, there are probably 8 different board models called
+	Sound Blaster 16.  These include "Vibra", "Value", etc.
+
+	Please report additional part numbers and board descriptions 
+	and new port numbers that work to the author.
+
+---------------------------------------------------------------------------*/
+
+int matcd_probe(struct isa_device *dev)
+{
+	int	i,cdrive;
+	unsigned char	y;
+	int port = dev->id_iobase;	/*Take port hint from config file*/
+	cdrive=nextcontroller;		/*Controller defined by pass for now*/
+
+#if DIAGPORT == 0x302			/*<10>*/
+	DIAGOUT(0x300,0x00);		/*<10>Init diag board in case some
+					  other device probe scrambled it*/
+#endif /*<10>DIAGPORT*/
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0x60);		/*Show where we are*/
+#endif /*DIAGPORT*/
+	if (nextcontroller==NUMCTRLRS) {
+		printf("matcdc%d: - Too many interfaces specified in config\n",
+		       nextcontroller);
+		return(0);
+	}
+	if (nextcontroller==0) {	/*Very first time to be called*/
+		for (i=0; i<TOTALDRIVES; i++) {
+			matcd_data[i].drivemode=MODE_UNKNOWN;
+			matcd_data[i].flags=0;
+		}
+	}
+
+	i=nextcontroller*DRIVESPERC;	/*Precompute controller offset*/
+	for (y=0; y<DRIVESPERC; y++) {
+		matcd_data[i+y].flags=0;
+		matcd_data[i+y].config=0;
+	}
+
+#ifdef DEBUGPROBE
+	printf("matcdc%d: In probe i %d y %d port %x\n",
+	       nextcontroller,i,y,port);
+#endif /*DEBUGPROBE*/
+#ifdef AUTOHUNT
+#ifdef DEBUGPROBE
+	printf("matcd%d: size of port_hints %d\n",
+	       nextcontroller,sizeof(port_hints));
+#endif /*DEBUGPROBE*/
+	if (port==-1) {
+		for(i=0;i<(sizeof(port_hints)/sizeof(short));i++) {
+			port=port_hints[i];
+#ifdef DEBUGPROBE
+	printf("matcdc%d: Port hint %x\n",nextcontroller,port);
+#endif /*DEBUGPROBE*/
+			if (port==-1) {
+				dev->id_iobase=-1;	/*Put port ? back*/
+				return(0);/*Nothing left to try*/
+			}
+			if (port!=0) {	/*Untested port found*/
+				dev->id_iobase=port;
+				port_hints[i]=0;/*Don't use that port again*/
+				if (doprobe(port,cdrive)==0) return(NUMPORTS);
+			}
+		}
+		dev->id_iobase=-1;	/*Put port ? back as it was*/
+		return(0);		/*Interface not found*/
+
+	} else {			/*Config specified a port*/
+		i=0;			/*so eliminate it from the hint list*/
+		for(i=0;;i++) {		/*or we might try to assign it again*/
+			if (port_hints[i]== -1) break;	/*End of list*/
+			if (port_hints[i]==port) {
+				port_hints[i]=0;	/*Clear duplicate*/
+				break;
+			}
+		}
+		if (doprobe(port,cdrive)==0) return(NUMPORTS);
+		else return(0);
+	}
+#else /*AUTOHUNT*/
+	if (port==-1) {
+		printf("matcd%d: AUTOHUNT disabled but port? specified in config\n",
+		       nextcontroller);
+		return(0);
+	}
+	if (doprobe(port,cdrive)==0) return(NUMPORTS);
+	else return(0);
+#endif /*AUTOHUNT*/
+}
+
+/*---------------------------------------------------------------------------
+	doprobe - Common probe code that actually checks the ports we 
+		have decided to test.
+---------------------------------------------------------------------------*/
+
+int doprobe(int port,int cdrive)
+{
+	unsigned char cmd[MAXCMDSIZ];
+
+#ifdef RESETONBOOT
+	doreset(port,cdrive);		/*Reset what might be our device*/
+#endif /*RESETONBOOT*/
+	outb(port+PHASE,0);		/*<16>Guarantee status phase*/
+	zero_cmd(cmd);
+	cmd[0]=NOP;			/*A reasonably harmless command.
+				  	  This command will fail after
+				  	  power-up or after reset. That's OK*/
+#ifdef RESETONBOOT
+	if (((inb(port+STATUS) & (DTEN|STEN)) != (DTEN|STEN)) ||  /*<16>*/
+	    (inb(port+DATA) != 0xff))	/*<16>*/
+		return(1);		/*<16>Something detected but it isn't
+					      the device we wanted*/
+#endif /*RESETONBOOT*/
+	if (matcd_fastcmd(port,0,0,cmd)==0) {/*Issue command*/
+		inb(port+CMD);		/*Read status byte*/
+#ifdef DEBUGPROBE
+		printf("matcdc%d: Probe found something\n",nextcontroller);
+#endif /*DEBUGPROBE*/
+/*------Don't change anything below this line - see license -----------------*/
+		if (drivepresent==0) {	/*Don't change*/
+			printf("matcd - Matsushita (Panasonic) CD-ROM Driver by FDIV, %s\n",
+					/*Don't change*/
+		               MATCDVERSION); /*Don't change*/
+			drivepresent++;	/*Don't change*/
+			if (drivepresent==0) /*Don't change - make LINT happy*/
+				printf("%s\n",MATCDCOPYRIGHT); /*Don't change*/
+		}			/*Don't change*/
+/*------Don't change anything above this line - see license -----------------*/
+		return(0);		/*Drive 0 detected*/
+	}
+#ifdef DEBUGPROBE
+	printf("matcdc%d: Probe DID NOT find something\n",nextcontroller);
+#endif /*DEBUGPROBE*/
+	return(1);			/*Nothing detected*/
+}
+
+
+#ifdef FREE2
+/*---------------------------------------------------------------------------
+<12>	matcd_register - Something to handle dynamic driver loading.
+		Sorry for the lousy description but no one could point
+		me to anything that explained what it is for either.
+		Added in Edit 12.
+---------------------------------------------------------------------------*/
+
+static inline void matcd_register(struct isa_device *id)
+{
+	if(id->id_unit) {
+		kdc_matcd[id->id_unit]=kdc_matcd[0];
+	}
+	kdc_matcd[id->id_unit].kdc_unit=id->id_unit;
+	kdc_matcd[id->id_unit].kdc_isa=id;
+	dev_attach(&kdc_matcd[id->id_unit]);
+	return;
+}
+#endif /*FREE2*/
+
+
+/*---------------------------------------------------------------------------
+	matcd_attach - Locates drives on the adapters that were located.
+		If we got here, we located an interface and at least one
+		drive.  Now we figure out how many drives are under that
+		interface.  The Panasonic interface is too simple to call
+		it a controller, but in the existing PDP model, that is
+		what it would be.
+---------------------------------------------------------------------------*/
+
+int matcd_attach(struct isa_device *dev)
+{
+	int	i;
+	unsigned char	z,cdrive;
+	unsigned char cmd[MAXCMDSIZ];
+	unsigned char data[12];
+	struct matcd_data *cd;
+	int port = dev->id_iobase;	/*Take port ID selected in probe()*/
+
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0x70);		/*Show where we are*/
+#endif /*DIAGPORT*/
+#ifdef DEBUGPROBE
+	printf("matcdc: Attach dev %x id_unit %d\n",
+	       (unsigned int)dev,dev->id_unit);
+#endif /*DEBUGPROBE*/
+	for (cdrive=0; cdrive<4; cdrive++) {	/*We're hunting drives...*/
+		zero_cmd(cmd);
+		cmd[0]=NOP;		/*A reasonably harmless command.
+					  This command will fail after
+					  power-up or after reset. It's OK*/
+		i=cdrive+(DRIVESPERC*nextcontroller);
+		if (matcd_fastcmd(port,i,cdrive,cmd)==0) {	/*Issue cmd*/
+			z=get_stat(port,cdrive);/*Read status byte*/
+			if ((z & MATCD_ST_ERROR)) {	/*If there was an error,
+						  we must ask for error info
+						  or subsequent cmds fail*/
+				zero_cmd(cmd);
+				cmd[0]=READERROR;	/*Inquire*/
+				matcd_fastcmd(port,i,cdrive,cmd);
+				matcd_pread(port,8,data);/*Read data returned*/
+				z=get_stat(port,i);/*Read status byte*/
+#ifdef DEBUGPROBE
+				printf("matcd%d: Status byte %x ",i,z);
+#endif /*DEBUGPROBE*/
+			}
+			zero_cmd(cmd);
+			cmd[0]=READID;	/*Get drive ID*/
+			matcd_fastcmd(port,i,cdrive,cmd);
+			matcd_pread(port,10,data);/*Read Drive Parm*/
+			get_stat(port,i);	/*Read and toss status byte*/
+			data[10]=0;	/*Build ASCIZ string*/
+			printf("matcd%d: [%s]  ",i,data);
+			cd=&matcd_data[i];
+			cd->flags |= MATCDINIT;
+			cd->iobase=dev->id_iobase;
+			cd->openflags=0;
+			cd->volume[0]=cd->volume[1]=DEFVOL;	/*<12>*/
+					/*<12>Match volume drive resets to*/
+			cd->patch[0]=0x01;	/*<12>Channel 0 to Left*/
+			cd->patch[1]=0x02;	/*<12>Channel 1 to Right*/
+			cd->status=CD_AS_NO_STATUS;	/*<14>*/
+			for (i=0; i<MAXPARTITIONS; i++) {
+				cd->partflags[i]=0;
+			}
+		}
+	}
+	nextcontroller++;		/*Bump ctlr assign to next number*/
+	printf("\n");			/*End line of drive reports*/
+	return(1);
+}
+
+
+/*---------------------------------------------------------------------------
+	zero_cmd - Initialize command buffer
+---------------------------------------------------------------------------*/
+
+void zero_cmd(char * lcmd)
+{
+	int	i;
+	for (i=0; i<MAXCMDSIZ; lcmd[i++]=0);
+	return;
+}
+
+
+/*---------------------------------------------------------------------------
+	doreset - Resets all the drives connected to a interface
+---------------------------------------------------------------------------*/
+
+void doreset(int port,int cdrive)
+{
+	register int	i,z;
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0x80);		/*Show where we are*/
+#endif /*DIAGPORT*/
+	outb(port+RESET,0);		/*Reset what might be our device*/
+					/*Although this ensures a known
+					  state, it does close the drive
+					  door (if open) and aborts any
+					  audio playback in progress. */
+	for (i=0;i<(125*ISABUSKHZ);i++){/*DELAY 500msec minimum. Worst
+					  case is door open and none or
+					  unreadable media */
+		z=inb(port+CMD);	/*This makes the loop run at a
+					  known speed.  This value is ok
+					  for 8.33MHz bus*/
+	}
+	for (i=0;i<4;i++) {
+		matcd_data[(cdrive*4)+i].drivemode=MODE_UNKNOWN;
+	}
+	return;
+}
+
+
+/*---------------------------------------------------------------------------
+	matcd_fastcmd - Send a command to a drive
+
+	This routine executed commands that return instantly (or reasonably
+	quick), such as RESET, NOP, READ ERROR, etc.  The only difference
+	between it and handling for slower commands, is the slower commands
+	will invoke a timeout/sleep if they don't get an instant response.
+
+	Fastcmd is mainly used in probe(), attach() and error related
+	functions.  Every attempt should be made to NOT use this
+	function for any command that might be executed when the system
+	is up.
+---------------------------------------------------------------------------*/
+
+int matcd_fastcmd(int port,int ldrive,int cdrive,unsigned char * cp)
+{
+	unsigned int	i;
+	unsigned char	z;
+	int	level;
+#ifdef DEBUGCMD
+	unsigned char *cx;
+#endif /*DEBUGCMD*/
+
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0x90);		/*Show where we are*/
+#endif /*DIAGPORT*/
+
+
+	draincmd(port,cdrive,ldrive);	/*Make sure bus is really idle*/
+#ifdef DEBUGCMD
+	cx=cp;
+	printf("matcd%d: Fast Send port %x sel %d command %x %x %x %x %x %x %x\n",
+	       ldrive,port,cdrive,cx[0],cx[1],cx[2],cx[3],cx[4],cx[5],cx[6]);
+#endif	/*DEBUGCMD*/
+	selectdrive(port,cdrive);	/*Enable the desired target drive*/
+	level=splhigh();	/*----------------------------------------*/
+	for (i=0; i<7; i++) {		/*The seven bytes of the command*/
+		outb(port+CMD,*cp++);	/*must be sent within 10msec or*/
+	}				/*the drive will ignore the cmd*/
+	splx(level);	/*------------------------------------------------*/
+
+/*	Now we wait a maximum of 240msec for a response.
+	Only in a few rare cases does it take this long.
+	If it is longer, the command should probably be slept on
+	rather than increasing the timing value
+*/
+
+	for (i=0; i<(60*ISABUSKHZ); i++) {
+		z = (inb(port+STATUS)) & (DTEN|STEN);
+		if (z != (DTEN|STEN)) break;
+	}
+
+/*	We are now either in a data or status phase, OR we timed-out.*/
+
+	if (z == (DTEN|STEN)) {
+#ifdef DEBUGCMD
+		printf("matcd%d: Command time-out\n",ldrive);
+#endif /*DEBUGCMD*/
+		return(-1);
+	}
+	if (z != DTEN) {
+		return(1);
+	}
+	return(0);
+}
+
+
+/*---------------------------------------------------------------------------
+	matcd_slowcmd - Issue a command to the drive
+
+	This routine is for commands that might take a long time, such
+	as a read or seek.  The caller must determine if the command
+	completes instantly or schedule a poll later on.
+---------------------------------------------------------------------------*/
+
+void matcd_slowcmd(int port,int ldrive,int cdrive,unsigned char * cp)
+{
+	unsigned int	i;
+	int	level,size;
+#ifdef DEBUGCMD
+	unsigned char *cx;
+#endif /*DEBUGCMD*/
+
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0xa0);		/*Show where we are*/
+#endif /*DIAGPORT*/
+
+	draincmd(port,cdrive,ldrive);	/*Make sure bus is really idle*/
+
+#ifdef DEBUGCMD
+	cx=cp;
+	printf("matcd%d: Slow Send port %x sel %d command %x %x %x %x %x %x %x\n",
+	       ldrive,port,cdrive,cx[0],cx[1],cx[2],cx[3],cx[4],cx[5],cx[6]);
+#endif	/*DEBUGCMD*/
+	selectdrive(port,cdrive);	/*Enable the desired target drive*/
+	if (*cp==ABORT) size=1;
+	else size=7;
+	level=splhigh();	/*----------------------------------------*/
+	for (i=0; i<size; i++) {	/*The seven bytes of the command*/
+		outb(port+CMD,*cp++);	/*must be sent within 10msec or*/
+	}				/*the drive will ignore the cmd*/
+	splx(level);	/*------------------------------------------------*/
+	return;
+}
+
+
+/*---------------------------------------------------------------------------
+	draincmd - Makes certain the bus is idle and throws away
+		any residual data from the drive if there is any.
+		Called as preface to most commands.
+		Added in Edit 5.
+
+		This was added because switching drive modes causes
+		the drive to emit buffers that were meant to be sent
+		to the D-to-A to be sent to the host.  See setmode.
+---------------------------------------------------------------------------*/
+void draincmd(int port,int cdrive,int ldrive)
+{
+	int i,z;
+
+	i=inb(port+STATUS);
+	if (i==0xff) return;
+	
+	printf("matcd%d: in draincmd: bus not idle %x - trying to fix\n",
+	       ldrive,inb(port+STATUS));
+	if ((i & (DTEN|STEN)) == STEN) {
+#ifdef DEBUGCMD
+		printf("matcd%d: Data present READING - ",ldrive);
+#endif /*DEBUGCMD*/
+		i=0;
+		outb(port+PHASE,1);	/*<16>Enable data read*/
+		while ((inb(port+STATUS) & (DTEN|STEN)) == STEN) {
+			inb(port+DATA);
+			i++;
+		}
+		outb(port+PHASE,0);	/*<16>*/
+#ifdef DEBUGCMD
+		printf("%d bytes read\n",i);
+#endif /*DEBUGCMD*/
+	}
+#ifdef DEBUGCMD
+	printf("matcd%d: Now read status: ",ldrive);
+#endif /*DEBUGCMD*/
+	i=get_stat(port,ldrive);	/*Read status byte*/
+	z=inb(port+STATUS);		/*Read bus status*/
+#ifdef DEBUGCMD
+	printf("Data byte %x and status is now %x\n",i,z);
+#endif /*DEBUGCMD*/
+	if (z!=0xff) {
+		printf("matcd%d: Buss not idle %x - resetting\n",
+		       cdrive,inb(port+STATUS));
+		doreset(port,cdrive);
+	}
+	return;
+}
+
+
+/*---------------------------------------------------------------------------
+	selectdrive - Swaps drive select bits
+
+	On Creative SB/SB16/stand-alone adapters, possibly to make them
+	hard to reverse engineer, the drive select signals are swapped.
+---------------------------------------------------------------------------*/
+
+void selectdrive(int port,int drive)
+{
+	switch(drive) {
+	case 0:				/*0x00 -> 0x00*/
+		outb(port+SELECT,CRDRIVE0);
+		break;
+	case 1:				/*0x01 -> 0x02*/
+		outb(port+SELECT,CRDRIVE1);
+		break;
+	case 2:				/*0x02 -> 0x01*/
+		outb(port+SELECT,CRDRIVE2);
+		break;
+	case 3:				/*0x03 -> 0x03*/
+		outb(port+SELECT,CRDRIVE3);
+		break;
+	}
+	return;
+}
+
+
+/*---------------------------------------------------------------------------
+	matcd_pread - Read small blocks of control data from a drive
+---------------------------------------------------------------------------*/
+
+void matcd_pread(int port, int count, unsigned char * data) 
+{
+	int	i;
+
+	for (i=0; i<count; i++) {
+		*data++ = inb(port+CMD);
+	}
+	return;
+}
+
+
+/*---------------------------------------------------------------------------
+	matcd_setmode - Configures disc to run in the desired data mode
+
+	This routine assumes the drive is already idle.
+
+NOTE -	Undocumented action of hardware:  If you change (or reaffirm) data
+	modes with MODESELECT + BLOCKPARAM immediately after a command was
+	issued that aborted a DA play operation, the drive will unexpectedly
+	return 2532 bytes of data in a data phase on the first or second
+	subsequent command.
+
+	Original Symptom: drive will refuse to go idle after reading data
+	and status expected for a command.  State mechanics for this are
+	not fully understood.
+---------------------------------------------------------------------------*/
+
+int matcd_setmode(int ldrive, int mode)
+{
+	struct	matcd_data *cd;
+	int retries;
+	int i,port,cdrive;
+	unsigned char cmd[MAXCMDSIZ];
+
+	cd = matcd_data + ldrive;
+	retries=3;
+	cdrive=ldrive&0x03;
+	port=cd->iobase;
+	if (cd->drivemode==mode) {
+		return(0);		/*Drive already set*/
+	}
+
+/*	The drive is not in the right mode, so we need to set it.
+*/
+
+	zero_cmd(cmd);
+	cmd[0]=MODESELECT;		/*Set drive transfer modes*/
+/*	cmd[1]=BLOCKPARAM;		  BLOCKPARAM==0*/
+	cmd[2]=mode;
+	switch(mode) {
+	case MODE_DATA:
+		cmd[3]=0x08;		/*2048 bytes*/
+		break;
+	case MODE_USER:
+		cmd[3]=0x09;		/*2352 bytes*/
+		cmd[4]=0x30;
+		break;
+	case MODE_DA:
+		cmd[3]=0x09;		/*2352 bytes*/
+		cmd[4]=0x30;
+		break;
+	}
+	i=0;
+	while(retries-- > 0) {
+		i=matcd_fastcmd(port,ldrive,cdrive,cmd);
+		get_stat(port,ldrive);	/*Read and toss status byte*/
+		if (i==0) {
+			cd->drivemode=mode;	/*Set new mode*/
+			return(i);
+		}
+		get_error(port,ldrive,cdrive);
+	}
+	cd->drivemode=MODE_UNKNOWN;	/*We failed*/
+	return(i);
+}
+
+
+/*---------------------------------------------------------------------------
+	matcd_volinfo - Read information from disc Table of Contents
+---------------------------------------------------------------------------*/
+
+static	int	matcd_volinfo(int ldrive)
+{
+	struct	matcd_data *cd;
+	int	port,i;
+	int	z,cdrive;
+	int	retry;
+	unsigned char cmd[MAXCMDSIZ];
+	unsigned char data[12];
+
+	retry=10;			/*<16>This may take a long time*/
+	cd = &matcd_data[ldrive];
+	cdrive=ldrive&0x03;
+	port=cd->iobase;
+
+#ifdef DEBUGOPEN
+	printf("matcd%d: In volinfo, port %x\n",ldrive,port);
+#endif /*DEBUGOPEN*/
+
+	while(retry>0) {
+#ifdef DIAGPORT
+		DIAGOUT(DIAGPORT,0xB0);	/*Show where we are*/
+#endif /*DIAGPORT*/
+		zero_cmd(cmd);
+		cmd[0]=READDINFO;	/*Read Disc Info*/
+		matcd_slowcmd(port,ldrive,cdrive,cmd);
+		i=waitforit(10*TICKRES,DTEN,port,"volinfo");
+		if (i) {		/*THIS SHOULD NOT HAPPEN*/
+			z=get_stat(port,ldrive);/*Read status byte*/
+			printf("matcd%d: command failed, status %x\n",
+			       ldrive,z);
+			return(-1);
+		}
+		matcd_pread(port, 6, data);	/*Read data returned*/
+		z=get_stat(port,ldrive);/*Read status byte*/
+#ifdef DEBUGOPEN
+		printf("matcd%d: Data got was %x %x %x %x %x %x   ",ldrive,
+		       data[0],data[1],data[2], data[3],data[4],data[5]);
+		printf("status byte %x\n",z);
+#endif	/*DEBUGOPEN*/
+		if ((z & MATCD_ST_ERROR)==0)	
+			break;		/*No Error*/
+
+/*	If media change or other error, you have to read error data or
+	the drive will reject subsequent commands.
+*/
+
+		if (chk_error(get_error(port, ldrive, cdrive))==ERR_FATAL) { 
+#ifdef DEBUGOPEN
+			printf("matcd%d: command failed, status %x\n",
+			       ldrive,z);
+#endif /*DEBUGOPEN*/
+			return(-1);
+		}
+		timeout((timeout_func_t)watchdog, (caddr_t)0,hz);/*<16>*/
+		tsleep((caddr_t)&nextcontroller, PRIBIO, "volinfo2", 0);/*<16>*/
+		if ((--retry)==0) return(-1);
+#ifdef DEBUGOPEN
+		printf("matcd%d: Retrying",ldrive);
+#endif /*DEBUGOPEN*/
+	}
+#ifdef DEBUGOPEN
+	printf("matcd%d: Status port %x  \n",ldrive,inb(port+STATUS));
+#endif /*DEBUGOPEN*/
+
+	cd->volinfo.type=data[0];
+	cd->volinfo.trk_high=data[2];
+	cd->volinfo.trk_low=data[1];
+	cd->volinfo.vol_msf[0]=data[3];
+	cd->volinfo.vol_msf[1]=data[4];
+	cd->volinfo.vol_msf[2]=data[5];
+
+	if (cd->volinfo.trk_low + cd->volinfo.trk_high) {
+		cd->flags |= MATCDLABEL;
+		return(0);
+	}
+	return(-1);
+}
+
+
+/*---------------------------------------------------------------------------
+	blk_to_msf - Convert block numbers into CD disk block ids	
+---------------------------------------------------------------------------*/
+
+static void blk_to_msf(int blk, unsigned char *msf)
+{
+	blk=blk+150;			/*2 seconds skip required to
+					  reach ISO data*/
+	msf[0]=blk/4500;
+	blk=blk%4500;
+	msf[1]=blk/75;
+	msf[2]=blk%75;
+	return;
+}
+
+
+/*---------------------------------------------------------------------------
+	msf_to_blk - Convert CD disk block ids into block numbers
+---------------------------------------------------------------------------*/
+
+static int msf_to_blk(unsigned char * cd)
+{
+	return(((cd[0]*60)		/*Convert MSF to*/
+	       +cd[1])*75		/*Blocks minus 2*/
+	       +cd[2]-150);		/*seconds*/
+}
+	
+
+/*---------------------------------------------------------------------------
+	matcd_blockread - Performs actual background disc I/O operations
+
+	This routine is handed the block number to read, issues the
+	command to the drive, waits for it to complete, reads the
+	data or error, retries if needed, and returns the results
+	to the host.
+---------------------------------------------------------------------------*/
+
+static void matcd_blockread(int state)
+{
+	struct	matcd_mbx *mbx;
+	int	ldrive,cdrive;
+	int	port;
+	struct	buf *bp;
+	struct	buf *dp;
+	struct	matcd_data *cd;
+	int	i;
+	struct	matcd_read2 rbuf;
+	int	blknum;
+	caddr_t addr;
+	int	status;
+	int	errtyp;
+	int	phase;
+	unsigned char cmd[MAXCMDSIZ];
+
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0xC0 + (diagloop * 0x100));/*Show where we are*/
+#endif /*DIAGPORT*/
+	mbx = &matcd_data[state & 0x0f].mbx;
+	ldrive=mbx->ldrive;		/*ldrive is logical drive #*/
+	cdrive=ldrive & 0x03;		/*cdrive is drive # on a controller*/
+	port=mbx->port;			/*port is base port for i/f*/
+	bp= mbx->bp;
+	cd=&matcd_data[ldrive];
+
+	dp=&request_head[mbx->controller];
+
+#ifdef DEBUGIO
+	printf("matcd%d: Show state %x cdrive %d partition %d\n",
+	       ldrive,state,cdrive,mbx->partition);
+#endif /*DEBUGIO*/
+
+loop:
+#ifdef DEBUGIO
+	printf("matcd%d: Top  dp %x\n",ldrive,(unsigned int)dp);
+#endif /*DEBUGIO*/
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0xCF + (diagloop * 0x100));/*Show where we are*/
+#endif /*DIAGPORT*/
+	switch (state & 0xf0) {
+	case	MATCD_READ_1:
+#ifdef DEBUGIO
+		printf("matcd%d: State 1 cd->flags %x\n",ldrive,cd->flags);
+#endif /*DEBUGIO*/
+#ifdef DIAGPORT
+		diagloop=0;
+		DIAGOUT(DIAGPORT,0xC1);	/*Show where we are*/
+#endif /*DIAGPORT*/
+		/* to check for raw/cooked mode */
+		if (cd->partflags[mbx->partition] & MATCDREADRAW) {
+			mbx->sz = MATCDRBLK;
+			i=matcd_setmode(ldrive, MODE_DA);
+#ifdef DEBUGIO
+			printf("matcd%d: Set MODE_DA result %d\n",ldrive,i);
+#endif /*DEBUGIO*/
+		} else {
+			mbx->sz = cd->blksize;
+			i=matcd_setmode(ldrive, MODE_DATA);
+#ifdef DEBUGIO
+			printf("matcd%d: Set MODE_DATA result %d\n",ldrive,i);
+#endif /*DEBUGIO*/
+		}
+		/*for first block*/
+#ifdef DEBUGIO
+		printf("matcd%d: A mbx %x bp %x b_bcount %x sz %x\n",
+		       ldrive,(unsigned int)mbx,(unsigned int)bp,
+		       (unsigned int)bp->b_bcount,mbx->sz);
+#endif /*DEBUGIO*/
+		mbx->nblk = (bp->b_bcount + (mbx->sz-1)) / mbx->sz;
+		mbx->skip=0;
+nextblock:
+#ifdef DEBUGIO
+		printf("matcd%d: at Nextblock b_blkno %d\n",
+		       ldrive,(unsigned int)bp->b_blkno);
+#endif /*DEBUGIO*/
+
+		blknum=(bp->b_blkno / (mbx->sz/DEV_BSIZE))
+		       + mbx->p_offset + mbx->skip/mbx->sz; 
+
+		blk_to_msf(blknum,rbuf.start_msf);
+			
+		zero_cmd(cmd);
+		cmd[0]=READ;		/*Get drive ID*/
+		cmd[1]=rbuf.start_msf[0];
+		cmd[2]=rbuf.start_msf[1];
+		cmd[3]=rbuf.start_msf[2];
+		cmd[6]=1;		/*Xfer only one block*/
+		matcd_slowcmd(port,ldrive,cdrive,cmd);
+
+/*	Now that we have issued the command, check immediately to
+	see if data is ready.   The drive has read-ahead caching, so
+	it is possible the data is already in the drive buffer.
+
+	If the data is not ready, schedule a wakeup and later on this
+	code will run again to see if the data is ready then.
+*/
+
+	case MATCD_READ_2:
+		state=MATCD_READ_2+ldrive;
+		phase = (inb(port+STATUS)) & (DTEN|STEN);
+#ifdef DEBUGIO
+		printf("matcd%d: In state 2 status %x  ",ldrive,phase);
+#endif /*DEBUGIO*/
+#ifdef DIAGPORT
+		DIAGOUT(DIAGPORT,0xC2 + (diagloop++ * 0x100));/*Show where we are*/
+#endif /*DIAGPORT*/
+		switch(phase) {
+		case (DTEN|STEN):	/*DTEN==H  STEN==H*/
+#ifdef DEBUGIO
+			printf("matcd%d: Sleeping\n",ldrive);
+#endif /*DEBUGIO*/
+			timeout((timeout_func_t)matcd_blockread,
+				(caddr_t)MATCD_READ_2+ldrive,hz/100);
+			return;
+
+
+		case	STEN:		/*DTEN=L STEN=H*/
+		case	0:		/*DTEN=L STEN=L*/
+#ifdef DEBUGIO
+			printf("matcd%d: Data Phase\n",ldrive);
+#endif /*DEBUGIO*/
+			outb(port+PHASE,1);	/*Enable data read*/
+			addr=bp->b_un.b_addr + mbx->skip;
+#ifdef DEBUGIO
+			printf("matcd%d: Xfer Addr %x  size %x",
+			       ldrive,(unsigned int)addr,mbx->sz);
+#endif /*DEBUGIO*/
+			i=0;
+			while(inb(port+STATUS)==0xfd) {
+				*addr++=inb(port+DATA);
+				i++;
+			}
+#ifdef DEBUGIO
+			printf("matcd%d: Read %d bytes\n",ldrive,i);
+#endif /*DEBUGIO*/
+			outb(port+PHASE,0);	/*Disable data read*/
+
+
+/*	Now, wait for the Status phase to arrive.   This will also
+	tell us if any went wrong with the request.
+*/
+			while((inb(port+STATUS)&(DTEN|STEN)) != DTEN);
+			status=get_stat(port,ldrive);	/*Read status byte*/
+#ifdef DEBUGIO
+			printf("matcd%d: Status port %x byte %x  ",
+			       ldrive,i,status);
+#endif /*DEBUGIO*/
+			if (status & MATCD_ST_ERROR) {
+				i=get_error(port,ldrive,cdrive);
+				printf("matcd%d: %s while reading block %d [Soft]\n",
+				       ldrive,matcderrors[i],(int)bp->b_blkno);
+				media_chk(cd,i,ldrive,0);/*<14>was wrong place*/
+			}
+
+			if (--mbx->nblk > 0) {
+				mbx->skip += mbx->sz;
+				goto nextblock;	/*Oooooh, you flunk the course*/
+			}
+			bp->b_resid=0;
+			biodone(bp);	/*Signal transfer complete*/
+	
+			unlockbus(ldrive>>2, ldrive);	/*Release bus lock*/
+			matcd_start(dp);/*See if other drives have work*/
+			return;
+	
+/*	Here we skipped the data phase and went directly to status.
+	This indicates a hard error.
+*/
+
+		case	DTEN:		/*DTEN=H STEN=L*/
+			status=get_stat(port,ldrive);	/*Read status byte*/
+#ifdef DEBUGIO
+			printf("matcd%d: error, status was %x\n",
+			       ldrive,status);
+#endif /*DEBUGIO*/
+
+/*	Ok, we need more details, so read error.  This is needed to issue
+	any further commands anyway
+*/
+
+			errtyp=get_error(port,ldrive,cdrive);
+			printf("matcd%d: %s while reading block %d\n",
+				ldrive,matcderrors[errtyp],(int)bp->b_blkno);
+
+			if (media_chk(cd,errtyp,ldrive,0)==0) {
+				errtyp=chk_error(errtyp);
+				if (errtyp==ERR_RETRY) {/*<14>We can retry*/
+					/*<14>this error but the drive*/
+					/*<14>probably has already*/
+					if (mbx->retry-- > 0 ) {
+						state=MATCD_READ_1+ldrive;
+#ifdef DEBUGIO
+						printf("matcd%d: Attempting retry\n",
+						ldrive);
+#endif /*DEBUGIO*/
+						goto loop;
+					}
+				}
+			}
+/*<14>	The other error types are either something very bad or the media
+<14>	has been removed by the user.  In both cases there is no retry
+<14>	for this call.  We will invalidate the label in both cases.
+*/
+#ifdef DIAGPORT
+			DIAGOUT(DIAGPORT,0xCE + (diagloop * 0x100));/*Show where we are*/
+#endif /*DIAGPORT*/
+			bp->b_flags |= B_ERROR;
+			bp->b_resid = bp->b_bcount;
+			biodone(bp);
+			unlockbus(ldrive>>2, ldrive);
+			matcd_start(dp);
+			return;
+		}
+	}
+}
+
+
+/*---------------------------------------------------------------------------
+	docmd - Get the bus, do the command, wait for completion,
+		attempt retries, give up the bus.
+		For commands that do not return data.
+---------------------------------------------------------------------------*/
+
+int docmd(char * cmd, int ldrive, int cdrive, int controller, int port)
+{
+	int retries,i,z;
+
+	lockbus(controller, ldrive);	/*Request bus*/
+	retries=3;
+	while(retries-- > 0) {
+#ifdef DIAGPORT
+		DIAGOUT(DIAGPORT,0xD0);	/*Show where we are*/
+#endif /*DIAGPORT*/
+		matcd_slowcmd(port,ldrive,cdrive,cmd);
+		i=waitforit(80*TICKRES,DTEN,port,"cmd");
+		z=get_stat(port,ldrive);/*Read status byte*/
+		if ((z & MATCD_ST_ERROR)==0) break;
+		i=chk_error(get_error(port,ldrive,cdrive));
+		if (i!=ERR_INIT) {
+			unlockbus(controller, ldrive);	/*Release bus*/
+			return(EFAULT);
+		}
+	}
+	unlockbus(controller, ldrive);	/*Release bus*/
+	return(i);
+}
+
+
+/*---------------------------------------------------------------------------
+	get_error - Read the error that aborted a command.
+	Created in Edit 6
+---------------------------------------------------------------------------*/
+
+int get_error(int port, int ldrive, int cdrive)
+{
+	int	status,errnum;
+	unsigned char cmd1[MAXCMDSIZ];
+	unsigned char data[12];
+
+	zero_cmd(cmd1);
+	cmd1[0]=READERROR;		/*Enquire*/
+	matcd_fastcmd(port,ldrive,cdrive,cmd1);
+	matcd_pread(port, 8, data);	/*Read data returned*/
+	errnum=data[2];			/*Caller wants it classified*/
+	status=get_stat(port,ldrive);	/*Read status byte*/
+
+#ifdef DEBUGCMD
+	printf("matcd%d: Chkerror found %x on command %x addrval %x statusdata %x statusport %x\n",
+		ldrive,errnum,data[1],data[0],status,inb(port+STATUS));
+#endif /*DEBUGCMD*/
+	return(errnum);
+}
+
+
+/*---------------------------------------------------------------------------
+	chk_error - Classify the error that the drive reported
+	Created in Edit 6
+---------------------------------------------------------------------------*/
+
+int chk_error(int errnum)
+{
+	switch(errnum) {
+/*	These are errors we can attempt a retry for, although the drive
+	has already done so.
+*/
+	case	UNRECV_ERROR:
+	case	SEEK_ERROR:
+	case	TRACK_ERROR:
+	case	FOCUS_ERROR:
+	case	CLV_ERROR:
+	case	DATA_ERROR:
+	case	MODE_ERROR:		/*<16>Make this retryable*/
+		return(ERR_RETRY);
+
+/*	These errors usually indicate the user took the media from the
+	drive while the dev was open.  We will invalidate the unit
+	until it closes when we see this.
+*/
+	case	NOT_READY:
+	case	MEDIA_CHANGED:
+	case	DISC_OUT:
+	case	HARD_RESET:
+		return	(ERR_INIT);
+			
+/*	These errors indicate the system is confused about the drive
+	or media, and point to bugs in the driver or OS.  These errors
+	cannot be retried since you will always get the same error.
+*/
+
+	case	RAM_ERROR:
+	case	DIAG_ERROR:
+	case	CDB_ERROR:
+	case	END_ADDRESS:
+	case	ILLEGAL_REQ:
+	case	ADDRESS_ERROR:
+	default:
+		return	(ERR_FATAL);
+	}
+}
+
+
+/*---------------------------------------------------------------------------
+	get_stat - Reads status byte
+
+	This routine should be totally unnecessary, performing the
+	task with a single line of in-line code.  However in special
+	cases, the drives return blocks of data that are not associated
+	with the command in question.  This appears to be at least one
+	firmware error and the rest of the driver makes an effort to avoid
+	triggering the fault.  However, reading and throwing this
+	bogus data is faster and less destructive than resetting all
+	the drives on a given controller, plus it leaves the other drives
+	unaffected.
+---------------------------------------------------------------------------*/
+	
+int get_stat(int port,int ldrive)
+{
+	int 	status,busstat;		/*<16>*/
+	status=inb(port+DATA);		/*Read status byte, last step of cmd*/
+	busstat=inb(port+STATUS);	/*<16>Get bus status - should be 0xff*/
+	while (busstat!=0xff) {	/*<16>*/
+		printf("matcd%d: get_stat: After reading status byte, bus didn't go idle %x %x %x\n",ldrive,status,busstat,port);	/*<16>*/
+		if (( busstat & (DTEN|STEN)) == STEN) {	/*<16>*/
+			int k;
+			k=0;
+#ifdef DEBUGCMD
+			printf("matcd%d: DATA PRESENT!!!! DISCARDING\n",ldrive);
+#endif /*DEBUGCMD*/
+			outb(port+PHASE,1);	/*Enable data read*/
+			while ((inb(port+STATUS) & (DTEN|STEN)) == STEN) {
+				inb(port+DATA);
+/*				printf("%2x ",inb(port+DATA));*/
+				k++;
+			}
+			outb(port+PHASE,0);
+#ifdef DEBUGCMD
+			printf("\nmatcd%d: BYTES READ IN DATA was %d\n",
+			       ldrive,k);
+#endif /*DEBUGCMD*/
+		}
+		status=inb(port+DATA);	/*Read the status byte again*/
+#ifdef DEBUGCMD
+		printf("matcd%d: Next status byte is %x\n",ldrive,status);
+#endif /*DEBUGCMD*/
+		busstat=inb(port+STATUS);	/*<16>*/
+	}
+	return(status);
+}
+
+
+/*---------------------------------------------------------------------------
+	waitforit - Waits for a command started by slowcmd to complete.
+---------------------------------------------------------------------------*/
+
+int waitforit(int timelimit, int state, int port, char * where)
+{
+	int i,j;
+
+	j=i=0;
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0xE0);		/*Show where we are*/
+	diagloop=0;
+#endif /*DIAGPORT*/
+#ifdef DEBUGCMD
+	printf("matcd: waitforit port %x timelimit %x hz %x\n",
+	       port,timelimit,hz);
+#endif /*DEBUGCMD*/
+	while (i<timelimit) {
+		j=inb(port+STATUS) & (STEN|DTEN);	/*Read status*/
+		if (j!=(STEN|DTEN)) break;
+		timeout((timeout_func_t)watchdog, (caddr_t)0,hz/100);
+		tsleep((caddr_t)&nextcontroller, PRIBIO, where, 0);
+		i++;
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0xE1+(diagloop++ * 0x100));	/*Show where we are*/
+#endif /*DIAGPORT*/
+	}
+#ifdef DEBUGCMD
+	printf("matcd: Count was %d\n",i);
+#endif /*DEBUGCMD*/
+	if (j==state) return(0);	/*Command complete*/
+#ifdef DEBUGCMD
+	printf("matcd: Timeout!");
+#endif /*DEBUGCMD*/
+	return(1);			/*Timeout occurred*/
+}
+
+
+/*---------------------------------------------------------------------------
+	watchdog - Gives us a heartbeat for things we are waiting on
+---------------------------------------------------------------------------*/
+
+static void watchdog(int state, char * foo)
+{
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0xF0);		/*Show where we are*/
+#endif /*DIAGPORT*/
+	wakeup((caddr_t)&nextcontroller);
+	return;
+}
+
+
+/*---------------------------------------------------------------------------
+	lockbus - Wait for the bus on the requested driver interface
+		to go idle and acquire it.
+	Created in Edit 6
+---------------------------------------------------------------------------*/
+
+void lockbus(int controller, int ldrive)
+{
+	while ((if_state[controller] & BUSSBUSY)) {
+#ifdef DEBUGSLEEP
+		printf("matcd%d: Can't do it now - going to sleep\n",
+		       ldrive);
+#endif /*DEBUGSLEEP*/
+#ifdef DIAGPORT
+		DIAGOUT(DIAGPORT,0xF1);	/*Show where we are*/
+#endif /*DIAGPORT*/
+		tsleep((caddr_t)&matcd_data->status, PRIBIO,
+		       "matcdopen", 0);
+	}
+	if_state[controller] |= BUSSBUSY;	/*It's ours NOW*/
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0xF2);		/*Show where we are*/
+#endif /*DIAGPORT*/
+#ifdef DEBUGSLEEP
+	printf("matcd%d: BUSS locked in lockbus\n",ldrive);
+#endif /*DEBUGSLEEP*/
+}
+
+
+/*---------------------------------------------------------------------------
+	unlockbus - Release the host interface bus we already have so
+		someone else can use it.
+	Created in Edit 6
+---------------------------------------------------------------------------*/
+
+void unlockbus(int controller, int ldrive)
+{
+#ifdef DIAGPORT
+	DIAGOUT(DIAGPORT,0xF4);		/*Show where we are*/
+#endif /*DIAGPORT*/
+	if_state[controller] &= ~BUSSBUSY;
+#ifdef DEBUGSLEEP
+	printf("matcd%d: busunlocked\n",ldrive);
+#endif /*DEBUGSLEEP*/
+	wakeup((caddr_t)&matcd_data->status);	/*Wakeup other users*/
+	matcd_start(&request_head[controller]);	/*Wake up any block I/O*/
+}
+
+
+/*---------------------------------------------------------------------------
+	media_chk - 	Checks error for types related to media
+			changes.
+---------------------------------------------------------------------------*/
+
+int media_chk(struct matcd_data *cd,int errnum,int ldrive,int test)
+{
+	if (errnum==NOT_READY ||
+	    errnum==MEDIA_CHANGED ||
+	    errnum==HARD_RESET ||
+	    errnum==DISC_OUT) {
+		cd->flags &= ~MATCDLABEL;	/*Mark label as invalid*/
+		if (test==0) {		/*<14>Do warn by default*/
+
+			if ((cd->flags & MATCDWARN)==0) {/*<14>Msg already?*/
+				printf("matcd%d: Media changed - Further I/O aborted until device closed\n",ldrive);
+				cd->flags |= MATCDWARN;
+			}
+		}
+		return(1);
+	}
+	if (errnum==MODE_ERROR)			/*<16>Maybe the setting is*/
+		cd->drivemode=MODE_UNKNOWN;	/*<16>wrong so force a reset*/
+	return(0);
+}
+
+
+/*---------------------------------------------------------------------------
+	matcd_eject - Open drive tray
+---------------------------------------------------------------------------*/
+
+int matcd_eject(int ldrive, int cdrive, int controller)
+{
+	int	 i,port;
+	struct	matcd_data *cd;
+	unsigned	char	cmd[MAXCMDSIZ];
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;		/*Get I/O port base*/
+
+#ifdef LOCKDRIVE
+	if (cd->flags & MATCDLOCK) {	/*<15>Drive was locked via open*/
+		return(EINVAL);		/*<15>so don't allow the eject*/
+	}
+#endif /*LOCKDRIVE*/
+	zero_cmd(cmd);			/*Initialize command buffer*/
+	cmd[0]=LOCK;			/*Unlock drive*/
+	i=docmd(cmd,ldrive,cdrive,controller,port);	/*Issue command*/
+	cmd[0]=DOOROPEN;		/*Open Door*/
+	i=docmd(cmd,ldrive,cdrive,controller,port);	/*Issue command*/
+	cd->flags &= ~(MATCDLABEL|MATCDLOCK);	/*<15>Mark vol info invalid*/
+	return(i);			/*Return result we got*/
+}
+
+
+/*---------------------------------------------------------------------------
+	matcd_doorclose - Close drive tray
+<16>	Added in Edit 16
+---------------------------------------------------------------------------*/
+
+int matcd_doorclose(int ldrive, int cdrive, int controller)
+{
+	int	 i,port;
+	struct	matcd_data *cd;
+	unsigned	char	cmd[MAXCMDSIZ];
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;		/*Get I/O port base*/
+
+	zero_cmd(cmd);			/*Initialize command buffer*/
+	cmd[0]=DOORCLOSE;		/*Open Door*/
+	i=docmd(cmd,ldrive,cdrive,controller,port);	/*Issue command*/
+	cd->flags &= ~(MATCDLABEL|MATCDLOCK);	/*Mark vol info invalid*/
+	timeout((timeout_func_t)watchdog, (caddr_t)0,hz);
+	tsleep((caddr_t)&nextcontroller, PRIBIO, "doorclose", 0);
+	return(i);			/*Return result we got*/
+}
+
+
+/*---------------------------------------------------------------------------
+	matcd_toc_header - Return Table of Contents header to caller
+<13>	New for Edit 13
+---------------------------------------------------------------------------*/
+
+static int matcd_toc_header(int ldrive, int cdrive, int controller,
+		       struct ioc_toc_header * toc)
+{
+	struct	matcd_data *cd;
+
+	cd=&matcd_data[ldrive];
+	if ((cd->flags & MATCDLABEL)==0)
+		return(EIO);		/*Refuse after chg error*/
+
+	toc->len=msf_to_blk(cd->volinfo.vol_msf);	/*In frames*/
+	toc->starting_track=cd->volinfo.trk_low;	/*1*/
+	toc->ending_track=cd->volinfo.trk_high;		/*Last track*/
+
+	return(0);
+
+}
+
+
+/*---------------------------------------------------------------------------
+	matcd_toc_entries - Read all of the TOC entries
+
+	These entries are cached by the drive, but it might be worth
+	the space investment to have the driver cache these as well.
+	For a disc with 40 tracks, it means 41 command calls to get
+	this information from the drive.
+<13>	New for Edit 13
+---------------------------------------------------------------------------*/
+
+static int matcd_toc_entries(int ldrive, int cdrive, int controller,
+			     struct ioc_read_toc_entry * ioc_entry)
+{
+	struct	matcd_data *cd;
+	struct	cd_toc_entry	entries[MAXTRKS];
+	int	trk,i,z,port;
+	unsigned char cmd[MAXCMDSIZ];
+	unsigned char data[5];
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;
+
+	if ((cd->flags & MATCDLABEL)==0)
+		return(EIO);		/*Refuse after chg error*/
+
+	zero_cmd(cmd);
+	cmd[0]=READTOC;
+
+	for(trk=cd->volinfo.trk_low-1; trk<cd->volinfo.trk_high; trk++) {
+		cmd[2]=trk+1;
+		lockbus(controller, ldrive);	/*Request bus*/
+		matcd_slowcmd(port,ldrive,cdrive,cmd);
+		i=waitforit(10*TICKRES,DTEN,port,"sense");
+		matcd_pread(port, 8, data);	/*Read data returned*/
+		z=get_stat(port,ldrive);	/*Read status byte*/
+		if ((z & MATCD_ST_ERROR)) {	/*Something went wrong*/
+			i=get_error(port, ldrive, cdrive);
+			unlockbus(controller, ldrive);	/*Release bus*/
+			return(EIO);
+		}
+		unlockbus(controller, ldrive);	/*Release bus*/
+
+#ifdef DEBUGIOCTL
+		printf("Track %d addr/ctrl %x  m %x s %x f %x\n",data[2],
+		       data[1],data[4],data[5],data[6]);
+#endif /*DEBUGIOCTL*/
+
+		entries[trk].control=data[1];	/*Track type*/
+		entries[trk].addr_type=ioc_entry->address_format;/*Type*/
+		entries[trk].track=data[2];	/*Track #, can be Out of Order*/
+		if (ioc_entry->address_format == CD_MSF_FORMAT) {
+			entries[trk].addr.msf.unused=0;
+			entries[trk].addr.msf.minute=data[4];	/*Min*/
+			entries[trk].addr.msf.second=data[5];	/*Sec*/
+			entries[trk].addr.msf.frame=data[6];	/*Frame*/
+		}
+	}
+	entries[trk].control=data[2];	/*Copy from last valid track*/
+	entries[trk].track=0xaa;	/*Lead-out*/
+	entries[trk].addr.msf.unused=0;	/*Fill*/
+	entries[trk].addr.msf.minute=cd->volinfo.vol_msf[0];
+	entries[trk].addr.msf.second=cd->volinfo.vol_msf[1];
+	entries[trk].addr.msf.frame=cd->volinfo.vol_msf[2];
+	trk++;				/*Bump to include leadout track*/
+
+
+/*	Now that we have read all the data from the drive, copy the
+	array from the kernel address space into the user address space
+*/
+
+	if (copyout(entries, ioc_entry->data,
+	    (trk)*sizeof(struct cd_toc_entry)) != 0) {
+		return(EFAULT);
+	}
+	return(0);
+
+}
+
+/*---------------------------------------------------------------------------
+	matcd_subq - Read the Sub-Q packet - (where are we?)
+
+	This call gives a snapshot state of where the optical
+	pick-up is when the command is issued.
+<14>	New for Edit 14
+---------------------------------------------------------------------------*/
+
+static int matcd_read_subq(int ldrive, int cdrive, int controller,
+			     struct ioc_read_subchannel * sqp)
+{
+	struct	matcd_data *cd;
+	int	i,z,port;
+	unsigned char cmd[MAXCMDSIZ];
+	unsigned char data[12];
+	struct cd_sub_channel_info subq;	/*Build result here*/
+
+	cd=&matcd_data[ldrive];
+	port=cd->iobase;
+
+	if ((cd->flags & MATCDLABEL)==0)
+		return(EIO);		/*Refuse after chg error*/
+
+/*	We only support the ioctl functions we could get information
+	on, so test for the things we can do
+*/
+	
+	if (sqp->data_format!=CD_CURRENT_POSITION ||
+	    sqp->address_format!=CD_MSF_FORMAT) {
+		return(EINVAL);
+	}
+
+	zero_cmd(cmd);
+	cmd[0]=READSUBQ;
+	lockbus(controller, ldrive);	/*Request bus*/
+	matcd_slowcmd(port,ldrive,cdrive,cmd);
+
+/*	While we wait, fill in the hard-coded entries of the table*/
+
+	subq.what.position.data_format=CD_MSF_FORMAT;
+	subq.what.position.absaddr.msf.unused=0;
+	subq.what.position.reladdr.msf.unused=0;
+
+	i=waitforit(10*TICKRES,DTEN,port,"sense");
+	matcd_pread(port, 11, data);	/*Read data returned*/
+	z=get_stat(port,ldrive);	/*Read status byte*/
+	if ((z & MATCD_ST_ERROR)) {	/*Something went wrong*/
+		i=get_error(port, ldrive, cdrive);
+		unlockbus(controller, ldrive);	/*Release bus*/
+		return(EIO);
+	}
+	unlockbus(controller, ldrive);	/*Release bus*/
+
+#ifdef DEBUGIOCTL
+	printf("Subq track %d index %d adr/ctl %x  abs %d:%2d:%2d  rel %d:%2d:%2d UPC %x\n",
+	       data[2],data[3],data[1],data[4],data[5],data[6],
+	       data[7],data[8],data[9],data[10]);
+#endif /*DEBUGIOCTL*/
+
+	if (z & MATCD_ST_AUDIOBSY) {	/*Drive playing or paused*/
+		if (cd->status==CD_AS_PLAY_PAUSED) {	/*Have we issued*/
+			i=cd->status;		/*a pause command?*/
+		} else {
+			i=CD_AS_PLAY_IN_PROGRESS;/*No, we really are playing*/
+		}
+	} else {
+		if (cd->status==CD_AS_PLAY_IN_PROGRESS) {/*It was playing*/
+			i=CD_AS_PLAY_COMPLETED;	/*so it finished*/
+		} else {			/*Any other status reported*/
+			i=cd->status;		/*as we get it*/
+		}
+	}
+
+	subq.header.audio_status=cd->status=i;	/*Store status we selected*/
+
+	subq.what.position.track_number=data[2];
+	subq.what.position.index_number=data[3];
+
+	subq.what.position.absaddr.msf.minute=data[4];
+	subq.what.position.absaddr.msf.second=data[5];
+	subq.what.position.absaddr.msf.frame=data[6];
+
+	subq.what.position.reladdr.msf.minute=data[7];
+	subq.what.position.reladdr.msf.second=data[8];
+	subq.what.position.reladdr.msf.frame=data[9];
+
+/*	Ok, now copy our nicely-built structure from the kernel address
+	space into the user address space (we hope)
+*/
+
+	if (copyout(&subq, sqp->data,
+	    min(sizeof(struct cd_sub_channel_info), sqp->data_len))!=0) {
+		return(EFAULT);
+	}
+	return(0);
+}
+
+/*---------------------------------------------------------------------------
+	matcd_igot - Like the song, report the capabilities that the
+		     drive/driver has available.
+
+	This call returns a structure of flags indicating what
+	functions are available so that the application can offer
+	only the functions the drive is actually capable of.
+<16>	New for Edit 16
+---------------------------------------------------------------------------*/
+
+static int matcd_igot(struct ioc_capability * sqp)
+{
+
+	sqp->play_function=(CDDOPLAYTRK |	/*Can play trks/indx*/
+			   CDDOPLAYMSF |	/*Can play msf to msf*/
+			   CDDOPAUSE |		/*Can pause playback*/
+			   CDDORESUME |		/*Can resume playback*/
+			   CDDOSTOP |		/*Can stop playback*/
+			   CDDOPITCH);		/*Can change play pitch*/
+
+	sqp->routing_function=(CDREADVOLUME |	/*Can read volume*/
+			      CDSETVOLUME |	/*Can set volume*/
+			      CDSETSTEREO |	/*Can select stereo play*/
+			      CDSETLEFT |	/*Can select left-only*/
+			      CDSETRIGHT |	/*Can select right-only*/
+			      CDSETMUTE |	/*Can mute audio*/
+			      CDSETPATCH);	/*Direct patch settings*/
+
+	sqp->special_function=(CDDOEJECT |	/*Door can be opened*/
+			      CDDOCLOSE |	/*Door can be closed*/
+			      CDDOLOCK |	/*Door can be locked*/
+			      CDREADSUBQ |	/*Can read subchannel*/
+			      CDREADENTRIES |	/*Can read TOC entries*/
+			      CDREADHEADER);	/*Can read TOC*/
+	return(0);
+}
+	
+
+#ifdef FULLDRIVER
+#include	"i386/isa/matcd/audio.c"	/*<15>ioctls related to
+						      audio are here*/
+#endif	/*FULLDRIVER*/
+
+/*End of matcd.c*/
+
diff --git a/sys/i386/isa/matcd/matcd.h b/sys/i386/isa/matcd/matcd.h
new file mode 100644
index 0000000..be261a2
--- /dev/null
+++ b/sys/i386/isa/matcd/matcd.h
@@ -0,0 +1,198 @@
+/*matcd.h---------------------------------------------------------------------
+
+	Matsushita(Panasonic) / Creative CD-ROM Driver	(matcd)
+	Authored by Frank Durda IV
+
+	Copyright 1994, 1995  Frank Durda IV.  All rights reserved.
+	"FDIV" is a trademark of Frank Durda IV.
+
+
+	Redistribution and use in source and binary forms, with or
+	without modification, are permitted provided that the following
+	conditions are met:
+	1.  Redistributions of source code must retain the above copyright
+	    notice positioned at the very beginning of this file without
+	    modification, all copyright strings, all related programming
+	    codes that display the copyright strings, this list of
+	    conditions and the following disclaimer.
+	2.  Redistributions in binary form must contain all copyright strings
+	    and related programming code that display the copyright strings.
+	3.  Redistributions in binary form must reproduce the above copyright
+	    notice, this list of conditions and the following disclaimer in
+	    the documentation and/or other materials provided with the
+	    distribution.
+	4.  All advertising materials mentioning features or use of this
+	    software must display the following acknowledgement:
+		"The Matsushita/Panasonic CD-ROM driver  was developed
+		 by Frank Durda IV for use with "FreeBSD" and similar
+		 operating systems."
+	    "Similar operating systems" includes mainly non-profit oriented
+	    systems for research and education, including but not restricted
+	    to "NetBSD", "386BSD", and "Mach" (by CMU).  The wording of the
+	    acknowledgement (in electronic form or printed text) may not be
+	    changed without permission from the author.
+	5.  Absolutely no warranty of function, fitness or purpose is made
+	    by the author Frank Durda IV.
+	6.  Neither the name of the author nor the name "FreeBSD" may
+	    be used to endorse or promote products derived from this software
+	    without specific prior written permission.
+	    (The author can be reached at   bsdmail@nemesis.lonestar.org)
+	7.  The product containing this software must meet all of these
+	    conditions even if it is unsupported, not a complete system
+	    and/or does not contain compiled code.
+	8.  These conditions will be in force for the full life of the
+	    copyright.  
+	9.  If all the above conditions are met, modifications to other
+	    parts of this file may be freely made, although any person
+	    or persons making changes do not receive the right to add their
+	    name or names to the copyright strings and notices in this
+	    software.  Persons making changes are encouraged to insert edit
+	    history in matcd.c and to put your name and details of the
+	    change there.  
+	10. You must have prior written permission from the author to
+	    deviate from these terms.
+
+	Vendors who produce product(s) containing this code are encouraged 
+	(but not required) to provide copies of the finished product(s) to
+	the author and to correspond with the author about development
+	activity relating to this code.   Donations of development hardware
+	and/or software are also welcome.  (This is one of the faster ways
+	to get a driver developed for a device.)
+
+ 	THIS SOFTWARE IS PROVIDED BY THE DEVELOPER(S) ``AS IS'' AND ANY
+ 	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ 	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ 	PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE DEVELOPER(S) BE
+ 	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ 	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ 	OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ 	OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ 	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ 	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+-----No changes are allowed above this line------------------------------------
+
+See matcd.c for Edit History information.
+
+
+	Matsushita CR562/CR563 Commands
+	This is not a complete list - just the ones this version uses
+*/
+
+#define	NOP		0x05		/*No action - just return status*/
+#define	DOOROPEN	0x06		/*Open tray*/
+#define DOORCLOSE	0x07		/*Close tray*/
+#define ABORT		0x08		/*Abort command*/
+#define MODESELECT	0x09		/*Set drive parameters*/
+#define LOCK		0x0c		/*Prevent/Allow medium removal*/
+#define	PAUSE		0x0d		/*Pause/Resume playback*/
+#define PLAYBLOCKS	0x0e		/*Play audio - block to block*/
+#define PLAYTRKS	0x0f		/*Play audio - tracks & index*/
+#define	READ		0x10		/*Read data*/
+#define READERROR	0x82		/*Read Error*/
+#define	READID		0x83		/*Read Drive Type & Firmware Info*/
+#define MODESENSE	0x84		/*<12>Report drive settings*/
+#define READSUBQ	0x87		/*<14>Read Q channel information*/
+#define	READDINFO	0x8b		/*<13>Read TOC tracks & drive size*/
+#define	READTOC		0x8c		/*<13>Read entry from TOC*/
+
+#define BLOCKPARAM	0x00		/*Used with MODESELECT command*/
+#define SPEEDPARM	0x03		/*<12>Adjust audio playback speed*/
+#define	AUDIOPARM	0x05		/*<12>Set/read audio levels & routing*/
+#define RESUME		0x80		/*Used with PAUSE command*/
+
+#define MAXCMDSIZ	12		/*Max command size with NULL*/
+
+/*	Possible data transfers for MODESELECT + BLOCKPARAM */
+
+#define MODE_DATA	0x00		/*2048, 2340*/
+#define MODE_DA		0x82		/*2352*/
+#define MODE_USER	0x01		/*2048, 2052, 2336, 2340, 2352*/
+#define MODE_UNKNOWN	0xff		/*Uninitialized state*/
+
+/*<12>The following mode is not implemented in the driver at this time*/
+
+#define MODE_XA		0x81		/*2048, 2060, 2324, 2336, 2340, 2352*/
+
+#define DEFVOL		0xff		/*<12>Default drive volume level, 100%
+					  volume.  Based on drive action.*/
+#define OUTLEFT		0x01		/*Output on Left*/
+#define OUTRIGHT	0x02		/*Output on Right*/
+
+/*	 Matsushita CR562/CR563 Status bits*/
+
+#define	MATCD_ST_DOOROPEN	0x80	/*Door is open right now*/
+#define	MATCD_ST_DSKIN		0x40	/*Disc in drive*/
+#define	MATCD_ST_SPIN		0x20	/*Disc is spinning*/
+#define MATCD_ST_ERROR		0x10	/*Error on command*/
+#define	MATCD_ST_AUDIOBSY	0x08	/*Drive is playing audio*/
+#define MATCD_ST_LOCK		0x04	/*<14>Drive is locked*/
+#define MATCD_ST_X2		0x02	/*<14>Media is at double-speed*/
+#define MATCD_ST_READY		0x01	/*<14>Drive is ready*/
+
+#define	MATCDAUDIOBSY	MATCD_ST_AUDIOBSY
+#define MATCDDSKCHNG	MATCD_ST_DSKCHNG
+#define	MATCDDSKIN	MATCD_ST_DSKIN
+#define	MATCDDOOROPEN	MATCD_ST_DOOROPEN
+
+
+/*	Error codes returned from READERROR command.*/
+
+#define	NO_ERROR	0x00
+#define	RECV_RETRY	0x01
+#define	RECV_ECC	0x02
+#define	NOT_READY	0x03
+#define	TOC_ERROR	0x04
+#define	UNRECV_ERROR	0x05
+#define	SEEK_ERROR	0x06
+#define	TRACK_ERROR	0x07
+#define	RAM_ERROR	0x08
+#define	DIAG_ERROR	0x09
+#define	FOCUS_ERROR	0x0a
+#define	CLV_ERROR	0x0b
+#define	DATA_ERROR	0x0c
+#define	ADDRESS_ERROR	0x0d
+#define	CDB_ERROR	0x0e
+#define	END_ADDRESS	0x0f
+#define	MODE_ERROR	0x10
+#define	MEDIA_CHANGED	0x11
+#define	HARD_RESET	0x12
+#define	ROM_ERROR	0x13
+#define	CMD_ERROR	0x14
+#define	DISC_OUT	0x15
+#define	HARD_ERROR	0x16
+#define	ILLEGAL_REQ	0x17
+
+
+/*	Human-readable error messages - what a concept!*/
+
+static unsigned char * matcderrors[]={"No error",	/* 00 */
+			"Soft read error after retry",	/* 01 */
+			"Soft read error after error-correction", /* 02 */
+			"Not ready",			/* 03 */
+			"Unable to read TOC",		/* 04 */
+			"Hard read error of data track",/* 05 */
+			"Seek did not complete",	/* 06 */
+			"Tracking servo failure",	/* 07 */
+			"Drive RAM failure",		/* 08 */
+			"Drive self-test failed",	/* 09 */
+			"Focusing servo failure",	/* 0a */
+			"Spindle servo failure",	/* 0b */
+			"Data path failure",		/* 0c */
+			"Illegal logical block address",/* 0d */
+			"Illegal field in CDB",		/* 0e */
+			"End of user encountered on this track", /* 0f */
+			"Illegal data mode for this track",	/* 10 */
+			"Media changed",		/* 11 */
+			"Power-on or drive reset occurred",	/* 12 */
+			"Drive ROM failure",		/* 13 */
+			"Illegal drive command received from host",/* 14 */
+			"Disc removed during operation",/* 15 */
+			"Drive Hardware error",		/* 16 */
+			"Illegal request from host"};	/* 17 */
+
+/*End of matcd.h*/
+
+
diff --git a/sys/i386/isa/matcd/options.h b/sys/i386/isa/matcd/options.h
new file mode 100644
index 0000000..67ff531
--- /dev/null
+++ b/sys/i386/isa/matcd/options.h
@@ -0,0 +1,271 @@
+/*options.h--------------------------------------------------------------------
+
+	Matsushita(Panasonic) / Creative CD-ROM Driver	(matcd)
+	Authored by Frank Durda IV
+
+	Copyright 1994, 1995  Frank Durda IV.  All rights reserved.
+	"FDIV" is a trademark of Frank Durda IV.
+
+
+	Redistribution and use in source and binary forms, with or
+	without modification, are permitted provided that the following
+	conditions are met:
+	1.  Redistributions of source code must retain the above copyright
+	    notice positioned at the very beginning of this file without
+	    modification, all copyright strings, all related programming
+	    codes that display the copyright strings, this list of
+	    conditions and the following disclaimer.
+	2.  Redistributions in binary form must contain all copyright strings
+	    and related programming code that display the copyright strings.
+	3.  Redistributions in binary form must reproduce the above copyright
+	    notice, this list of conditions and the following disclaimer in
+	    the documentation and/or other materials provided with the
+	    distribution.
+	4.  All advertising materials mentioning features or use of this
+	    software must display the following acknowledgement:
+		"The Matsushita/Panasonic CD-ROM driver  was developed
+		 by Frank Durda IV for use with "FreeBSD" and similar
+		 operating systems."
+	    "Similar operating systems" includes mainly non-profit oriented
+	    systems for research and education, including but not restricted
+	    to "NetBSD", "386BSD", and "Mach" (by CMU).  The wording of the
+	    acknowledgement (in electronic form or printed text) may not be
+	    changed without permission from the author.
+	5.  Absolutely no warranty of function, fitness or purpose is made
+	    by the author Frank Durda IV.
+	6.  Neither the name of the author nor the name "FreeBSD" may
+	    be used to endorse or promote products derived from this software
+	    without specific prior written permission.
+	    (The author can be reached at   bsdmail@nemesis.lonestar.org)
+	7.  The product containing this software must meet all of these
+	    conditions even if it is unsupported, not a complete system
+	    and/or does not contain compiled code.
+	8.  These conditions will be in force for the full life of the
+	    copyright.  
+	9.  If all the above conditions are met, modifications to other
+	    parts of this file may be freely made, although any person
+	    or persons making changes do not receive the right to add their
+	    name or names to the copyright strings and notices in this
+	    software.  Persons making changes are encouraged to insert edit
+	    history in matcd.c and to put your name and details of the
+	    change there.  
+	10. You must have prior written permission from the author to
+	    deviate from these terms.
+
+	Vendors who produce product(s) containing this code are encouraged 
+	(but not required) to provide copies of the finished product(s) to
+	the author and to correspond with the author about development
+	activity relating to this code.   Donations of development hardware
+	and/or software are also welcome.  (This is one of the faster ways
+	to get a driver developed for a device.)
+
+ 	THIS SOFTWARE IS PROVIDED BY THE DEVELOPER(S) ``AS IS'' AND ANY
+ 	EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ 	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ 	PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE DEVELOPER(S) BE
+ 	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ 	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ 	OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ 	OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ 	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ 	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ 	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+-----No changes are allowed above this line------------------------------------
+-----------------------------------------------------------------------------
+	Conditional compilation flags - change to suit your system
+---------------------------------------------------------------------------*/
+
+/*	AUTOHUNT	Adds extra code that allows the driver to search
+			for interface cards rather than having to hard-code
+			the locations in the kernel conf file. 
+			Leaving AUTOHUNT enabled is the recommended setting.
+*/
+
+#define AUTOHUNT
+
+
+/*	FULLCONFIG	Allows up to four host interface boards for a
+			total of 16 drives.  If disabled, only a single
+			host interface (of any type) is allowed.  The
+			additional driver size is insignificant.
+			Leaving FULLCONFIG enabled is the recommended setting.
+*/
+
+#define FULLCONFIG
+
+
+/*	FULLDRIVER	If not set, the audio, non-data functions and
+			some error recovery functions are eliminated from
+			the compiled driver.  The resulting driver will be
+			smaller and may help a kernel fit on a boot floppy.
+			Leaving FULLDRIVER enabled is the recommended setting.
+*/
+
+#define FULLDRIVER
+
+
+/*	RESETONBOOT	causes the driver to reset the drive(s) to be
+			reset during probing.  This causes any audio
+			playback to be aborted and the drives will close
+			their trays if they are open.
+			Leaving RESETONBOOT enabled is the recommended setting.
+*/
+
+#define RESETONBOOT		
+
+
+/*<15>	LOCKDRIVE	If enabled, when a drive is opened using a
+<15>			minor number greater than 127, the drive door is
+<15>			locked.  The drive door remains locked until all
+<15>			partitions on the drive are closed.  The EJECT
+<15>			ioctl is also refused when this locking mechanism
+<15>			is active.
+<15>			The additional code size is small so enabling
+<15>			LOCKDRIVE is the recommended setting.
+*/
+
+#define LOCKDRIVE
+
+
+/*<5>	FREE2		If enabled, the changes are inserted so this
+<5>			module will compile in the world of FreeBSD 2.x.
+<5>			Without this, it is known to work in 
+<14>			FreeBSD 1.1.5.1.   FREE2 should be set automatically
+<14>			by using the system version compile symbol below.
+<5>*/
+
+#if __FreeBSD__ >= 2
+#define	FREE2				/*<5>Correct setting for 2.x*/
+#endif /*__FreeBSD__*/
+
+
+/*<14>	KRYTEN		This enables a bug that someone might consider
+<14>			to be a feature.  If KRYTEN is enabled and you are
+<14>			playing audio and you issue the resume-play ioctl,
+<14>			the audio will stutter, playing the same quarter
+<14>			of a second or so of audio several times before
+<14>			resuming normally.  Resuming from a pause acts
+<14>			normally regardless of the setting of this flag.
+<14>			Leaving KRYTEN disabled is the recommended setting.
+<14>*/
+
+/*#define KRYTEN*/
+
+
+/*---------------------------------------------------------------------------
+	This structure contains the hints for where we should look for the
+	host adapter.  If you want to change where we search or reduce the
+	places we search to avoid confusing some other device, either
+	specify explicit addresses in the kernel config file (preferred)
+	or change this array.
+
+	If the kernel config file has multiple ? entries, the probe routines
+	will use this table multiple times and will eliminate each failed
+	entry that probe tries.
+
+	WARNING:  The number of controller entries for this driver in config
+	must be less than or equal to the number of hints if hints are used.
+
+	If you add entries to the table, add them immediately before
+	the -1 end-of-table marker.  The values already present are
+	the ones found on standard SoundBlaster 16 and standalone cards.
+---------------------------------------------------------------------------*/
+	
+#ifdef AUTOHUNT
+int	port_hints[]={
+			0x230,0x240,	/*Ports SB audio boards can use*/
+			0x250,0x260,	/*Ports standalone CD/IF board can*/
+			      -1};	/*use.  Table MUST end with -1*/
+#endif /*AUTOHUNT*/
+
+
+/*---------------------------------------------------------------------------
+	Debugging flags - Turn these on only if you are looking at a
+			problem.
+---------------------------------------------------------------------------*/
+
+/*	DEBUGOPEN	If enabled, debug messages for open and close
+			operations.
+*/
+
+/*#define    	DEBUGOPEN*/
+
+
+/*	DEBUGIO		If enabled, reports on calls to strategy, start
+			and other I/O related functions.
+*/
+
+/*#define   	DEBUGIO*/
+
+
+/*	DEBUGQUEUE	If enabled, shows activity on disk request queues.
+			Warning - This debug is VERY VERY NOISY and will
+			loop endlessly if queues are not null terminated
+			as they should be.
+*/
+		
+/*#define   	DEBUGQUEUE*/
+
+
+/*	DEBUGCMD	If enabled, shows the actual commands being issued
+			to the CD-ROM drives.
+*/
+
+/*#define 	DEBUGCMD*/
+
+
+/*	DEBUGSLEEP	If enabled, reports on timeouts, wakeups, dropped
+			threads, etc.
+*/
+
+/*#define 	DEBUGSLEEP*/
+
+
+/*	DEBUGIOCTL	If enabled, reports on the various ioctl-related
+			calls and operations.  You might have to enable
+			DEBUGCMD as well to get enough debugging information.
+*/
+
+/*#define 	DEBUGIOCTL*/
+
+
+/*	DEBUGPROBE	If enabled, reports on the process of locating
+			adapters and drives.  The debugging in matcdprobe()
+			and matcdattach() routines is enabled with this
+			flag.
+*/
+
+/*#define 	DEBUGPROBE*/
+
+
+/*	DIAGPORT	If enabled, additional code is added to send
+			debugging state to a debug port.   This should
+			not be enabled in production.  The value
+			can be set to 0x80 or 0x302, depending on what
+			type of debugging board you own.  The global variable
+			diagloop is used to make looping reports on these
+			devices.
+
+			Some other drivers (and possibly the kernel) fiddle
+			with the 0x80 debug port, so it may not be usable
+			for isolating failures that result in a kernel panic.
+			The 0x302 debug board is recommended in these cases.
+			It also displays a word of data, so you get more
+			detail.
+
+<10>			It was discovered the 0x302 board was getting set
+<10>			into a strange state by the probes for other
+<10>			devices.  To resolve this, the display control port
+<10>			(0x300) is reset in our probe and open routines.
+<10>			DO NOT use DIAGPORT 0x302 if an adapter is present
+<10>			at that address.  It could ruin the EEPROM settings
+<10>			on the device. 
+*/
+
+/*#define DIAGPORT	0x80*/
+/*#define DIAGPORT	0x302*/
+
+/*End of options.h*/
+