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

Hopefully improve names. "user_data" comes from user. "env" an

Browse Source 
environment is really what this is. "obj" is just to vague.
This commit is contained in:
rocky
2004-05-31 12:29:09 +00:00
parent 59a3a3af4e
commit 376e021218
3 changed files with 184 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/_cdio_generic.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_generic.c,v 1.15 2004/05/13 01:50:20 rocky Exp $ $Id: _cdio_generic.c,v 1.16 2004/05/31 12:29:09 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_generic.c,v 1.15 2004/05/13 01:50:20 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.16 2004/05/31 12:29:09 rocky Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -62,15 +62,15 @@ cdio_generic_bogus_eject_media (void *user_data) {
void void
cdio_generic_free (void *user_data) cdio_generic_free (void *user_data)
{ {
generic_img_private_t *_obj = user_data; generic_img_private_t *env = user_data;
if (NULL == _obj) return; if (NULL == env) return;
free (_obj->source_name); free (env->source_name);
if (_obj->fd >= 0) if (env->fd >= 0)
close (_obj->fd); close (env->fd);
free (_obj); free (env);
} }
/*! /*!
@@ -79,22 +79,22 @@ cdio_generic_free (void *user_data)
bool bool
cdio_generic_init (void *user_data) cdio_generic_init (void *user_data)
{ {
generic_img_private_t *_obj = user_data; generic_img_private_t *_env = user_data;
if (_obj->init) { if (_env->init) {
cdio_error ("init called more than once"); cdio_error ("init called more than once");
return false; return false;
} }
_obj->fd = open (_obj->source_name, O_RDONLY, 0); _env->fd = open (_env->source_name, O_RDONLY, 0);
if (_obj->fd < 0) if (_env->fd < 0)
{ {
cdio_warn ("open (%s): %s", _obj->source_name, strerror (errno)); cdio_warn ("open (%s): %s", _env->source_name, strerror (errno));
return false; return false;
} }
_obj->init = true; _env->init = true;
_obj->toc_init = false; _env->toc_init = false;
return true; return true;
} }
@@ -106,8 +106,8 @@ cdio_generic_init (void *user_data)
off_t off_t
cdio_generic_lseek (void *user_data, off_t offset, int whence) cdio_generic_lseek (void *user_data, off_t offset, int whence)
{ {
generic_img_private_t *_obj = user_data; generic_img_private_t *_env = user_data;
return lseek(_obj->fd, offset, whence); return lseek(_env->fd, offset, whence);
} }
/*! /*!
@@ -118,8 +118,8 @@ cdio_generic_lseek (void *user_data, off_t offset, int whence)
ssize_t ssize_t
cdio_generic_read (void *user_data, void *buf, size_t size) cdio_generic_read (void *user_data, void *buf, size_t size)
{ {
generic_img_private_t *_obj = user_data; generic_img_private_t *_env = user_data;
return read(_obj->fd, buf, size); return read(_env->fd, buf, size);
} }
/*! /*!
@@ -128,14 +128,14 @@ cdio_generic_read (void *user_data, void *buf, size_t size)
void void
cdio_generic_stdio_free (void *user_data) cdio_generic_stdio_free (void *user_data)
{ {
generic_img_private_t *_obj = user_data; generic_img_private_t *_env = user_data;
if (NULL == _obj) return; if (NULL == _env) return;
if (NULL != _obj->source_name) if (NULL != _env->source_name)
free (_obj->source_name); free (_env->source_name);
if (_obj->data_source) if (_env->data_source)
cdio_stdio_destroy (_obj->data_source); cdio_stdio_destroy (_env->data_source);
} }

134
lib/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_linux.c,v 1.47 2004/05/27 10:58:11 rocky Exp $ $Id: _cdio_linux.c,v 1.48 2004/05/31 12:29:09 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.47 2004/05/27 10:58:11 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.48 2004/05/31 12:29:09 rocky Exp $";
#include <string.h> #include <string.h>
@@ -67,8 +67,8 @@ static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.47 2004/05/27 10:58:11 rock
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#define TOTAL_TRACKS (_obj->tochdr.cdth_trk1) #define TOTAL_TRACKS (env->tochdr.cdth_trk1)
#define FIRST_TRACK_NUM (_obj->tochdr.cdth_trk0) #define FIRST_TRACK_NUM (env->tochdr.cdth_trk0)
typedef enum { typedef enum {
_AM_NONE, _AM_NONE,
@@ -287,11 +287,11 @@ _cdio_mmc_read_sectors (int fd, void *buf, lba_t lba, int sector_type,
Can read only up to 25 blocks. Can read only up to 25 blocks.
*/ */
static int static int
_read_audio_sectors_linux (void *env, void *buf, lsn_t lsn, _read_audio_sectors_linux (void *user_data, void *buf, lsn_t lsn,
unsigned int nblocks) unsigned int nblocks)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
return _cdio_mmc_read_sectors( _obj->gen.fd, buf, lsn, return _cdio_mmc_read_sectors( env->gen.fd, buf, lsn,
CDIO_MMC_READ_TYPE_CDDA, nblocks); CDIO_MMC_READ_TYPE_CDDA, nblocks);
} }
@@ -452,16 +452,16 @@ _read_mode1_sector_linux (void *env, void *data, lsn_t lsn,
Returns 0 if no error. Returns 0 if no error.
*/ */
static int static int
_read_mode1_sectors_linux (void *env, void *data, lsn_t lsn, _read_mode1_sectors_linux (void *user_data, void *data, lsn_t lsn,
bool b_form2, unsigned int nblocks) bool b_form2, unsigned int nblocks)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
unsigned int i; unsigned int i;
int retval; int retval;
unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE; unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
for (i = 0; i < nblocks; i++) { for (i = 0; i < nblocks; i++) {
if ( (retval = _read_mode1_sector_linux (_obj, if ( (retval = _read_mode1_sector_linux (env,
((char *)data) + (blocksize * i), ((char *)data) + (blocksize * i),
lsn + i, b_form2)) ) lsn + i, b_form2)) )
return retval; return retval;
@@ -474,14 +474,14 @@ _read_mode1_sectors_linux (void *env, void *data, lsn_t lsn,
from lsn. Returns 0 if no error. from lsn. Returns 0 if no error.
*/ */
static int static int
_read_mode2_sector_linux (void *env, void *data, lsn_t lsn, _read_mode2_sector_linux (void *user_data, void *data, lsn_t lsn,
bool b_form2) bool b_form2)
{ {
char buf[M2RAW_SECTOR_SIZE] = { 0, }; char buf[M2RAW_SECTOR_SIZE] = { 0, };
struct cdrom_msf *msf = (struct cdrom_msf *) &buf; struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
msf_t _msf; msf_t _msf;
_img_private_t *_obj = env; _img_private_t *env = user_data;
cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf); cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf);
msf->cdmsf_min0 = from_bcd8(_msf.m); msf->cdmsf_min0 = from_bcd8(_msf.m);
@@ -489,7 +489,7 @@ _read_mode2_sector_linux (void *env, void *data, lsn_t lsn,
msf->cdmsf_frame0 = from_bcd8(_msf.f); msf->cdmsf_frame0 = from_bcd8(_msf.f);
retry: retry:
switch (_obj->access_mode) switch (env->access_mode)
{ {
case _AM_NONE: case _AM_NONE:
cdio_error ("no way to read mode2"); cdio_error ("no way to read mode2");
@@ -497,7 +497,7 @@ _read_mode2_sector_linux (void *env, void *data, lsn_t lsn,
break; break;
case _AM_IOCTL: case _AM_IOCTL:
if (ioctl (_obj->gen.fd, CDROMREADMODE2, &buf) == -1) if (ioctl (env->gen.fd, CDROMREADMODE2, &buf) == -1)
{ {
perror ("ioctl()"); perror ("ioctl()");
return 1; return 1;
@@ -507,20 +507,20 @@ _read_mode2_sector_linux (void *env, void *data, lsn_t lsn,
case _AM_READ_CD: case _AM_READ_CD:
case _AM_READ_10: case _AM_READ_10:
if (_read_packet_mode2_sectors (_obj->gen.fd, buf, lsn, 1, if (_read_packet_mode2_sectors (env->gen.fd, buf, lsn, 1,
(_obj->access_mode == _AM_READ_10))) (env->access_mode == _AM_READ_10)))
{ {
perror ("ioctl()"); perror ("ioctl()");
if (_obj->access_mode == _AM_READ_CD) if (env->access_mode == _AM_READ_CD)
{ {
cdio_info ("READ_CD failed; switching to READ_10 mode..."); cdio_info ("READ_CD failed; switching to READ_10 mode...");
_obj->access_mode = _AM_READ_10; env->access_mode = _AM_READ_10;
goto retry; goto retry;
} }
else else
{ {
cdio_info ("READ_10 failed; switching to ioctl(CDROMREADMODE2) mode..."); cdio_info ("READ_10 failed; switching to ioctl(CDROMREADMODE2) mode...");
_obj->access_mode = _AM_IOCTL; env->access_mode = _AM_IOCTL;
goto retry; goto retry;
} }
return 1; return 1;
@@ -542,16 +542,16 @@ _read_mode2_sector_linux (void *env, void *data, lsn_t lsn,
Returns 0 if no error. Returns 0 if no error.
*/ */
static int static int
_read_mode2_sectors_linux (void *env, void *data, lsn_t lsn, _read_mode2_sectors_linux (void *user_data, void *data, lsn_t lsn,
bool b_form2, unsigned int nblocks) bool b_form2, unsigned int nblocks)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
unsigned int i; unsigned int i;
int retval; int retval;
unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE; unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
for (i = 0; i < nblocks; i++) { for (i = 0; i < nblocks; i++) {
if ( (retval = _read_mode2_sector_linux (_obj, if ( (retval = _read_mode2_sector_linux (env,
((char *)data) + (blocksize * i), ((char *)data) + (blocksize * i),
lsn + i, b_form2)) ) lsn + i, b_form2)) )
return retval; return retval;
@@ -563,16 +563,16 @@ _read_mode2_sectors_linux (void *env, void *data, lsn_t lsn,
Return the size of the CD in logical block address (LBA) units. Return the size of the CD in logical block address (LBA) units.
*/ */
static uint32_t static uint32_t
_stat_size_linux (void *env) _stat_size_linux (void *user_data)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
struct cdrom_tocentry tocent; struct cdrom_tocentry tocent;
uint32_t size; uint32_t size;
tocent.cdte_track = CDIO_CDROM_LEADOUT_TRACK; tocent.cdte_track = CDIO_CDROM_LEADOUT_TRACK;
tocent.cdte_format = CDROM_LBA; tocent.cdte_format = CDROM_LBA;
if (ioctl (_obj->gen.fd, CDROMREADTOCENTRY, &tocent) == -1) if (ioctl (env->gen.fd, CDROMREADTOCENTRY, &tocent) == -1)
{ {
perror ("ioctl(CDROMREADTOCENTRY)"); perror ("ioctl(CDROMREADTOCENTRY)");
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
@@ -592,18 +592,18 @@ _stat_size_linux (void *env)
0 is returned if no error was found, and nonzero if there as an error. 0 is returned if no error was found, and nonzero if there as an error.
*/ */
static int static int
_set_arg_linux (void *env, const char key[], const char value[]) _set_arg_linux (void *user_data, const char key[], const char value[])
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (!strcmp (key, "source")) if (!strcmp (key, "source"))
{ {
if (!value) if (!value)
return -2; return -2;
free (_obj->gen.source_name); free (env->gen.source_name);
_obj->gen.source_name = strdup (value); env->gen.source_name = strdup (value);
} }
else if (!strcmp (key, "access-mode")) else if (!strcmp (key, "access-mode"))
{ {
@@ -620,12 +620,12 @@ _set_arg_linux (void *env, const char key[], const char value[])
Return false if successful or true if an error. Return false if successful or true if an error.
*/ */
static bool static bool
_cdio_read_toc (_img_private_t *_obj) _cdio_read_toc (_img_private_t *env)
{ {
int i; int i;
/* read TOC header */ /* read TOC header */
if ( ioctl(_obj->gen.fd, CDROMREADTOCHDR, &_obj->tochdr) == -1 ) { if ( ioctl(env->gen.fd, CDROMREADTOCHDR, &env->tochdr) == -1 ) {
cdio_error("%s: %s\n", cdio_error("%s: %s\n",
"error in ioctl CDROMREADTOCHDR", strerror(errno)); "error in ioctl CDROMREADTOCHDR", strerror(errno));
return false; return false;
@@ -633,17 +633,17 @@ _cdio_read_toc (_img_private_t *_obj)
/* read individual tracks */ /* read individual tracks */
for (i= FIRST_TRACK_NUM; i<=TOTAL_TRACKS; i++) { for (i= FIRST_TRACK_NUM; i<=TOTAL_TRACKS; i++) {
_obj->tocent[i-FIRST_TRACK_NUM].cdte_track = i; env->tocent[i-FIRST_TRACK_NUM].cdte_track = i;
_obj->tocent[i-FIRST_TRACK_NUM].cdte_format = CDROM_MSF; env->tocent[i-FIRST_TRACK_NUM].cdte_format = CDROM_MSF;
if ( ioctl(_obj->gen.fd, CDROMREADTOCENTRY, if ( ioctl(env->gen.fd, CDROMREADTOCENTRY,
&_obj->tocent[i-FIRST_TRACK_NUM]) == -1 ) { &env->tocent[i-FIRST_TRACK_NUM]) == -1 ) {
cdio_error("%s %d: %s\n", cdio_error("%s %d: %s\n",
"error in ioctl CDROMREADTOCENTRY for track", "error in ioctl CDROMREADTOCENTRY for track",
i, strerror(errno)); i, strerror(errno));
return false; return false;
} }
/**** /****
struct cdrom_msf0 *msf= &_obj->tocent[i-1].cdte_addr.msf; struct cdrom_msf0 *msf= &env->tocent[i-1].cdte_addr.msf;
fprintf (stdout, "--- track# %d (msf %2.2x:%2.2x:%2.2x)\n", fprintf (stdout, "--- track# %d (msf %2.2x:%2.2x:%2.2x)\n",
i, msf->minute, msf->second, msf->frame); i, msf->minute, msf->second, msf->frame);
@@ -652,11 +652,11 @@ _cdio_read_toc (_img_private_t *_obj)
} }
/* read the lead-out track */ /* read the lead-out track */
_obj->tocent[TOTAL_TRACKS].cdte_track = CDIO_CDROM_LEADOUT_TRACK; env->tocent[TOTAL_TRACKS].cdte_track = CDIO_CDROM_LEADOUT_TRACK;
_obj->tocent[TOTAL_TRACKS].cdte_format = CDROM_MSF; env->tocent[TOTAL_TRACKS].cdte_format = CDROM_MSF;
if (ioctl(_obj->gen.fd, CDROMREADTOCENTRY, if (ioctl(env->gen.fd, CDROMREADTOCENTRY,
&_obj->tocent[TOTAL_TRACKS]) == -1 ) { &env->tocent[TOTAL_TRACKS]) == -1 ) {
cdio_error("%s: %s\n", cdio_error("%s: %s\n",
"error in ioctl CDROMREADTOCENTRY for lead-out", "error in ioctl CDROMREADTOCENTRY for lead-out",
strerror(errno)); strerror(errno));
@@ -664,13 +664,13 @@ _cdio_read_toc (_img_private_t *_obj)
} }
/* /*
struct cdrom_msf0 *msf= &_obj->tocent[TOTAL_TRACKS].cdte_addr.msf; struct cdrom_msf0 *msf= &env->tocent[TOTAL_TRACKS].cdte_addr.msf;
fprintf (stdout, "--- track# %d (msf %2.2x:%2.2x:%2.2x)\n", fprintf (stdout, "--- track# %d (msf %2.2x:%2.2x:%2.2x)\n",
i, msf->minute, msf->second, msf->frame); i, msf->minute, msf->second, msf->frame);
*/ */
_obj->gen.toc_init = true; env->gen.toc_init = true;
return true; return true;
} }
@@ -733,16 +733,16 @@ _eject_media_mmc(int fd)
Return 0 if success and 1 for failure, and 2 if no routine. Return 0 if success and 1 for failure, and 2 if no routine.
*/ */
static int static int
_eject_media_linux (void *env) { _eject_media_linux (void *user_data) {
_img_private_t *_obj = env; _img_private_t *env = user_data;
int ret=2; int ret=2;
int status; int status;
int fd; int fd;
close(_obj->gen.fd); close(env->gen.fd);
_obj->gen.fd = -1; env->gen.fd = -1;
if ((fd = open (_obj->gen.source_name, O_RDONLY|O_NONBLOCK)) > -1) { if ((fd = open (env->gen.source_name, O_RDONLY|O_NONBLOCK)) > -1) {
if((status = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)) > 0) { if((status = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT)) > 0) {
switch(status) { switch(status) {
case CDS_TRAY_OPEN: case CDS_TRAY_OPEN:
@@ -806,11 +806,11 @@ _get_arg_linux (void *env, const char key[])
CDIO_INVALID_TRACK is returned on error. CDIO_INVALID_TRACK is returned on error.
*/ */
static track_t static track_t
_get_first_track_num_linux(void *env) _get_first_track_num_linux(void *user_data)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!env->gen.toc_init) _cdio_read_toc (env) ;
return FIRST_TRACK_NUM; return FIRST_TRACK_NUM;
} }
@@ -858,11 +858,11 @@ _get_drive_cap_linux (const void *env) {
CDIO_INVALID_TRACK is returned on error. CDIO_INVALID_TRACK is returned on error.
*/ */
static track_t static track_t
_get_num_tracks_linux(void *env) _get_num_tracks_linux(void *user_data)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!env->gen.toc_init) _cdio_read_toc (env) ;
return TOTAL_TRACKS; return TOTAL_TRACKS;
} }
@@ -871,11 +871,11 @@ _get_num_tracks_linux(void *env)
Get format of track. Get format of track.
*/ */
static track_format_t static track_format_t
_get_track_format_linux(void *env, track_t i_track) _get_track_format_linux(void *user_data, track_t i_track)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!env->gen.toc_init) _cdio_read_toc (env) ;
if (i_track > TOTAL_TRACKS || i_track == 0) if (i_track > TOTAL_TRACKS || i_track == 0)
return TRACK_FORMAT_ERROR; return TRACK_FORMAT_ERROR;
@@ -883,10 +883,10 @@ _get_track_format_linux(void *env, track_t i_track)
/* 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[i_track-FIRST_TRACK_NUM].cdte_ctrl & CDIO_CDROM_DATA_TRACK) { if (env->tocent[i_track-FIRST_TRACK_NUM].cdte_ctrl & CDIO_CDROM_DATA_TRACK) {
if (_obj->tocent[i_track-FIRST_TRACK_NUM].cdte_format == 0x10) if (env->tocent[i_track-FIRST_TRACK_NUM].cdte_format == 0x10)
return TRACK_FORMAT_CDI; return TRACK_FORMAT_CDI;
else if (_obj->tocent[i_track-FIRST_TRACK_NUM].cdte_format == 0x20) else if (env->tocent[i_track-FIRST_TRACK_NUM].cdte_format == 0x20)
return TRACK_FORMAT_XA; return TRACK_FORMAT_XA;
else else
return TRACK_FORMAT_DATA; return TRACK_FORMAT_DATA;
@@ -904,11 +904,11 @@ _get_track_format_linux(void *env, track_t i_track)
FIXME: there's gotta be a better design for this and get_track_format? FIXME: there's gotta be a better design for this and get_track_format?
*/ */
static bool static bool
_get_track_green_linux(void *env, track_t i_track) _get_track_green_linux(void *user_data, track_t i_track)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!env->gen.toc_init) _cdio_read_toc (env) ;
if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = TOTAL_TRACKS+1; if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = TOTAL_TRACKS+1;
@@ -918,7 +918,7 @@ _get_track_green_linux(void *env, track_t i_track)
/* 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 ((_obj->tocent[i_track-FIRST_TRACK_NUM].cdte_ctrl & 2) != 0); return ((env->tocent[i_track-FIRST_TRACK_NUM].cdte_ctrl & 2) != 0);
} }
/*! /*!
@@ -929,20 +929,20 @@ _get_track_green_linux(void *env, track_t i_track)
False is returned if there is no track entry. False is returned if there is no track entry.
*/ */
static bool static bool
_get_track_msf_linux(void *env, track_t i_track, msf_t *msf) _get_track_msf_linux(void *user_data, track_t i_track, msf_t *msf)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (NULL == msf) return false; if (NULL == msf) return false;
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!env->gen.toc_init) _cdio_read_toc (env) ;
if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = TOTAL_TRACKS+1; if (i_track == CDIO_CDROM_LEADOUT_TRACK) i_track = TOTAL_TRACKS+1;
if (i_track > TOTAL_TRACKS+1 || i_track == 0) { if (i_track > TOTAL_TRACKS+1 || i_track == 0) {
return false; return false;
} else { } else {
struct cdrom_msf0 *msf0= &_obj->tocent[i_track-FIRST_TRACK_NUM].cdte_addr.msf; struct cdrom_msf0 *msf0= &env->tocent[i_track-FIRST_TRACK_NUM].cdte_addr.msf;
msf->m = to_bcd8(msf0->minute); msf->m = to_bcd8(msf0->minute);
msf->s = to_bcd8(msf0->second); msf->s = to_bcd8(msf0->second);
msf->f = to_bcd8(msf0->frame); msf->f = to_bcd8(msf0->frame);

184
lib/_cdio_sunos.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_sunos.c,v 1.32 2004/05/10 03:28:54 rocky Exp $ $Id: _cdio_sunos.c,v 1.33 2004/05/31 12:29:09 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>
@@ -41,7 +41,7 @@
#ifdef HAVE_SOLARIS_CDROM #ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.32 2004/05/10 03:28:54 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.33 2004/05/31 12:29:09 rocky Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -63,8 +63,8 @@ static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.32 2004/05/10 03:28:54 rock
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#define TOTAL_TRACKS (_obj->tochdr.cdth_trk1) #define TOTAL_TRACKS (env->tochdr.cdth_trk1)
#define FIRST_TRACK_NUM (_obj->tochdr.cdth_trk0) #define FIRST_TRACK_NUM (env->tochdr.cdth_trk0)
/* reader */ /* reader */
@@ -115,12 +115,12 @@ str_to_access_mode_sunos(const char *psz_access_mode)
Initialize CD device. Initialize CD device.
*/ */
static bool static bool
_cdio_init (_img_private_t *_obj) _cdio_init (_img_private_t *env)
{ {
if (!cdio_generic_init(_obj)) return false; if (!cdio_generic_init(env)) return false;
_obj->access_mode = _AM_SUN_CTRL_SCSI; env->access_mode = _AM_SUN_CTRL_SCSI;
return true; return true;
} }
@@ -134,7 +134,7 @@ _cdio_init (_img_private_t *_obj)
*/ */
static int static int
_cdio_read_audio_sectors (void *env, void *data, lsn_t lsn, _cdio_read_audio_sectors (void *user_data, void *data, lsn_t lsn,
unsigned int nblocks) unsigned int nblocks)
{ {
char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, }; char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
@@ -142,31 +142,31 @@ _cdio_read_audio_sectors (void *env, void *data, lsn_t lsn,
msf_t _msf; msf_t _msf;
struct cdrom_cdda cdda; struct cdrom_cdda cdda;
_img_private_t *_obj = env; _img_private_t *env = user_data;
cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf); cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf);
msf->cdmsf_min0 = from_bcd8(_msf.m); msf->cdmsf_min0 = from_bcd8(_msf.m);
msf->cdmsf_sec0 = from_bcd8(_msf.s); msf->cdmsf_sec0 = from_bcd8(_msf.s);
msf->cdmsf_frame0 = from_bcd8(_msf.f); msf->cdmsf_frame0 = from_bcd8(_msf.f);
if (_obj->gen.ioctls_debugged == 75) if (env->gen.ioctls_debugged == 75)
cdio_debug ("only displaying every 75th ioctl from now on"); cdio_debug ("only displaying every 75th ioctl from now on");
if (_obj->gen.ioctls_debugged == 30 * 75) if (env->gen.ioctls_debugged == 30 * 75)
cdio_debug ("only displaying every 30*75th ioctl from now on"); cdio_debug ("only displaying every 30*75th ioctl from now on");
if (_obj->gen.ioctls_debugged < 75 if (env->gen.ioctls_debugged < 75
|| (_obj->gen.ioctls_debugged < (30 * 75) || (env->gen.ioctls_debugged < (30 * 75)
&& _obj->gen.ioctls_debugged % 75 == 0) && env->gen.ioctls_debugged % 75 == 0)
|| _obj->gen.ioctls_debugged % (30 * 75) == 0) || env->gen.ioctls_debugged % (30 * 75) == 0)
cdio_debug ("reading %d", lsn); cdio_debug ("reading %d", lsn);
_obj->gen.ioctls_debugged++; env->gen.ioctls_debugged++;
cdda.cdda_addr = lsn; cdda.cdda_addr = lsn;
cdda.cdda_length = nblocks; cdda.cdda_length = nblocks;
cdda.cdda_data = (caddr_t) data; cdda.cdda_data = (caddr_t) data;
if (ioctl (_obj->gen.fd, CDROMCDDA, &cdda) == -1) { if (ioctl (env->gen.fd, CDROMCDDA, &cdda) == -1) {
perror ("ioctl(..,CDROMCDDA,..)"); perror ("ioctl(..,CDROMCDDA,..)");
return 1; return 1;
/* exit (EXIT_FAILURE); */ /* exit (EXIT_FAILURE); */
@@ -204,16 +204,16 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
Returns 0 if no error. Returns 0 if no error.
*/ */
static int static int
_cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn, _cdio_read_mode1_sectors (void *user_data, void *data, lsn_t lsn,
bool b_form2, unsigned int nblocks) bool b_form2, unsigned int nblocks)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
unsigned int i; unsigned int i;
int retval; int retval;
unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE; unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
for (i = 0; i < nblocks; i++) { for (i = 0; i < nblocks; i++) {
if ( (retval = _cdio_read_mode1_sector (_obj, if ( (retval = _cdio_read_mode1_sector (env,
((char *)data) + (blocksize * i), ((char *)data) + (blocksize * i),
lsn + i, b_form2)) ) lsn + i, b_form2)) )
return retval; return retval;
@@ -226,7 +226,7 @@ _cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
Returns 0 if no error. Returns 0 if no error.
*/ */
static int static int
_cdio_read_mode2_sector (void *env, void *data, lsn_t lsn, _cdio_read_mode2_sector (void *user_data, void *data, lsn_t lsn,
bool b_form2) bool b_form2)
{ {
char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, }; char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
@@ -235,27 +235,27 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
int offset = 0; int offset = 0;
struct cdrom_cdxa cd_read; struct cdrom_cdxa cd_read;
_img_private_t *_obj = env; _img_private_t *env = user_data;
cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf); cdio_lba_to_msf (cdio_lsn_to_lba(lsn), &_msf);
msf->cdmsf_min0 = from_bcd8(_msf.m); msf->cdmsf_min0 = from_bcd8(_msf.m);
msf->cdmsf_sec0 = from_bcd8(_msf.s); msf->cdmsf_sec0 = from_bcd8(_msf.s);
msf->cdmsf_frame0 = from_bcd8(_msf.f); msf->cdmsf_frame0 = from_bcd8(_msf.f);
if (_obj->gen.ioctls_debugged == 75) if (env->gen.ioctls_debugged == 75)
cdio_debug ("only displaying every 75th ioctl from now on"); cdio_debug ("only displaying every 75th ioctl from now on");
if (_obj->gen.ioctls_debugged == 30 * 75) if (env->gen.ioctls_debugged == 30 * 75)
cdio_debug ("only displaying every 30*75th ioctl from now on"); cdio_debug ("only displaying every 30*75th ioctl from now on");
if (_obj->gen.ioctls_debugged < 75 if (env->gen.ioctls_debugged < 75
|| (_obj->gen.ioctls_debugged < (30 * 75) || (env->gen.ioctls_debugged < (30 * 75)
&& _obj->gen.ioctls_debugged % 75 == 0) && env->gen.ioctls_debugged % 75 == 0)
|| _obj->gen.ioctls_debugged % (30 * 75) == 0) || env->gen.ioctls_debugged % (30 * 75) == 0)
cdio_debug ("reading %2.2d:%2.2d:%2.2d", cdio_debug ("reading %2.2d:%2.2d:%2.2d",
msf->cdmsf_min0, msf->cdmsf_sec0, msf->cdmsf_frame0); msf->cdmsf_min0, msf->cdmsf_sec0, msf->cdmsf_frame0);
_obj->gen.ioctls_debugged++; env->gen.ioctls_debugged++;
/* Using CDROMXA ioctl will actually use the same uscsi command /* Using CDROMXA ioctl will actually use the same uscsi command
* as ATAPI, except we don't need to be root * as ATAPI, except we don't need to be root
@@ -265,7 +265,7 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
cd_read.cdxa_data = buf; cd_read.cdxa_data = buf;
cd_read.cdxa_length = 1; cd_read.cdxa_length = 1;
cd_read.cdxa_format = CDROM_XA_SECTOR_DATA; cd_read.cdxa_format = CDROM_XA_SECTOR_DATA;
if (ioctl (_obj->gen.fd, CDROMCDXA, &cd_read) == -1) { if (ioctl (env->gen.fd, CDROMCDXA, &cd_read) == -1) {
perror ("ioctl(..,CDROMCDXA,..)"); perror ("ioctl(..,CDROMCDXA,..)");
return 1; return 1;
/* exit (EXIT_FAILURE); */ /* exit (EXIT_FAILURE); */
@@ -285,16 +285,16 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
Returns 0 if no error. Returns 0 if no error.
*/ */
static int static int
_cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn, _cdio_read_mode2_sectors (void *user_data, void *data, lsn_t lsn,
bool b_form2, unsigned int nblocks) bool b_form2, unsigned int nblocks)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
unsigned int i; unsigned int i;
int retval; int retval;
unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE; unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
for (i = 0; i < nblocks; i++) { for (i = 0; i < nblocks; i++) {
if ( (retval = _cdio_read_mode2_sector (_obj, if ( (retval = _cdio_read_mode2_sector (env,
((char *)data) + (blocksize * i), ((char *)data) + (blocksize * i),
lsn + i, b_form2)) ) lsn + i, b_form2)) )
return retval; return retval;
@@ -307,16 +307,16 @@ _cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn,
Return the size of the CD in logical block address (LBA) units. Return the size of the CD in logical block address (LBA) units.
*/ */
static uint32_t static uint32_t
_cdio_stat_size (void *env) _cdio_stat_size (void *user_data)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
struct cdrom_tocentry tocent; struct cdrom_tocentry tocent;
uint32_t size; uint32_t size;
tocent.cdte_track = CDIO_CDROM_LEADOUT_TRACK; tocent.cdte_track = CDIO_CDROM_LEADOUT_TRACK;
tocent.cdte_format = CDROM_LBA; tocent.cdte_format = CDROM_LBA;
if (ioctl (_obj->gen.fd, CDROMREADTOCENTRY, &tocent) == -1) if (ioctl (env->gen.fd, CDROMREADTOCENTRY, &tocent) == -1)
{ {
perror ("ioctl(CDROMREADTOCENTRY)"); perror ("ioctl(CDROMREADTOCENTRY)");
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
@@ -336,22 +336,22 @@ _cdio_stat_size (void *env)
0 is returned if no error was found, and nonzero if there as an error. 0 is returned if no error was found, and nonzero if there as an error.
*/ */
static int static int
_set_arg_solaris (void *env, const char key[], const char value[]) _set_arg_solaris (void *user_data, const char key[], const char value[])
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (!strcmp (key, "source")) if (!strcmp (key, "source"))
{ {
if (!value) if (!value)
return -2; return -2;
free (_obj->gen.source_name); free (env->gen.source_name);
_obj->gen.source_name = strdup (value); env->gen.source_name = strdup (value);
} }
else if (!strcmp (key, "access-mode")) else if (!strcmp (key, "access-mode"))
{ {
_obj->access_mode = str_to_access_mode_sunos(key); env->access_mode = str_to_access_mode_sunos(key);
} }
else else
return -1; return -1;
@@ -364,22 +364,22 @@ _set_arg_solaris (void *env, const char key[], const char value[])
Return true if successful or false if an error. Return true if successful or false if an error.
*/ */
static bool static bool
_cdio_read_toc (_img_private_t *_obj) _cdio_read_toc (_img_private_t *env)
{ {
int i; int i;
/* read TOC header */ /* read TOC header */
if ( ioctl(_obj->gen.fd, CDROMREADTOCHDR, &_obj->tochdr) == -1 ) { if ( ioctl(env->gen.fd, CDROMREADTOCHDR, &env->tochdr) == -1 ) {
cdio_error("%s: %s\n", cdio_error("%s: %s\n",
"error in ioctl CDROMREADTOCHDR", strerror(errno)); "error in ioctl CDROMREADTOCHDR", strerror(errno));
return false; return false;
} }
/* read individual tracks */ /* read individual tracks */
for (i=_obj->tochdr.cdth_trk0; i<=_obj->tochdr.cdth_trk1; i++) { for (i=env->tochdr.cdth_trk0; i<=env->tochdr.cdth_trk1; i++) {
_obj->tocent[i-1].cdte_track = i; env->tocent[i-1].cdte_track = i;
_obj->tocent[i-1].cdte_format = CDROM_MSF; env->tocent[i-1].cdte_format = CDROM_MSF;
if ( ioctl(_obj->gen.fd, CDROMREADTOCENTRY, &_obj->tocent[i-1]) == -1 ) { if ( ioctl(env->gen.fd, CDROMREADTOCENTRY, &env->tocent[i-1]) == -1 ) {
cdio_error("%s %d: %s\n", cdio_error("%s %d: %s\n",
"error in ioctl CDROMREADTOCENTRY for track", "error in ioctl CDROMREADTOCENTRY for track",
i, strerror(errno)); i, strerror(errno));
@@ -388,18 +388,18 @@ _cdio_read_toc (_img_private_t *_obj)
} }
/* read the lead-out track */ /* read the lead-out track */
_obj->tocent[_obj->tochdr.cdth_trk1].cdte_track = CDIO_CDROM_LEADOUT_TRACK; env->tocent[env->tochdr.cdth_trk1].cdte_track = CDIO_CDROM_LEADOUT_TRACK;
_obj->tocent[_obj->tochdr.cdth_trk1].cdte_format = CDROM_MSF; env->tocent[env->tochdr.cdth_trk1].cdte_format = CDROM_MSF;
if (ioctl(_obj->gen.fd, CDROMREADTOCENTRY, if (ioctl(env->gen.fd, CDROMREADTOCENTRY,
&_obj->tocent[_obj->tochdr.cdth_trk1]) == -1 ) { &env->tocent[env->tochdr.cdth_trk1]) == -1 ) {
cdio_error("%s: %s\n", cdio_error("%s: %s\n",
"error in ioctl CDROMREADTOCENTRY for lead-out", "error in ioctl CDROMREADTOCENTRY for lead-out",
strerror(errno)); strerror(errno));
return false; return false;
} }
_obj->gen.toc_init = true; env->gen.toc_init = true;
return true; return true;
} }
@@ -408,16 +408,16 @@ _cdio_read_toc (_img_private_t *_obj)
also free obj. also free obj.
*/ */
static int static int
_cdio_eject_media (void *env) { _cdio_eject_media (void *user_data) {
_img_private_t *_obj = env; _img_private_t *env = user_data;
int ret; int ret;
close(_obj->gen.fd); close(env->gen.fd);
_obj->gen.fd = -1; env->gen.fd = -1;
if (_obj->gen.fd > -1) { if (env->gen.fd > -1) {
if ((ret = ioctl(_obj->gen.fd, CDROMEJECT)) != 0) { if ((ret = ioctl(env->gen.fd, CDROMEJECT)) != 0) {
cdio_generic_free((void *) _obj); cdio_generic_free((void *) env);
cdio_error ("CDROMEJECT failed: %s\n", strerror(errno)); cdio_error ("CDROMEJECT failed: %s\n", strerror(errno));
return 1; return 1;
} else { } else {
@@ -447,14 +447,14 @@ _cdio_malloc_and_zero(size_t size) {
Return the value associated with the key "arg". Return the value associated with the key "arg".
*/ */
static const char * static const char *
_cdio_get_arg (void *env, const char key[]) _cdio_get_arg (void *user_data, const char key[])
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (!strcmp (key, "source")) { if (!strcmp (key, "source")) {
return _obj->gen.source_name; return env->gen.source_name;
} else if (!strcmp (key, "access-mode")) { } else if (!strcmp (key, "access-mode")) {
switch (_obj->access_mode) { switch (env->access_mode) {
case _AM_SUN_CTRL_ATAPI: case _AM_SUN_CTRL_ATAPI:
return "ATAPI"; return "ATAPI";
case _AM_SUN_CTRL_SCSI: case _AM_SUN_CTRL_SCSI:
@@ -505,7 +505,7 @@ cdio_get_default_device_solaris(void)
*/ */
static cdio_drive_cap_t static cdio_drive_cap_t
_cdio_get_drive_cap_solaris (const void *env) _cdio_get_drive_cap_solaris (const void *user_data)
{ {
#if 1 #if 1
struct uscsi_cmd my_cmd; struct uscsi_cmd my_cmd;
@@ -513,7 +513,7 @@ _cdio_get_drive_cap_solaris (const void *env)
char buf[192] = { 0, }; char buf[192] = { 0, };
unsigned char my_rq_buf[26]; unsigned char my_rq_buf[26];
unsigned char my_scsi_cdb[6]; unsigned char my_scsi_cdb[6];
const _img_private_t *_obj = env; const _img_private_t *env = user_data;
int rc; int rc;
memset(&my_scsi_cdb, 0, sizeof(my_scsi_cdb)); memset(&my_scsi_cdb, 0, sizeof(my_scsi_cdb));
@@ -536,7 +536,7 @@ _cdio_get_drive_cap_solaris (const void *env)
my_cmd.uscsi_rqlen = 24; /* The request sense buffer (only valid on a check condition) is 26 bytes long */ my_cmd.uscsi_rqlen = 24; /* The request sense buffer (only valid on a check condition) is 26 bytes long */
my_cmd.uscsi_rqbuf = my_rq_buf; /* Pointer to the request sense buffer */ my_cmd.uscsi_rqbuf = my_rq_buf; /* Pointer to the request sense buffer */
rc = ioctl(_obj->gen.fd, USCSICMD, &my_cmd); rc = ioctl(env->gen.fd, USCSICMD, &my_cmd);
if(rc == 0) { if(rc == 0) {
unsigned int n=buf[3]+4; unsigned int n=buf[3]+4;
/* Reader? */ /* Reader? */
@@ -571,14 +571,14 @@ _cdio_get_drive_cap_solaris (const void *env)
*/ */
static char * static char *
_cdio_get_mcn_solaris (const void *env) _cdio_get_mcn_solaris (const void *user_data)
{ {
#if 0 #if 0
struct uscsi_cmd my_cmd; struct uscsi_cmd my_cmd;
char buf[192] = { 0, }; char buf[192] = { 0, };
unsigned char my_rq_buf[32]; unsigned char my_rq_buf[32];
unsigned char my_scsi_cdb[6]; unsigned char my_scsi_cdb[6];
const _img_private_t *_obj = env; const _img_private_t *env = user_data;
int rc; int rc;
memset(&my_scsi_cdb, 0, sizeof(my_scsi_cdb)); memset(&my_scsi_cdb, 0, sizeof(my_scsi_cdb));
@@ -604,7 +604,7 @@ _cdio_get_mcn_solaris (const void *env)
my_cmd.uscsi_rqlen = 24; /* The request sense buffer (only valid on a check condition) is 26 bytes long */ my_cmd.uscsi_rqlen = 24; /* The request sense buffer (only valid on a check condition) is 26 bytes long */
my_cmd.uscsi_rqbuf = my_rq_buf; /* Pointer to the request sense buffer */ my_cmd.uscsi_rqbuf = my_rq_buf; /* Pointer to the request sense buffer */
rc = ioctl(_obj->gen.fd, USCSICMD, &my_cmd); rc = ioctl(env->gen.fd, USCSICMD, &my_cmd);
if(rc == 0) { if(rc == 0) {
return strdup(&buf[9]); return strdup(&buf[9]);
} }
@@ -620,11 +620,11 @@ _cdio_get_mcn_solaris (const void *env)
CDIO_INVALID_TRACK is returned on error. CDIO_INVALID_TRACK is returned on error.
*/ */
static track_t static track_t
_cdio_get_first_track_num(void *env) _cdio_get_first_track_num(void *user_data)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!env->gen.toc_init) _cdio_read_toc (env) ;
return FIRST_TRACK_NUM; return FIRST_TRACK_NUM;
} }
@@ -634,11 +634,11 @@ _cdio_get_first_track_num(void *env)
Return the number of tracks in the current medium. Return the number of tracks in the current medium.
*/ */
static track_t static track_t
_cdio_get_num_tracks(void *env) _cdio_get_num_tracks(void *user_data)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!env->gen.toc_init) _cdio_read_toc (env) ;
return TOTAL_TRACKS; return TOTAL_TRACKS;
} }
@@ -647,12 +647,12 @@ _cdio_get_num_tracks(void *env)
Get format of track. Get format of track.
*/ */
static track_format_t static track_format_t
_cdio_get_track_format(void *env, track_t track_num) _cdio_get_track_format(void *user_data, track_t track_num)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (!_obj->gen.init) _cdio_init(_obj); if (!env->gen.init) _cdio_init(env);
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!env->gen.toc_init) _cdio_read_toc (env) ;
if (track_num > TOTAL_TRACKS || track_num == 0) if (track_num > TOTAL_TRACKS || track_num == 0)
return TRACK_FORMAT_ERROR; return TRACK_FORMAT_ERROR;
@@ -660,10 +660,10 @@ _cdio_get_track_format(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 (env->tocent[track_num-1].cdte_ctrl & CDROM_DATA_TRACK) {
if (_obj->tocent[track_num-1].cdte_format == 0x10) if (env->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 (env->tocent[track_num-1].cdte_format == 0x20)
return TRACK_FORMAT_XA; return TRACK_FORMAT_XA;
else else
return TRACK_FORMAT_DATA; return TRACK_FORMAT_DATA;
@@ -681,12 +681,12 @@ _cdio_get_track_format(void *env, track_t track_num)
FIXME: there's gotta be a better design for this and get_track_format? FIXME: there's gotta be a better design for this and get_track_format?
*/ */
static bool static bool
_cdio_get_track_green(void *env, track_t track_num) _cdio_get_track_green(void *user_data, track_t track_num)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (!_obj->gen.init) _cdio_init(_obj); if (!env->gen.init) _cdio_init(env);
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!env->gen.toc_init) _cdio_read_toc (env) ;
if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1; if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1;
@@ -696,7 +696,7 @@ _cdio_get_track_green(void *env, track_t track_num)
/* 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 ((_obj->tocent[track_num-1].cdte_ctrl & 2) != 0); return ((env->tocent[track_num-1].cdte_ctrl & 2) != 0);
} }
/*! /*!
@@ -707,21 +707,21 @@ _cdio_get_track_green(void *env, track_t track_num)
False is returned if there is no entry. False is returned if there is no entry.
*/ */
static bool static bool
_cdio_get_track_msf(void *env, track_t track_num, msf_t *msf) _cdio_get_track_msf(void *user_data, track_t track_num, msf_t *msf)
{ {
_img_private_t *_obj = env; _img_private_t *env = user_data;
if (NULL == msf) return false; if (NULL == msf) return false;
if (!_obj->gen.init) _cdio_init(_obj); if (!env->gen.init) _cdio_init(env);
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!env->gen.toc_init) _cdio_read_toc (env) ;
if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1; if (track_num == CDIO_CDROM_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1;
if (track_num > TOTAL_TRACKS+1 || track_num == 0) { if (track_num > TOTAL_TRACKS+1 || track_num == 0) {
return false; return false;
} else { } else {
struct cdrom_tocentry *msf0 = &_obj->tocent[track_num-1]; struct cdrom_tocentry *msf0 = &env->tocent[track_num-1];
msf->m = to_bcd8(msf0->cdte_addr.msf.minute); msf->m = to_bcd8(msf0->cdte_addr.msf.minute);
msf->s = to_bcd8(msf0->cdte_addr.msf.second); msf->s = to_bcd8(msf0->cdte_addr.msf.second);
msf->f = to_bcd8(msf0->cdte_addr.msf.frame); msf->f = to_bcd8(msf0->cdte_addr.msf.frame);