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

Don't rely on compatability with 0.72. Use new type names.

Browse Source
This commit is contained in:
rocky
2005-03-06 00:03:53 +00:00
parent 399fbf5013
commit 3e84283fa8
10 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
example/C++/iso1.cpp
View File

@@ -1,5 +1,5 @@
/* /*
$Id: iso1.cpp,v 1.1 2005/02/19 11:42:18 rocky Exp $ $Id: iso1.cpp,v 1.2 2005/03/06 00:03:53 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -56,8 +56,8 @@
int int
main(int argc, const char *argv[]) main(int argc, const char *argv[])
{ {
CdioList *entlist; CdioList_t *entlist;
CdioListNode *entnode; CdioListNode_t *entnode;
char const *psz_fname; char const *psz_fname;
iso9660_t *p_iso; iso9660_t *p_iso;

4
example/C++/mmc1.cpp
View File

@@ -1,5 +1,5 @@
/* /*
$Id: mmc1.cpp,v 1.1 2005/02/19 11:42:18 rocky Exp $ $Id: mmc1.cpp,v 1.2 2005/03/06 00:03:53 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -46,7 +46,7 @@ main(int argc, const char *argv[])
} else { } else {
int i_status; /* Result of MMC command */ int i_status; /* Result of MMC command */
char buf[36] = { 0, }; /* Place to hold returned data */ char buf[36] = { 0, }; /* Place to hold returned data */
scsi_mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */
CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_INQUIRY); CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_INQUIRY);
cdb.field[4] = sizeof(buf); cdb.field[4] = sizeof(buf);

4
example/C++/mmc2.cpp
View File

@@ -1,5 +1,5 @@
/* /*
$Id: mmc2.cpp,v 1.1 2005/02/19 11:42:18 rocky Exp $ $Id: mmc2.cpp,v 1.2 2005/03/06 00:03:53 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -45,7 +45,7 @@ main(int argc, const char *argv[])
} else { } else {
int i_status; /* Result of MMC command */ int i_status; /* Result of MMC command */
uint8_t buf[500] = { 0, }; /* Place to hold returned data */ uint8_t buf[500] = { 0, }; /* Place to hold returned data */
scsi_mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */
CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION); CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION);
CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf)); CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf));

4
example/mmc1.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: mmc1.c,v 1.3 2005/02/07 03:36:01 rocky Exp $ $Id: mmc1.c,v 1.4 2005/03/06 00:03:53 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -46,7 +46,7 @@ main(int argc, const char *argv[])
} else { } else {
int i_status; /* Result of MMC command */ int i_status; /* Result of MMC command */
char buf[36] = { 0, }; /* Place to hold returned data */ char buf[36] = { 0, }; /* Place to hold returned data */
scsi_mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */
CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_INQUIRY); CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_INQUIRY);
cdb.field[4] = sizeof(buf); cdb.field[4] = sizeof(buf);

4
example/mmc2.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: mmc2.c,v 1.4 2005/02/08 04:14:28 rocky Exp $ $Id: mmc2.c,v 1.5 2005/03/06 00:03:53 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -45,7 +45,7 @@ main(int argc, const char *argv[])
} else { } else {
int i_status; /* Result of MMC command */ int i_status; /* Result of MMC command */
uint8_t buf[500] = { 0, }; /* Place to hold returned data */ uint8_t buf[500] = { 0, }; /* Place to hold returned data */
scsi_mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */
CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION); CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION);
CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf)); CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf));

