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

With M$ we can no longer assume we can open a fd ant it will read

Browse Source 
properly. Add yellow-mode reads interface.

There's lots of cleanup to do...
This commit is contained in:
rocky
2003-06-07 20:42:49 +00:00
parent 4c5b8a3dfd
commit d0999c5ebc
3 changed files with 84 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/cdio/cdio.h
View File

@@ -1,5 +1,5 @@
/* -*- c -*- /* -*- c -*-
$Id: cdio.h,v 1.12 2003/06/07 16:53:21 rocky Exp $ $Id: cdio.h,v 1.13 2003/06/07 20:42:49 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -217,6 +217,12 @@ extern "C" {
*/ */
int cdio_read_audio_sector (CdIo *obj, void *buf, lsn_t lsn); int cdio_read_audio_sector (CdIo *obj, void *buf, lsn_t lsn);
/*!
Reads a single mode1 sector from cd device into data starting
from lsn. Returns 0 if no error.
*/
int cdio_read_yellow_sector (CdIo *obj, void *buf, lsn_t lsn, bool mode1);
/*! /*!
Reads a single mode2 sector from cd device into data starting Reads a single mode2 sector from cd device into data starting
from lsn. Returns 0 if no error. from lsn. Returns 0 if no error.

61
lib/_cdio_win32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_win32.c,v 1.5 2003/06/07 16:53:21 rocky Exp $ $Id: _cdio_win32.c,v 1.6 2003/06/07 20:42:49 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_win32.c,v 1.5 2003/06/07 16:53:21 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_win32.c,v 1.6 2003/06/07 20:42:49 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -466,11 +466,14 @@ _cdio_read_raw_sector (void *user_data, void *data, lsn_t lsn)
{ {
unsigned char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, }; unsigned char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
lba_t lba = cdio_lsn_to_lba(lsn);
if( _obj->hASPI ) { if( _obj->hASPI ) {
HANDLE hEvent; HANDLE hEvent;
struct SRB_ExecSCSICmd ssc; struct SRB_ExecSCSICmd ssc;
int blocks = 1;
int sector_type;
int sync, header_code, user_data, edc_ecc, error_field;
int sub_channel;
/* Create the transfer completion event */ /* Create the transfer completion event */
hEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); hEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
@@ -478,6 +481,20 @@ _cdio_read_raw_sector (void *user_data, void *data, lsn_t lsn)
return 1; return 1;
} }
/* Data selection */
sector_type = 0; /* all types */
/*sector_type = 1;*/ /* CD-DA */
/*sector_type = 2;*/ /* mode1 */
/*sector_type = 3;*/ /* mode2 */
/*sector_type = 4;*/ /* mode2/form1 */
/*sector_type = 5;*/ /* mode2/form2 */
sync = 0;
header_code = 2;
user_data = 1;
edc_ecc = 0;
error_field = 0;
sub_channel = 0;
memset( &ssc, 0, sizeof( ssc ) ); memset( &ssc, 0, sizeof( ssc ) );
ssc.SRB_Cmd = SC_EXEC_SCSI_CMD; ssc.SRB_Cmd = SC_EXEC_SCSI_CMD;
@@ -492,19 +509,24 @@ _cdio_read_raw_sector (void *user_data, void *data, lsn_t lsn)
/* Operation code */ /* Operation code */
ssc.CDBByte[ 0 ] = READ_CD; ssc.CDBByte[ 0 ] = READ_CD;
/* Start of LBA */ /* Start of LSN */
ssc.CDBByte[ 2 ] = ( lba >> 24 ) & 0xff; ssc.CDBByte[ 1 ] = (sector_type) << 2;
ssc.CDBByte[ 3 ] = ( lba >> 16 ) & 0xff; ssc.CDBByte[ 2 ] = (lsn >> 24) & 0xff;
ssc.CDBByte[ 4 ] = ( lba >> 8 ) & 0xff; ssc.CDBByte[ 3 ] = (lsn >> 16) & 0xff;
ssc.CDBByte[ 5 ] = ( lba ) & 0xff; ssc.CDBByte[ 4 ] = (lsn >> 8) & 0xff;
ssc.CDBByte[ 5 ] = (lsn ) & 0xff;
/* Transfer length */ /* Transfer length */
ssc.CDBByte[ 6 ] = 0; ssc.CDBByte[ 6 ] = (blocks >> 16) & 0xff;
ssc.CDBByte[ 7 ] = 0; ssc.CDBByte[ 7 ] = (blocks >> 8) & 0xff;
ssc.CDBByte[ 8 ] = 1; ssc.CDBByte[ 8 ] = blocks & 0xff;
/* Data selection */ ssc.CDBByte[ 9 ] = (sync << 7) |
ssc.CDBByte[ 9 ] = READ_CD_USERDATA_MODE2; (header_code << 5) |
(user_data << 4) |
(edc_ecc << 3) |
(error_field << 1);
/* ssc.CDBByte[ 9 ] = READ_CD_USERDATA_MODE2; */
/* Result buffer */ /* Result buffer */
ssc.SRB_BufPointer = buf; ssc.SRB_BufPointer = buf;
@@ -531,7 +553,7 @@ _cdio_read_raw_sector (void *user_data, void *data, lsn_t lsn)
RAW_READ_INFO cdrom_raw; RAW_READ_INFO cdrom_raw;
/* Initialize CDROM_RAW_READ structure */ /* Initialize CDROM_RAW_READ structure */
cdrom_raw.DiskOffset.QuadPart = CDIO_CD_FRAMESIZE * lba; cdrom_raw.DiskOffset.QuadPart = CDIO_CD_FRAMESIZE * lsn;
cdrom_raw.SectorCount = 1; cdrom_raw.SectorCount = 1;
cdrom_raw.TrackMode = XAForm2; cdrom_raw.TrackMode = XAForm2;
@@ -543,8 +565,9 @@ _cdio_read_raw_sector (void *user_data, void *data, lsn_t lsn)
return 1; return 1;
} }
} }
memcpy (data, buf, CDIO_CD_FRAMESIZE_RAW); /* FIXME! remove the 8 (SUBHEADER size) below... */
memcpy (data, buf+8, CDIO_CD_FRAMESIZE_RAW);
return 0; return 0;
} }
@@ -1040,8 +1063,8 @@ cdio_open_win32 (const char *source_name)
.get_track_green = _cdio_get_track_green, .get_track_green = _cdio_get_track_green,
.get_track_lba = NULL, /* This could be implemented if need be. */ .get_track_lba = NULL, /* This could be implemented if need be. */
.get_track_msf = _cdio_get_track_msf, .get_track_msf = _cdio_get_track_msf,
.lseek = cdio_generic_lseek, .lseek = NULL,
.read = cdio_generic_read, .read = NULL,
.read_audio_sector = _cdio_read_raw_sector, .read_audio_sector = _cdio_read_raw_sector,
.read_mode2_sector = _cdio_read_mode2_sector, .read_mode2_sector = _cdio_read_mode2_sector,
.read_mode2_sectors = _cdio_read_mode2_sectors, .read_mode2_sectors = _cdio_read_mode2_sectors,
@@ -1081,5 +1104,3 @@ cdio_have_win32 (void)
return false; return false;
#endif /* HAVE_WIN32_CDROM */ #endif /* HAVE_WIN32_CDROM */
} }

