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

More small changes.

Browse Source
This commit is contained in:
rocky
2004-07-23 03:48:16 +00:00
parent 33653c9941
commit c523990c75
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/_cdio_sunos.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_sunos.c,v 1.59 2004/07/23 02:54:34 rocky Exp $ $Id: _cdio_sunos.c,v 1.60 2004/07/23 03:48:16 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>
@@ -38,7 +38,7 @@
#ifdef HAVE_SOLARIS_CDROM #ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.59 2004/07/23 02:54:34 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.60 2004/07/23 03:48:16 rocky Exp $";
#ifdef HAVE_GLOB_H #ifdef HAVE_GLOB_H
#include <glob.h> #include <glob.h>
@@ -140,23 +140,23 @@ init_solaris (_img_private_t *env)
/*! /*!
Run a SCSI MMC command. Run a SCSI MMC command.
cdio CD structure set by cdio_open(). p_user_data internal CD structure.
i_timeout time in milliseconds we will wait for the command i_timeout time in milliseconds we will wait for the command
to complete. If this value is -1, use the default to complete. If this value is -1, use the default
time-out value. time-out value.
p_buf Buffer for data, both sending and receiving i_cdb Size of p_cdb
i_buf Size of buffer p_cdb CDB bytes.
e_direction direction the transfer is to go. e_direction direction the transfer is to go.
cdb CDB bytes. All values that are needed should be set on i_buf Size of buffer
input. We'll figure out what the right CDB length should be. p_buf Buffer for data, both sending and receiving
We return true if command completed successfully and false if not. Return 0 if no error.
*/ */
static int static int
scsi_mmc_run_cmd_solaris( const void *p_user_data, int i_timeout, scsi_mmc_run_cmd_solaris( 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, /*in/out*/ void *p_buf )
{ {
const _img_private_t *p_env = p_user_data; const _img_private_t *p_env = p_user_data;
struct uscsi_cmd cgc; struct uscsi_cmd cgc;
@@ -485,6 +485,8 @@ _init_cdtext_solaris (_img_private_t *p_env)
/* Format */ /* Format */
cdb.field[2] = CDIO_MMC_READTOC_FMT_CDTEXT; cdb.field[2] = CDIO_MMC_READTOC_FMT_CDTEXT;
CDIO_MMC_SET_READ_LENGTH(cdb.field, sizeof(wdata));
errno = 0; errno = 0;
i_status = scsi_mmc_run_cmd_solaris (p_env, DEFAULT_TIMEOUT, i_status = scsi_mmc_run_cmd_solaris (p_env, DEFAULT_TIMEOUT,
scsi_mmc_get_cmd_len(cdb.field[0]), scsi_mmc_get_cmd_len(cdb.field[0]),