8
include/cdio/ds.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: ds.h,v 1.3 2005/01/12 11:34:52 rocky Exp $ $Id: ds.h,v 1.4 2005/03/06 00:03:53 rocky Exp $
Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -73,11 +73,11 @@ CdioListNode_t *_cdio_list_find (CdioList_t *p_list,
/** node operations */ /** node operations */
CdioListNode *_cdio_list_begin (const CdioList_t *p_list); CdioListNode_t *_cdio_list_begin (const CdioList_t *p_list);
CdioListNode *_cdio_list_end (CdioList_t *p_list); CdioListNode_t *_cdio_list_end (CdioList_t *p_list);
CdioListNode *_cdio_list_node_next (CdioListNode_t *p_node); CdioListNode_t *_cdio_list_node_next (CdioListNode_t *p_node);
void _cdio_list_node_free (CdioListNode_t *p_node, int i_free_data); void _cdio_list_node_free (CdioListNode_t *p_node, int i_free_data);

8
lib/driver/gnu_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: gnu_linux.c,v 1.3 2005/03/05 10:48:41 rocky Exp $ $Id: gnu_linux.c,v 1.4 2005/03/06 00:03:53 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: gnu_linux.c,v 1.3 2005/03/05 10:48:41 rocky Exp $"; static const char _rcsid[] = "$Id: gnu_linux.c,v 1.4 2005/03/06 00:03:53 rocky Exp $";
#include <string.h> #include <string.h>
@@ -104,7 +104,7 @@ static driver_return_code_t run_mmc_cmd_linux( void *p_user_data,
unsigned int i_timeout, unsigned int i_timeout,
unsigned int i_cdb, unsigned int i_cdb,
const mmc_cdb_t *p_cdb, const mmc_cdb_t *p_cdb,
scsi_mmc_direction_t e_direction, mmc_direction_t e_direction,
unsigned int i_buf, unsigned int i_buf,
/*in/out*/ void *p_buf ); /*in/out*/ void *p_buf );
static access_mode_t static access_mode_t
@@ -1064,7 +1064,7 @@ static driver_return_code_t
run_mmc_cmd_linux( void *p_user_data, run_mmc_cmd_linux( void *p_user_data,
unsigned int i_timeout_ms, unsigned int i_timeout_ms,
unsigned int i_cdb, const mmc_cdb_t *p_cdb, unsigned int i_cdb, const mmc_cdb_t *p_cdb,
scsi_mmc_direction_t e_direction, mmc_direction_t e_direction,
unsigned int i_buf, /*in/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;

6
lib/driver/mmc.c
View File

@@ -1,6 +1,6 @@
/* Common Multimedia Command (MMC) routines. /* Common Multimedia Command (MMC) routines.
$Id: mmc.c,v 1.19 2005/03/02 04:24:00 rocky Exp $ $Id: mmc.c,v 1.20 2005/03/06 00:03:53 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -814,13 +814,13 @@ mmc_get_mcn ( const CdIo_t *p_cdio )
driver_return_code_t driver_return_code_t
mmc_run_cmd( const CdIo_t *p_cdio, unsigned int i_timeout_ms, mmc_run_cmd( const CdIo_t *p_cdio, unsigned int i_timeout_ms,
const mmc_cdb_t *p_cdb, const mmc_cdb_t *p_cdb,
scsi_mmc_direction_t e_direction, unsigned int i_buf, mmc_direction_t e_direction, unsigned int i_buf,
/*in/out*/ void *p_buf ) /*in/out*/ void *p_buf )
{ {
if (!p_cdio) return DRIVER_OP_UNINIT; if (!p_cdio) return DRIVER_OP_UNINIT;
if (!p_cdio->op.run_mmc_cmd) return DRIVER_OP_UNSUPPORTED; if (!p_cdio->op.run_mmc_cmd) return DRIVER_OP_UNSUPPORTED;
return p_cdio->op.run_mmc_cmd(p_cdio->env, i_timeout_ms, return p_cdio->op.run_mmc_cmd(p_cdio->env, i_timeout_ms,
scsi_mmc_get_cmd_len(p_cdb->field[0]), mmc_get_cmd_len(p_cdb->field[0]),
p_cdb, e_direction, i_buf, p_buf); p_cdb, e_direction, i_buf, p_buf);
} }

6
lib/driver/mmc_private.h
View File

@@ -1,6 +1,6 @@
/* private MMC helper routines. /* private MMC helper routines.
$Id: mmc_private.h,v 1.7 2005/03/01 09:33:52 rocky Exp $ $Id: mmc_private.h,v 1.8 2005/03/06 00:03:53 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -109,8 +109,8 @@ typedef driver_return_code_t (*mmc_run_cmd_fn_t)
( void *p_user_data, ( void *p_user_data,
unsigned int i_timeout_ms, unsigned int i_timeout_ms,
unsigned int i_cdb, unsigned int i_cdb,
const scsi_mmc_cdb_t *p_cdb, const mmc_cdb_t *p_cdb,
scsi_mmc_direction_t e_direction, mmc_direction_t e_direction,
unsigned int i_buf, /*in/out*/ void *p_buf ); unsigned int i_buf, /*in/out*/ void *p_buf );
int mmc_set_blocksize_mmc_private ( const void *p_env, const int mmc_set_blocksize_mmc_private ( const void *p_env, const

9
src/util.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: util.c,v 1.47 2005/03/02 01:00:48 rocky Exp $ $Id: util.c,v 1.48 2005/03/06 00:03:53 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -183,16 +183,15 @@ print_mmc_drive_features(CdIo_t *p_cdio)
int i_status; /* Result of SCSI MMC command */ int i_status; /* Result of SCSI MMC command */
uint8_t buf[500] = { 0, }; /* Place to hold returned data */ uint8_t buf[500] = { 0, }; /* Place to hold returned data */
scsi_mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Block */ mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Block */
CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION); CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION);
CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf)); CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf));
cdb.field[1] = CDIO_MMC_GET_CONF_ALL_FEATURES; cdb.field[1] = CDIO_MMC_GET_CONF_ALL_FEATURES;
cdb.field[3] = 0x0; cdb.field[3] = 0x0;
i_status = scsi_mmc_run_cmd(p_cdio, 0, i_status = mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ, sizeof(buf),
&cdb, SCSI_MMC_DATA_READ, &buf);
sizeof(buf), &buf);
if (i_status == 0) { if (i_status == 0) {
uint8_t *p; uint8_t *p;
uint32_t i_data; uint32_t i_data;