38
lib/cdio.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdio.c,v 1.18 2003/06/07 16:53:21 rocky Exp $ $Id: cdio.c,v 1.19 2003/06/07 20:42:49 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -35,7 +35,7 @@
#include <cdio/logging.h> #include <cdio/logging.h>
#include "cdio_private.h" #include "cdio_private.h"
static const char _rcsid[] = "$Id: cdio.c,v 1.18 2003/06/07 16:53:21 rocky Exp $"; static const char _rcsid[] = "$Id: cdio.c,v 1.19 2003/06/07 20:42:49 rocky Exp $";
const char *track_format2str[5] = const char *track_format2str[5] =
@@ -494,6 +494,36 @@ cdio_read_audio_sector (CdIo *obj, void *buf, lsn_t lsn)
return -1; return -1;
} }
/*!
Reads a single yellow mode1 or mode2 sector from cd device
into data starting from lsn. Returns 0 if no error.
*/
int
cdio_read_yellow_sector (CdIo *obj, void *data, uint32_t lsn, bool mode1)
{
uint32_t size = mode1 ? CDIO_CD_FRAMESIZE : M2RAW_SECTOR_SIZE;
char buf[M2RAW_SECTOR_SIZE] = { 0, };
int ret;
cdio_assert (obj != NULL);
cdio_assert (data != NULL);
if (obj->op.lseek && obj->op.read) {
if (0 > cdio_lseek(obj, CDIO_CD_FRAMESIZE*lsn, SEEK_SET))
return -1;
if (0 > cdio_read(obj, buf, CDIO_CD_FRAMESIZE))
return -1;
memcpy (data, buf, size);
return 0;
} else {
ret = cdio_read_mode2_sector(obj, data, lsn, mode1);
if (ret == 0)
memcpy (data, buf+CDIO_CD_SUBHEADER_SIZE, size);
}
return ret;
}
int int
cdio_read_mode2_sectors (CdIo *obj, void *buf, lsn_t lsn, bool mode2raw, cdio_read_mode2_sectors (CdIo *obj, void *buf, lsn_t lsn, bool mode2raw,
unsigned num_sectors) unsigned num_sectors)
@@ -621,7 +651,11 @@ cdio_open (const char *orig_source_name, driver_id_t driver_id)
driver_id = DRIVER_BINCUE; driver_id = DRIVER_BINCUE;
else else
driver_id = DRIVER_BINCUE; driver_id = DRIVER_BINCUE;
} else {
cdio_destroy(cdio);
return NULL;
} }
} }
cdio_destroy(cdio); cdio_destroy(cdio);
goto retry; goto retry;