diff --git a/example/C++/iso1.cpp b/example/C++/iso1.cpp index 619c036e..d6f92764 100644 --- a/example/C++/iso1.cpp +++ b/example/C++/iso1.cpp @@ -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 @@ -56,8 +56,8 @@ int main(int argc, const char *argv[]) { - CdioList *entlist; - CdioListNode *entnode; + CdioList_t *entlist; + CdioListNode_t *entnode; char const *psz_fname; iso9660_t *p_iso; diff --git a/example/C++/mmc1.cpp b/example/C++/mmc1.cpp index 77e547ad..8335c6aa 100644 --- a/example/C++/mmc1.cpp +++ b/example/C++/mmc1.cpp @@ -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 @@ -44,9 +44,9 @@ main(int argc, const char *argv[]) printf("Couldn't find CD\n"); return 1; } else { - int i_status; /* Result of MMC command */ - char buf[36] = { 0, }; /* Place to hold returned data */ - scsi_mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ + int i_status; /* Result of MMC command */ + char buf[36] = { 0, }; /* Place to hold returned data */ + mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_INQUIRY); cdb.field[4] = sizeof(buf); diff --git a/example/C++/mmc2.cpp b/example/C++/mmc2.cpp index 41ba99c5..91031d92 100644 --- a/example/C++/mmc2.cpp +++ b/example/C++/mmc2.cpp @@ -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 @@ -43,9 +43,9 @@ main(int argc, const char *argv[]) printf("Couldn't find CD\n"); return 1; } else { - int i_status; /* Result of MMC command */ - uint8_t buf[500] = { 0, }; /* Place to hold returned data */ - scsi_mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ + int i_status; /* Result of MMC command */ + uint8_t buf[500] = { 0, }; /* Place to hold returned data */ + mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION); CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf)); diff --git a/example/mmc1.c b/example/mmc1.c index fb1414e1..7c6e7e73 100644 --- a/example/mmc1.c +++ b/example/mmc1.c @@ -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 @@ -44,9 +44,9 @@ main(int argc, const char *argv[]) printf("Couldn't find CD\n"); return 1; } else { - int i_status; /* Result of MMC command */ - char buf[36] = { 0, }; /* Place to hold returned data */ - scsi_mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ + int i_status; /* Result of MMC command */ + char buf[36] = { 0, }; /* Place to hold returned data */ + mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_INQUIRY); cdb.field[4] = sizeof(buf); diff --git a/example/mmc2.c b/example/mmc2.c index 68b81c4a..f8eb1652 100644 --- a/example/mmc2.c +++ b/example/mmc2.c @@ -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 @@ -43,9 +43,9 @@ main(int argc, const char *argv[]) printf("Couldn't find CD\n"); return 1; } else { - int i_status; /* Result of MMC command */ - uint8_t buf[500] = { 0, }; /* Place to hold returned data */ - scsi_mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ + int i_status; /* Result of MMC command */ + uint8_t buf[500] = { 0, }; /* Place to hold returned data */ + mmc_cdb_t cdb = {{0, }}; /* Command Descriptor Buffer */ CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_GET_CONFIGURATION); CDIO_MMC_SET_READ_LENGTH8(cdb.field, sizeof(buf)); diff --git a/include/cdio/ds.h b/include/cdio/ds.h index c39e8364..46eaa403 100644 --- a/include/cdio/ds.h +++ b/include/cdio/ds.h @@ -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 Copyright (C) 2005 Rocky Bernstein @@ -73,11 +73,11 @@ CdioListNode_t *_cdio_list_find (CdioList_t *p_list, /** 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); diff --git a/lib/driver/gnu_linux.c b/lib/driver/gnu_linux.c index 1afd2637..aaa50cb8 100644 --- a/lib/driver/gnu_linux.c +++ b/lib/driver/gnu_linux.c @@ -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 Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein @@ -27,7 +27,7 @@ # include "config.h" #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 @@ -104,7 +104,7 @@ static driver_return_code_t run_mmc_cmd_linux( void *p_user_data, unsigned int i_timeout, 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 ); static access_mode_t @@ -1064,7 +1064,7 @@ static driver_return_code_t run_mmc_cmd_linux( void *p_user_data, unsigned int i_timeout_ms, 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 ) { const _img_private_t *p_env = p_user_data; diff --git a/lib/driver/mmc.c b/lib/driver/mmc.c index 1ecef173..019341f9 100644 --- a/lib/driver/mmc.c +++ b/lib/driver/mmc.c @@ -1,6 +1,6 @@ /* 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 @@ -814,13 +814,13 @@ mmc_get_mcn ( const CdIo_t *p_cdio ) driver_return_code_t mmc_run_cmd( const CdIo_t *p_cdio, unsigned int i_timeout_ms, 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 ) { if (!p_cdio) return DRIVER_OP_UNINIT; if (!p_cdio->op.run_mmc_cmd) return DRIVER_OP_UNSUPPORTED; 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); } diff --git a/lib/driver/mmc_private.h b/lib/driver/mmc_private.h index 5e82c85d..44447ca8 100644 --- a/lib/driver/mmc_private.h +++ b/lib/driver/mmc_private.h @@ -1,6 +1,6 @@ /* 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 @@ -109,8 +109,8 @@ typedef driver_return_code_t (*mmc_run_cmd_fn_t) ( void *p_user_data, unsigned int i_timeout_ms, unsigned int i_cdb, - const scsi_mmc_cdb_t *p_cdb, - scsi_mmc_direction_t e_direction, + const mmc_cdb_t *p_cdb, + mmc_direction_t e_direction, unsigned int i_buf, /*in/out*/ void *p_buf ); int mmc_set_blocksize_mmc_private ( const void *p_env, const diff --git a/src/util.c b/src/util.c index b5955f66..e602aec2 100644 --- a/src/util.c +++ b/src/util.c @@ -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 @@ -183,16 +183,15 @@ print_mmc_drive_features(CdIo_t *p_cdio) int i_status; /* Result of SCSI MMC command */ 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_READ_LENGTH8(cdb.field, sizeof(buf)); cdb.field[1] = CDIO_MMC_GET_CONF_ALL_FEATURES; cdb.field[3] = 0x0; - i_status = scsi_mmc_run_cmd(p_cdio, 0, - &cdb, SCSI_MMC_DATA_READ, - sizeof(buf), &buf); + i_status = mmc_run_cmd(p_cdio, 0, &cdb, SCSI_MMC_DATA_READ, sizeof(buf), + &buf); if (i_status == 0) { uint8_t *p; uint32_t i_data;