summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrgrimes <rgrimes@FreeBSD.org>1994-02-06 11:33:25 +0000
committerrgrimes <rgrimes@FreeBSD.org>1994-02-06 11:33:25 +0000
commitd6b9f70ffa6cf5e811efaf334af91e6c7ba71db5 (patch)
treed479b76215c3b51f8fa3571a391f13940357750b
parent9788497c05c064f7fe75d96bcd2dcfa6685a8597 (diff)
downloadFreeBSD-src-d6b9f70ffa6cf5e811efaf334af91e6c7ba71db5.zip
FreeBSD-src-d6b9f70ffa6cf5e811efaf334af91e6c7ba71db5.tar.gz
Update for new format of cd_toc_entry that was changed in sys/cdio.h.
-rw-r--r--sys/dev/mcd/mcd.c8
-rw-r--r--sys/i386/isa/mcd.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index b2ba576..3127f79 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -35,7 +35,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.6 1994/01/18 02:20:15 nate Exp $
+ * $Id: mcd.c,v 1.7 1994/01/22 18:00:54 ats Exp $
*/
static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@@ -1079,9 +1079,9 @@ static int mcd_toc_entry(int unit, struct ioc_read_toc_entry *te)
ret_toc.rt.track = i;
if (te->address_format == CD_MSF_FORMAT)
{
- ret_toc.rt.addr[1] = cd->toc[i].hd_pos_msf[0];
- ret_toc.rt.addr[2] = cd->toc[i].hd_pos_msf[1];
- ret_toc.rt.addr[3] = cd->toc[i].hd_pos_msf[2];
+ ret_toc.rt.addr.addr[1] = cd->toc[i].hd_pos_msf[0];
+ ret_toc.rt.addr.addr[2] = cd->toc[i].hd_pos_msf[1];
+ ret_toc.rt.addr.addr[3] = cd->toc[i].hd_pos_msf[2];
}
/* copy the data back */
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index b2ba576..3127f79 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -35,7 +35,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.6 1994/01/18 02:20:15 nate Exp $
+ * $Id: mcd.c,v 1.7 1994/01/22 18:00:54 ats Exp $
*/
static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@@ -1079,9 +1079,9 @@ static int mcd_toc_entry(int unit, struct ioc_read_toc_entry *te)
ret_toc.rt.track = i;
if (te->address_format == CD_MSF_FORMAT)
{
- ret_toc.rt.addr[1] = cd->toc[i].hd_pos_msf[0];
- ret_toc.rt.addr[2] = cd->toc[i].hd_pos_msf[1];
- ret_toc.rt.addr[3] = cd->toc[i].hd_pos_msf[2];
+ ret_toc.rt.addr.addr[1] = cd->toc[i].hd_pos_msf[0];
+ ret_toc.rt.addr.addr[2] = cd->toc[i].hd_pos_msf[1];
+ ret_toc.rt.addr.addr[3] = cd->toc[i].hd_pos_msf[2];
}
/* copy the data back */
OpenPOWER on IntegriCloud