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

Wasn't allowing call of new scsi_mmc_run_cmd.

Browse Source
This commit is contained in:
rocky
2004-07-22 11:00:59 +00:00
parent 2d92a271ec
commit 2040c4abf7
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_linux.c,v 1.73 2004/07/22 10:13:08 rocky Exp $ $Id: _cdio_linux.c,v 1.74 2004/07/22 11:00:59 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.73 2004/07/22 10:13:08 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.74 2004/07/22 11:00:59 rocky Exp $";
#include <string.h> #include <string.h>
@@ -275,17 +275,19 @@ cdio_check_mounts(const char *mtab)
We return true if command completed successfully and false if not. We return true if command completed successfully and false if not.
*/ */
static int static int
scsi_mmc_run_cmd_linux( const _img_private_t *p_env, int i_timeout, scsi_mmc_run_cmd_linux( const void *p_user_data, int i_timeout,
unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb, unsigned int i_cdb, const scsi_mmc_cdb_t *p_cdb,
scsi_mmc_direction_t e_direction, scsi_mmc_direction_t e_direction,
unsigned int i_buf, /*out*/ void *p_buf ) unsigned int i_buf, /*out*/ void *p_buf )
{ {
const _img_private_t *p_env = p_user_data;
struct cdrom_generic_command cgc; struct cdrom_generic_command cgc;
memset (&cgc, 0, sizeof (struct cdrom_generic_command)); memset (&cgc, 0, sizeof (struct cdrom_generic_command));
memcpy(&cgc.cmd, p_cdb, i_cdb); memcpy(&cgc.cmd, p_cdb, i_cdb);
cgc.buflen = i_buf; cgc.buflen = i_buf;
cgc.buffer = p_buf; cgc.buffer = p_buf;
SCSI_MMC_DATA_READ == cgc.data_direction ? CGC_DATA_READ : CGC_DATA_WRITE; cgc.data_direction = SCSI_MMC_DATA_READ == cgc.data_direction
? CGC_DATA_READ : CGC_DATA_WRITE;
#ifdef HAVE_LINUX_CDROM_TIMEOUT #ifdef HAVE_LINUX_CDROM_TIMEOUT
if (i_timeout >= 0) if (i_timeout >= 0)
@@ -1307,6 +1309,7 @@ cdio_open_am_linux (const char *psz_orig_source, const char *access_mode)
.read_mode1_sectors = _read_mode1_sectors_linux, .read_mode1_sectors = _read_mode1_sectors_linux,
.read_mode2_sector = _read_mode2_sector_linux, .read_mode2_sector = _read_mode2_sector_linux,
.read_mode2_sectors = _read_mode2_sectors_linux, .read_mode2_sectors = _read_mode2_sectors_linux,
.run_scsi_mmc_cmd = scsi_mmc_run_cmd_linux,
.set_arg = _set_arg_linux, .set_arg = _set_arg_linux,
.stat_size = _stat_size_linux .stat_size = _stat_size_linux
}; };

4
lib/cdio_private.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdio_private.h,v 1.32 2004/07/22 09:52:17 rocky Exp $ $Id: cdio_private.h,v 1.33 2004/07/22 11:00:59 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -216,7 +216,7 @@ extern "C" {
Returns 0 if command completed successfully. Returns 0 if command completed successfully.
*/ */
int (*run_scsi_mmc_cmd) ( const CdIo *cdio, unsigned int i_timeout, int (*run_scsi_mmc_cmd) ( const void *env, int i_timeout,
unsigned int cdb_len, unsigned int cdb_len,
const scsi_mmc_cdb_t *p_cdb, const scsi_mmc_cdb_t *p_cdb,
scsi_mmc_direction_t e_direction, scsi_mmc_direction_t e_direction,