From owner-FreeBSD-users-jp@jp.freebsd.org  Fri Jan 10 21:06:04 1997
Received: by jaz.jp.freebsd.org (8.8.4+2.7Wbeta4/8.7.3) id VAA08582
	Fri, 10 Jan 1997 21:06:04 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.4+2.7Wbeta4/8.7.3) with ESMTP id VAA08577
	for <FreeBSD-users-jp@jp.freebsd.org>; Fri, 10 Jan 1997 21:06:00 +0900 (JST)
Received: from kosys.esys.tsukuba.ac.jp by jp-gate.wide.ad.jp (8.7.5+2.6Wbeta6/2.8Wb-jp-gate/1.2) with SMTP
	id MAA09303; Fri, 10 Jan 1997 12:05:53 GMT
Received: from junkun.esys.tsukuba.ac.jp (junkun.vblab.tsukuba.ac.jp) by kosys.esys.tsukuba.ac.jp (4.1/6.4J.5-7.2) id AA01820; Fri, 10 Jan 97 21:04:38 JST
Received: from localhost (localhost [127.0.0.1]) by junkun.esys.tsukuba.ac.jp (8.6.12/3.4W406/21/96) with SMTP id VAA04524 for <FreeBSD-users-jp@jp.freebsd.org>; Fri, 10 Jan 1997 21:05:47 +0900
Message-Id: <199701101205.VAA04524@junkun.esys.tsukuba.ac.jp>
X-Authentication-Warning: junkun.esys.tsukuba.ac.jp: Host localhost didn't use HELO protocol
To: FreeBSD-users-jp@jp.freebsd.org
From: Jun YAMASHITA/=?ISO-2022-JP?B?GyRCOzMyPBsoQg==?= =?ISO-2022-JP?B?GyRCPV8bKEI=?= <junkun@esys.tsukuba.ac.jp>
In-Reply-To: Your message of "Fri, 10 Jan 1997 18:58:16 +0900"
References: <9701100958.AA23400@slabd.slab.tnr.sharp.co.jp>
X-Mailer: Mew version 1.53 on Emacs 19.28.1, Mule 2.3
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
	boundary="--Next_Part(Fri_Jan_10_21:05:46_1997)--"
Content-Transfer-Encoding: 7bit
Date: Fri, 10 Jan 1997 21:05:47 +0900
Reply-To: junkun@esys.tsukuba.ac.jp
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=19]
X-Sequence: FreeBSD-users-jp 8289
Subject: [FreeBSD-users-jp 8289] Re: Audio CDROM
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

----Next_Part(Fri_Jan_10_21:05:46_1997)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

$B0J2<!"(BFreeBSD-2.1R $B$K4X$9$kOC$H$7$F8BDj$7$^$9$,(B(2.1$B0J>e$O$I$&$J$C$F$$(B
$B$k$N$+CN$j$^$;$s(B)$B!#(B

From: Norihiro Kumagai <kuma@slab.tnr.sharp.co.jp>
Subject: [FreeBSD-users-jp 8278] Re: Audio CDROM
Date: Fri, 10 Jan 1997 18:58:16 +0900
Message-ID: <9701100958.AA23400@slabd.slab.tnr.sharp.co.jp>

> xcdplayer -device /dev/wcd0c $B$7$^$9$H!"(B
> 
> ioctl(cdromreadtocentry): Invalid argument
..
> $B$H$*$C$7$c$k$P$C$+$j$G8+;v$KF0$-$^$;$s!#(B/dev/wcd0c $B$,(B CD-ROM $B4X78$N(B 
> ioctl $B$r%5%]!<%H$7$F$$$J$$$N$G!"(Bxcdplayer $B$O(B ATAPI CDROM $B$G$OF0$+$J$$(B
> $B$N$G$O$J$$$+$H!#(B

$B$3$l$G$9$,!"H>G/$/$i$$A0(B ML $B$GOCBj$K$J$j$^$7$?!#(B

/usr/src/sys/i386/isa/wcd.c

$B$K%Q%C%A$r$"$F$F%+!<%M%k$r:F9=C[$9$k$H(B ATAPI CDROM$B%I%i%$%V$G$b(B 
xcdplayer $B$r$D$+$C$F(B audio CD $B$r:F@8$G$-$k$h$&$K$J$j$^$9!#(B

$BJL%Q!<%H$G%Q%C%A$rIU$1$F$*$-$^$9!#(B






----Next_Part(Fri_Jan_10_21:05:46_1997)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

*** wcd.c.orig	Mon Oct 23 08:14:34 1995
--- wcd.c	Wed Oct  2 14:03:57 1996
***************
*** 735,743 ****
  
  		if (! t->toc.hdr.ending_track)
  			return (EIO);
! 		if (te->starting_track < toc->hdr.starting_track ||
! 		    te->starting_track > toc->hdr.ending_track)
  			return (EINVAL);
  
  		len = (toc->hdr.ending_track - te->starting_track + 2) *
  			sizeof(toc->tab[0]);
--- 735,746 ----
  
  		if (! t->toc.hdr.ending_track)
  			return (EIO);
! 		if ((te->starting_track < toc->hdr.starting_track ||
! 		    te->starting_track > toc->hdr.ending_track) &&
! 		    te->starting_track != 0xaa)
  			return (EINVAL);
+ 		if (te->starting_track == 0xaa)
+ 			te->starting_track = toc->hdr.ending_track + 1;
  
  		len = (toc->hdr.ending_track - te->starting_track + 2) *
  			sizeof(toc->tab[0]);
***************
*** 752,760 ****
  
  			buf = t->toc;
  			toc = &buf;
! 			e = toc->tab + toc->hdr.ending_track -
! 				te->starting_track + 2;
! 			while (--e >= toc->tab)
  				lba2msf (e->addr.lba, &e->addr.msf.minute,
  				    &e->addr.msf.second, &e->addr.msf.frame);
  		}
--- 755,762 ----
  
  			buf = t->toc;
  			toc = &buf;
! 			e = toc->tab + toc->hdr.ending_track + 1;
! 			while (--e >= toc->tab + te->starting_track - 1)
  				lba2msf (e->addr.lba, &e->addr.msf.minute,
  				    &e->addr.msf.second, &e->addr.msf.frame);
  		}

----Next_Part(Fri_Jan_10_21:05:46_1997)----
