From 92f57819e02676d8b6d516daf00f4338cee45b2f Mon Sep 17 00:00:00 2001
From: ache <ache@FreeBSD.org>
Date: Fri, 2 Feb 1996 20:50:04 +0000
Subject: Calculate TOC size to match what scsi cd says. Exchange
 control<->addr_type fields

---
 sys/dev/mcd/mcd.c     | 4 ++--
 sys/dev/mcd/mcdreg.h  | 4 ++--
 sys/i386/isa/mcd.c    | 4 ++--
 sys/i386/isa/mcdreg.h | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index ac1bbad..cc6b1d8 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.64 1996/02/01 16:51:53 ache Exp $
+ *	$Id: mcd.c,v 1.65 1996/02/01 19:15:41 ache Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -1348,7 +1348,7 @@ mcd_toc_header(int unit, struct ioc_toc_header *th)
 	th->ending_track = bcd2bin(cd->volinfo.trk_high);
 	th->len = sizeof(struct ioc_toc_header) +
 		  (th->ending_track - th->starting_track + 1) *
-		  sizeof(struct cd_toc_entry);
+		  sizeof(struct cd_toc_entry) + 6 /* ??? */;
 
 	return 0;
 }
diff --git a/sys/dev/mcd/mcdreg.h b/sys/dev/mcd/mcdreg.h
index 2b40059..146159a 100644
--- a/sys/dev/mcd/mcdreg.h
+++ b/sys/dev/mcd/mcdreg.h
@@ -41,7 +41,7 @@
  * the manufacturer or anyone else might provide better documentation,
  * so this file (and the driver) will then have a better quality.
  *
- *	$Id: mcdreg.h,v 1.9 1996/01/30 10:31:12 ache Exp $
+ *	$Id: mcdreg.h,v 1.10 1996/02/01 17:19:46 ache Exp $
  */
 
 #ifndef MCD_H
@@ -178,8 +178,8 @@ struct mcd_volinfo {
 };
 
 struct mcd_qchninfo {
-	u_char  control:4;
 	u_char  addr_type:4;
+	u_char  control:4;
 	u_char	trk_no;
 	u_char	idx_no;
 	bcd_t	trk_size_msf[3];
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index ac1bbad..cc6b1d8 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.64 1996/02/01 16:51:53 ache Exp $
+ *	$Id: mcd.c,v 1.65 1996/02/01 19:15:41 ache Exp $
  */
 static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
@@ -1348,7 +1348,7 @@ mcd_toc_header(int unit, struct ioc_toc_header *th)
 	th->ending_track = bcd2bin(cd->volinfo.trk_high);
 	th->len = sizeof(struct ioc_toc_header) +
 		  (th->ending_track - th->starting_track + 1) *
-		  sizeof(struct cd_toc_entry);
+		  sizeof(struct cd_toc_entry) + 6 /* ??? */;
 
 	return 0;
 }
diff --git a/sys/i386/isa/mcdreg.h b/sys/i386/isa/mcdreg.h
index 2b40059..146159a 100644
--- a/sys/i386/isa/mcdreg.h
+++ b/sys/i386/isa/mcdreg.h
@@ -41,7 +41,7 @@
  * the manufacturer or anyone else might provide better documentation,
  * so this file (and the driver) will then have a better quality.
  *
- *	$Id: mcdreg.h,v 1.9 1996/01/30 10:31:12 ache Exp $
+ *	$Id: mcdreg.h,v 1.10 1996/02/01 17:19:46 ache Exp $
  */
 
 #ifndef MCD_H
@@ -178,8 +178,8 @@ struct mcd_volinfo {
 };
 
 struct mcd_qchninfo {
-	u_char  control:4;
 	u_char  addr_type:4;
+	u_char  control:4;
 	u_char	trk_no;
 	u_char	idx_no;
 	bcd_t	trk_size_msf[3];
-- 
cgit v1.1