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

Add read_data_sectors to exported symbols and to BSDI.

Browse Source
This commit is contained in:
rocky
2005-02-17 12:05:10 +00:00
parent ab344d538c
commit 7f246527b8
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/driver/_cdio_bsdi.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_bsdi.c,v 1.13 2005/02/06 11:39:32 rocky Exp $ $Id: _cdio_bsdi.c,v 1.14 2005/02/17 12:05:10 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, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.13 2005/02/06 11:39:32 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.14 2005/02/17 12:05:10 rocky Exp $";
#include <cdio/logging.h> #include <cdio/logging.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -222,7 +222,7 @@ _cdio_init (_img_private_t *p_env)
*/ */
static driver_return_code_t static driver_return_code_t
_read_audio_sectors_bsdi (void *user_data, void *data, lsn_t lsn, _read_audio_sectors_bsdi (void *user_data, void *data, lsn_t lsn,
unsigned int nblocks) uint32_t i_blocks)
{ {
char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, }; char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
struct cdrom_msf *msf = (struct cdrom_msf *) &buf; struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
@@ -258,7 +258,7 @@ _read_audio_sectors_bsdi (void *user_data, void *data, lsn_t lsn,
case _AM_IOCTL: { case _AM_IOCTL: {
unsigned int i; unsigned int i;
for (i=0; i < nblocks; i++) { for (i=0; i < i_blocks; i++) {
if (ioctl (p_env->gen.fd, CDROMREADRAW, &buf) == -1) { if (ioctl (p_env->gen.fd, CDROMREADRAW, &buf) == -1) {
perror ("ioctl()"); perror ("ioctl()");
return 1; return 1;
@@ -292,20 +292,20 @@ _read_mode1_sector_bsdi (void *user_data, void *data, lsn_t lsn,
} }
/*! /*!
Reads nblocks of mode2 sectors from cd device into data starting Reads i_blocks of mode2 sectors from cd device into data starting
from lsn. from lsn.
Returns 0 if no error. Returns 0 if no error.
*/ */
static driver_return_code_t static driver_return_code_t
_read_mode1_sectors_bsdi (void *p_user_data, void *p_data, lsn_t lsn, _read_mode1_sectors_bsdi (void *p_user_data, void *p_data, lsn_t lsn,
bool b_form2, unsigned int nblocks) bool b_form2, uint32_t i_blocks)
{ {
_img_private_t *p_env = p_user_data; _img_private_t *p_env = p_user_data;
unsigned int i; unsigned int i;
int retval; int retval;
unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE; uint16_t blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
for (i = 0; i < nblocks; i++) { for (i = 0; i < i_blocks; i++) {
if ( (retval = _read_mode1_sector_bsdi (p_env, if ( (retval = _read_mode1_sector_bsdi (p_env,
((char *)p_data) + (blocksize * i), ((char *)p_data) + (blocksize * i),
lsn + i, b_form2)) ) lsn + i, b_form2)) )
@@ -374,20 +374,20 @@ _read_mode2_sector_bsdi (void *p_user_data, void *p_data, lsn_t lsn,
} }
/*! /*!
Reads nblocks of mode2 sectors from cd device into data starting Reads i_blocks of mode2 sectors from cd device into data starting
from lsn. from lsn.
Returns 0 if no error. Returns 0 if no error.
*/ */
static driver_return_code_t static driver_return_code_t
_read_mode2_sectors_bsdi (void *user_data, void *data, lsn_t lsn, _read_mode2_sectors_bsdi (void *user_data, void *data, lsn_t lsn,
bool b_form2, unsigned int nblocks) bool b_form2, uint32_t i_blocks)
{ {
_img_private_t *p_env = user_data; _img_private_t *p_env = user_data;
unsigned int i; unsigned int i;
unsigned int i_blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE; unsigned int i_blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
/* For each frame, pick out the data part we need */ /* For each frame, pick out the data part we need */
for (i = 0; i < nblocks; i++) { for (i = 0; i < i_blocks; i++) {
int retval = _read_mode2_sector_bsdi(p_env, int retval = _read_mode2_sector_bsdi(p_env,
((char *)data) + ((char *)data) +
(i_blocksize * i), (i_blocksize * i),
@@ -780,6 +780,7 @@ cdio_open_bsdi (const char *psz_orig_source)
.lseek = cdio_generic_lseek, .lseek = cdio_generic_lseek,
.read = cdio_generic_read, .read = cdio_generic_read,
.read_audio_sectors = _read_audio_sectors_bsdi, .read_audio_sectors = _read_audio_sectors_bsdi,
.read_data_sectors = read_data_sectors_mmc,
.read_mode1_sector = _read_mode1_sector_bsdi, .read_mode1_sector = _read_mode1_sector_bsdi,
.read_mode1_sectors = _read_mode1_sectors_bsdi, .read_mode1_sectors = _read_mode1_sectors_bsdi,
.read_mode2_sector = _read_mode2_sector_bsdi, .read_mode2_sector = _read_mode2_sector_bsdi,

1
lib/driver/libcdio.sym
View File

@@ -129,6 +129,7 @@ cdio_os_driver
cdio_read cdio_read
cdio_read_audio_sector cdio_read_audio_sector
cdio_read_audio_sectors cdio_read_audio_sectors
cdio_read_data_sectors
cdio_read_mode1_sector cdio_read_mode1_sector
cdio_read_mode1_sectors cdio_read_mode1_sectors
cdio_read_mode2_sector cdio_read_mode2_sector