claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Go over FreeBSD code based on output from Heiner.

Browse Source 
Hopefully 3 bugs are fixed:
  - we get the leadout track now, no core dumps
  - MSF reporting is corrected
  - track format and mode

_cdio_linux.c: use cdio #define rather than GNU/Linux one.
This commit is contained in:
rocky
2004-05-13 04:32:12 +00:00
parent cb9db0a7d5
commit cb7c0e870a
4 changed files with 43 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
lib/FreeBSD/freebsd.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: freebsd.c,v 1.11 2004/05/13 01:50:22 rocky Exp $ $Id: freebsd.c,v 1.12 2004/05/13 04:32:13 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,12 +27,14 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: freebsd.c,v 1.11 2004/05/13 01:50:22 rocky Exp $"; static const char _rcsid[] = "$Id: freebsd.c,v 1.12 2004/05/13 04:32:13 rocky Exp $";
#include "freebsd.h" #include "freebsd.h"
#ifdef HAVE_FREEBSD_CDROM #ifdef HAVE_FREEBSD_CDROM
#include <cdio/sector.h>
static access_mode_t static access_mode_t
str_to_access_mode_freebsd(const char *psz_access_mode) str_to_access_mode_freebsd(const char *psz_access_mode)
{ {
@@ -190,7 +192,7 @@ _set_arg_freebsd (void *env, const char key[], const char value[])
static bool static bool
_cdio_read_toc (_img_private_t *_obj) _cdio_read_toc (_img_private_t *_obj)
{ {
struct ioc_read_toc_entry te; track_t i, j;
/* read TOC header */ /* read TOC header */
if ( ioctl(_obj->gen.fd, CDIOREADTOCHEADER, &_obj->tochdr) == -1 ) { if ( ioctl(_obj->gen.fd, CDIOREADTOCHEADER, &_obj->tochdr) == -1 ) {
@@ -198,15 +200,25 @@ _cdio_read_toc (_img_private_t *_obj)
return false; return false;
} }
te.address_format = CD_LBA_FORMAT; j=0;
te.starting_track = 0; for ( i = _obj->tochdr.starting_track; i <= _obj->tochdr.ending_track;
te.data_len = (TOTAL_TRACKS+1) * sizeof(struct cd_toc_entry); i++, j++) {
_obj->tocent[j].track = i;
_obj->tocent[j].address_format = CD_LBA_FORMAT;
te.data = _obj->tocent; if ( ioctl(_obj->gen.fd, CDIOREADTOCENTRY, &(_obj->tocent[j]) ) ) {
cdio_error("%s %d: %s\n",
if ( ioctl(_obj->gen.fd, CDIOREADTOCENTRYS, &te) == -1 ) { "error in ioctl CDROMREADTOCENTRY for track",
i, strerror(errno));
return false;
}
}
_obj->tocent[j].track = CDIO_CDROM_LEADOUT_TRACK;
_obj->tocent[j].address_format = CD_LBA_FORMAT;
if ( ioctl(_obj->gen.fd, CDIOREADTOCENTRY, &(_obj->tocent[j]) ) ){
cdio_error("%s: %s\n", cdio_error("%s: %s\n",
"error in ioctl CDROMREADTOCENTRYS for track", "error in ioctl CDROMREADTOCENTRY for leadout track",
strerror(errno)); strerror(errno));
return false; return false;
} }
@@ -324,29 +336,20 @@ static track_format_t
_get_track_format_freebsd(void *env, track_t track_num) _get_track_format_freebsd(void *env, track_t track_num)
{ {
_img_private_t *_obj = env; _img_private_t *_obj = env;
struct ioc_read_subchannel subchannel;
struct cd_sub_channel_info subchannel_info;
subchannel.address_format = CD_LBA_FORMAT; /* This is pretty much copied from the "badly broken" cdrom_count_tracks
subchannel.data_format = CD_CURRENT_POSITION; in linux/cdrom.c.
subchannel.track = track_num; */
subchannel.data_len = 1; if (_obj->tocent[track_num-1].entry.control & CDIO_CDROM_DATA_TRACK) {
subchannel.data = &subchannel_info; if (_obj->tocent[track_num-1].address_format == 0x10)
if(ioctl(_obj->gen.fd, CDIOCREADSUBCHANNEL, &subchannel) < 0) {
perror("CDIOCREADSUBCHANNEL");
return 1;
}
if (subchannel_info.what.position.control == 0x04) {
if (subchannel_info.what.position.data_format == 0x10)
return TRACK_FORMAT_CDI; return TRACK_FORMAT_CDI;
else if (subchannel_info.what.position.data_format == 0x20) else if (_obj->tocent[track_num-1].address_format == 0x20)
return TRACK_FORMAT_XA; return TRACK_FORMAT_XA;
else else
return TRACK_FORMAT_DATA; return TRACK_FORMAT_DATA;
} else } else
return TRACK_FORMAT_AUDIO; return TRACK_FORMAT_AUDIO;
} }
/*! /*!
@@ -361,24 +364,16 @@ static bool
_get_track_green_freebsd(void *env, track_t track_num) _get_track_green_freebsd(void *env, track_t track_num)
{ {
_img_private_t *_obj = env; _img_private_t *_obj = env;
struct ioc_read_subchannel subchannel;
struct cd_sub_channel_info subchannel_info;
subchannel.address_format = CD_LBA_FORMAT;
subchannel.data_format = CD_CURRENT_POSITION;
subchannel.track = track_num;
subchannel.data_len = 1;
subchannel.data = &subchannel_info;
if(ioctl(_obj->gen.fd, CDIOCREADSUBCHANNEL, &subchannel) < 0) {
perror("CDIOCREADSUBCHANNEL");
return 1;
}
if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1;
if (track_num > TOTAL_TRACKS+1 || track_num == 0)
return false;
/* FIXME: Dunno if this is the right way, but it's what /* FIXME: Dunno if this is the right way, but it's what
I was using in cdinfo for a while. I was using in cdinfo for a while.
*/ */
return (subchannel_info.what.position.control & 2) != 0; return ((_obj->tocent[track_num-1].entry.control & 2) != 0);
} }
/*! /*!
@@ -400,7 +395,7 @@ _get_track_lba_freebsd(void *env, track_t track_num)
if (track_num > TOTAL_TRACKS+1 || track_num == 0) { if (track_num > TOTAL_TRACKS+1 || track_num == 0) {
return CDIO_INVALID_LBA; return CDIO_INVALID_LBA;
} else { } else {
return _obj->tocent[track_num-1].addr.lba; return cdio_lsn_to_lba(_obj->tocent[track_num-1].entry.addr.lba);
} }
} }

7
lib/FreeBSD/freebsd.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: freebsd.h,v 1.4 2004/05/13 01:50:23 rocky Exp $ $Id: freebsd.h,v 1.5 2004/05/13 04:32:14 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -120,7 +120,7 @@ typedef struct {
/* Track information */ /* Track information */
bool toc_init; /* if true, info below is valid. */ bool toc_init; /* if true, info below is valid. */
struct ioc_toc_header tochdr; struct ioc_toc_header tochdr;
struct cd_toc_entry tocent[100]; /* entry info for each track */ struct ioc_read_toc_single_entry tocent[100]; /* entry info for each track */
} _img_private_t; } _img_private_t;
@@ -144,9 +144,6 @@ int read_mode2_sector_freebsd_ioctl (_img_private_t *env, void *data,
int read_mode2_sectors_freebsd_cam (_img_private_t *env, void *buf, int read_mode2_sectors_freebsd_cam (_img_private_t *env, void *buf,
uint32_t lba, unsigned int nblocks, uint32_t lba, unsigned int nblocks,
bool b_form2); bool b_form2);
bool read_toc_freebsd_ioctl (_img_private_t *_obj);
/*! /*!
Return the size of the CD in logical block address (LBA) units. Return the size of the CD in logical block address (LBA) units.
*/ */

37
lib/FreeBSD/freebsd_ioctl.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: freebsd_ioctl.c,v 1.4 2004/05/12 20:06:10 rocky Exp $ $Id: freebsd_ioctl.c,v 1.5 2004/05/13 04:32:14 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: freebsd_ioctl.c,v 1.4 2004/05/12 20:06:10 rocky Exp $"; static const char _rcsid[] = "$Id: freebsd_ioctl.c,v 1.5 2004/05/13 04:32:14 rocky Exp $";
#ifdef HAVE_FREEBSD_CDROM #ifdef HAVE_FREEBSD_CDROM
@@ -139,38 +139,6 @@ stat_size_freebsd_ioctl (_img_private_t *_obj)
return size; return size;
} }
/*!
Read and cache the CD's Track Table of Contents and track info.
Return false if successful or true if an error.
*/
bool
read_toc_freebsd_ioctl (_img_private_t *_obj)
{
int i;
struct ioc_read_toc_entry te;
/* read TOC header */
if ( ioctl(_obj->gen.fd, CDIOREADTOCHEADER, &_obj->tochdr) == -1 ) {
cdio_error("error in ioctl(CDIOREADTOCHEADER): %s\n", strerror(errno));
return false;
}
te.address_format = CD_LBA_FORMAT;
te.starting_track = 0;
te.data_len = (TOTAL_TRACKS+1) * sizeof(struct cd_toc_entry);
te.data = _obj->tocent;
if ( ioctl(_obj->gen.fd, CDIOREADTOCENTRYS, &te) == -1 ) {
cdio_error("%s %d: %s\n",
"error in ioctl CDROMREADTOCENTRYS for track",
i, strerror(errno));
return false;
}
return true;
}
/*! /*!
Eject media. Return 1 if successful, 0 otherwise. Eject media. Return 1 if successful, 0 otherwise.
*/ */
@@ -300,4 +268,3 @@ get_track_green_freebsd_ioctl(void *env, track_t track_num)
} }
#endif /* HAVE_FREEBSD_CDROM */ #endif /* HAVE_FREEBSD_CDROM */

6
lib/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_linux.c,v 1.45 2004/05/10 03:28:54 rocky Exp $ $Id: _cdio_linux.c,v 1.46 2004/05/13 04:32:12 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.45 2004/05/10 03:28:54 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.46 2004/05/13 04:32:12 rocky Exp $";
#include <string.h> #include <string.h>
@@ -882,7 +882,7 @@ _get_track_format_linux(void *env, track_t track_num)
/* This is pretty much copied from the "badly broken" cdrom_count_tracks /* This is pretty much copied from the "badly broken" cdrom_count_tracks
in linux/cdrom.c. in linux/cdrom.c.
*/ */
if (_obj->tocent[track_num-1].cdte_ctrl & CDROM_DATA_TRACK) { if (_obj->tocent[track_num-1].cdte_ctrl & CDIO_CDROM_DATA_TRACK) {
if (_obj->tocent[track_num-1].cdte_format == 0x10) if (_obj->tocent[track_num-1].cdte_format == 0x10)
return TRACK_FORMAT_CDI; return TRACK_FORMAT_CDI;
else if (_obj->tocent[track_num-1].cdte_format == 0x20) else if (_obj->tocent[track_num-1].cdte_format == 0x20)