From c0c0077f3deeae29140965e69afc756e6766561d Mon Sep 17 00:00:00 2001 From: rocky Date: Tue, 27 Jul 2004 02:45:16 +0000 Subject: [PATCH] Yet more alternate "_generic" to simplify CD-ROM drivers (like all of them except Windows) were there is in fact only one MMC passthrough command. --- include/cdio/scsi_mmc.h | 20 ++++---- lib/_cdio_sunos.c | 108 +++++--------------------------------- lib/scsi_mmc.c | 111 +++++++++++++++++++++++++++++++++++++--- lib/scsi_mmc_private.h | 52 +++++++++++++++---- 4 files changed, 167 insertions(+), 124 deletions(-) diff --git a/include/cdio/scsi_mmc.h b/include/cdio/scsi_mmc.h index d6a1a9d2..6ec8d321 100644 --- a/include/cdio/scsi_mmc.h +++ b/include/cdio/scsi_mmc.h @@ -1,5 +1,5 @@ /* - $Id: scsi_mmc.h,v 1.18 2004/07/27 01:06:01 rocky Exp $ + $Id: scsi_mmc.h,v 1.19 2004/07/27 02:45:16 rocky Exp $ Copyright (C) 2003, 2004 Rocky Bernstein @@ -186,16 +186,6 @@ int scsi_mmc_run_cmd( const CdIo *cdio, int t_timeout, scsi_mmc_direction_t e_direction, unsigned int i_buf, /*in/out*/ void *p_buf ); -/*! - On input a MODE_SENSE command was issued and we have the results - in p. We interpret this and return a bit mask set according to the - capabilities. - */ -void scsi_mmc_get_drive_cap(const uint8_t *p, - /*out*/ cdio_drive_read_cap_t *p_read_cap, - /*out*/ cdio_drive_write_cap_t *p_write_cap, - /*out*/ cdio_drive_misc_cap_t *p_misc_cap); - /*! * Eject using SCSI MMC commands. Return 0 if successful. */ @@ -209,6 +199,14 @@ int scsi_mmc_read_sectors ( const CdIo *cdio, void *p_buf, lba_t lba, int scsi_mmc_set_bsize ( const CdIo *cdio, unsigned int bsize); +/*! + Return the the kind of drive capabilities of device. + */ +void scsi_mmc_get_drive_cap (const CdIo *p_cdio, + /*out*/ cdio_drive_read_cap_t *p_read_cap, + /*out*/ cdio_drive_write_cap_t *p_write_cap, + /*out*/ cdio_drive_misc_cap_t *p_misc_cap); + /*! Get the DVD type associated with cd object. */ diff --git a/lib/_cdio_sunos.c b/lib/_cdio_sunos.c index 2c40ba36..14829b11 100644 --- a/lib/_cdio_sunos.c +++ b/lib/_cdio_sunos.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_sunos.c,v 1.63 2004/07/27 01:36:37 rocky Exp $ + $Id: _cdio_sunos.c,v 1.64 2004/07/27 02:45:16 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002, 2003, 2004 Rocky Bernstein @@ -38,7 +38,7 @@ #ifdef HAVE_SOLARIS_CDROM -static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.63 2004/07/27 01:36:37 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.64 2004/07/27 02:45:16 rocky Exp $"; #ifdef HAVE_GLOB_H #include @@ -492,7 +492,7 @@ _init_cdtext_solaris (_img_private_t *p_env) or CD-TEXT information does not exist. */ static const cdtext_t * -_get_cdtext_solaris (void *p_user_data, track_t i_track) +get_cdtext_solaris (void *p_user_data, track_t i_track) { _img_private_t *p_env = p_user_data; @@ -518,7 +518,7 @@ _get_cdtext_solaris (void *p_user_data, track_t i_track) also free obj. */ static int -_eject_media_solaris (void *p_user_data) { +eject_media_solaris (void *p_user_data) { _img_private_t *env = p_user_data; int ret; @@ -557,7 +557,7 @@ _cdio_malloc_and_zero(size_t size) { Return the value associated with the key "arg". */ static const char * -_get_arg_solaris (void *p_user_data, const char key[]) +get_arg_solaris (void *p_user_data, const char key[]) { _img_private_t *env = p_user_data; @@ -698,96 +698,12 @@ get_discmode_solaris (void *p_user_data) return discmode; } -/*! - Return the the kind of drive capabilities of device. - - Note: string is malloc'd so caller should free() then returned - string when done with it. - - */ -static void -_get_drive_cap_solaris (const void *p_user_data, - /*out*/ cdio_drive_read_cap_t *p_read_cap, - /*out*/ cdio_drive_write_cap_t *p_write_cap, - /*out*/ cdio_drive_misc_cap_t *p_misc_cap) -{ - const _img_private_t *p_env = p_user_data; - - scsi_mmc_cdb_t cdb = {{0, }}; - int i_status; - - uint8_t buf[192] = { 0, }; - - CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_MODE_SENSE_10); - cdb.field[1] = 0x0; - cdb.field[2] = CDIO_MMC_ALL_PAGES; - cdb.field[7] = 0x01; - cdb.field[8] = 0x00; - - i_status = scsi_mmc_run_cmd_solaris (p_env, DEFAULT_TIMEOUT, - scsi_mmc_get_cmd_len(cdb.field[0]), - &cdb, SCSI_MMC_DATA_READ, - sizeof(buf), &buf); - if (0 == i_status) { - uint8_t *p; - int lenData = ((unsigned int)buf[0] << 8) + buf[1]; - uint8_t *pMax = buf + 256; - - *p_read_cap = 0; - *p_write_cap = 0; - *p_misc_cap = 0; - - /* set to first sense mask, and then walk through the masks */ - p = buf + 8; - while( (p < &(buf[2+lenData])) && (p < pMax) ) { - uint8_t which; - - which = p[0] & 0x3F; - switch( which ) - { - case CDIO_MMC_AUDIO_CTL_PAGE: - case CDIO_MMC_R_W_ERROR_PAGE: - case CDIO_MMC_CDR_PARMS_PAGE: - /* Don't handle these yet. */ - break; - case CDIO_MMC_CAPABILITIES_PAGE: - scsi_mmc_get_drive_cap(p, p_read_cap, p_write_cap, p_misc_cap); - break; - default: ; - } - p += (p[1] + 2); - } - } else { - cdio_info("%s: %s\n", - "error in ioctl USCSICMD MODE_SELECT", strerror(errno)); - *p_read_cap = CDIO_DRIVE_CAP_ERROR; - *p_write_cap = CDIO_DRIVE_CAP_ERROR; - *p_misc_cap = CDIO_DRIVE_CAP_ERROR; - } - return; -} - -/*! - Return the the kind of drive capabilities of device. - - Note: string is malloc'd so caller should free() then returned - string when done with it. - - */ -static char * -_get_mcn_solaris (const void *p_user_data) -{ - const _img_private_t *p_env = p_user_data; - return scsi_mmc_get_mcn( p_env->gen.cdio ); -} - - /*! Return the number of of the first track. CDIO_INVALID_TRACK is returned on error. */ static track_t -_cdio_get_first_track_num(void *p_user_data) +get_first_track_num_solaris(void *p_user_data) { _img_private_t *p_env = p_user_data; @@ -965,16 +881,16 @@ cdio_open_am_solaris (const char *psz_orig_source, const char *access_mode) char *psz_source; cdio_funcs _funcs = { - .eject_media = _eject_media_solaris, + .eject_media = eject_media_solaris, .free = cdio_generic_free, - .get_arg = _get_arg_solaris, - .get_cdtext = _get_cdtext_solaris, + .get_arg = get_arg_solaris, + .get_cdtext = get_cdtext_solaris, .get_default_device = cdio_get_default_device_solaris, .get_devices = cdio_get_devices_solaris, .get_discmode = get_discmode_solaris, - .get_drive_cap = _get_drive_cap_solaris, - .get_first_track_num= _cdio_get_first_track_num, - .get_mcn = _get_mcn_solaris, + .get_drive_cap = scsi_mmc_get_drive_cap_generic, + .get_first_track_num= get_first_track_num_solaris, + .get_mcn = scsi_mmc_get_mcn_generic, .get_num_tracks = _cdio_get_num_tracks, .get_track_format = get_track_format_solaris, .get_track_green = _cdio_get_track_green, diff --git a/lib/scsi_mmc.c b/lib/scsi_mmc.c index 5c17b337..565d4428 100644 --- a/lib/scsi_mmc.c +++ b/lib/scsi_mmc.c @@ -1,6 +1,6 @@ /* Common SCSI Multimedia Command (MMC) routines. - $Id: scsi_mmc.c,v 1.12 2004/07/27 01:06:02 rocky Exp $ + $Id: scsi_mmc.c,v 1.13 2004/07/27 02:45:16 rocky Exp $ Copyright (C) 2004 Rocky Bernstein @@ -42,10 +42,10 @@ capabilities. */ void -scsi_mmc_get_drive_cap(const uint8_t *p, - /*out*/ cdio_drive_read_cap_t *p_read_cap, - /*out*/ cdio_drive_write_cap_t *p_write_cap, - /*out*/ cdio_drive_misc_cap_t *p_misc_cap) +scsi_mmc_get_drive_cap_buf(const uint8_t *p, + /*out*/ cdio_drive_read_cap_t *p_read_cap, + /*out*/ cdio_drive_write_cap_t *p_write_cap, + /*out*/ cdio_drive_misc_cap_t *p_misc_cap) { /* Reader */ if (p[2] & 0x01) *p_read_cap |= CDIO_DRIVE_CAP_READ_CD_R; @@ -234,12 +234,102 @@ scsi_mmc_set_bsize ( const CdIo *cdio, unsigned int bsize) scsi_mmc_set_bsize_private (cdio->env, cdio->op.run_scsi_mmc_cmd, bsize); } +/*! + Return the the kind of drive capabilities of device. + */ +void +scsi_mmc_get_drive_cap_private (const void *p_env, + const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd, + /*out*/ cdio_drive_read_cap_t *p_read_cap, + /*out*/ cdio_drive_write_cap_t *p_write_cap, + /*out*/ cdio_drive_misc_cap_t *p_misc_cap) +{ + scsi_mmc_cdb_t cdb = {{0, }}; + int i_status; + + uint8_t buf[192] = { 0, }; + + if ( ! p_env || ! run_scsi_mmc_cmd ) + return; + + CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_MODE_SENSE_10); + cdb.field[1] = 0x0; + cdb.field[2] = CDIO_MMC_ALL_PAGES; + cdb.field[7] = 0x01; + cdb.field[8] = 0x00; + + i_status = run_scsi_mmc_cmd (p_env, DEFAULT_TIMEOUT_MS, + scsi_mmc_get_cmd_len(cdb.field[0]), + &cdb, SCSI_MMC_DATA_READ, + sizeof(buf), &buf); + if (0 == i_status) { + uint8_t *p; + int lenData = ((unsigned int)buf[0] << 8) + buf[1]; + uint8_t *pMax = buf + 256; + + *p_read_cap = 0; + *p_write_cap = 0; + *p_misc_cap = 0; + + /* set to first sense mask, and then walk through the masks */ + p = buf + 8; + while( (p < &(buf[2+lenData])) && (p < pMax) ) { + uint8_t which; + + which = p[0] & 0x3F; + switch( which ) + { + case CDIO_MMC_AUDIO_CTL_PAGE: + case CDIO_MMC_R_W_ERROR_PAGE: + case CDIO_MMC_CDR_PARMS_PAGE: + /* Don't handle these yet. */ + break; + case CDIO_MMC_CAPABILITIES_PAGE: + scsi_mmc_get_drive_cap_buf(p, p_read_cap, p_write_cap, p_misc_cap); + break; + default: ; + } + p += (p[1] + 2); + } + } else { + cdio_info("%s: %s\n", "error in MODE_SELECT", strerror(errno)); + *p_read_cap = CDIO_DRIVE_CAP_ERROR; + *p_write_cap = CDIO_DRIVE_CAP_ERROR; + *p_misc_cap = CDIO_DRIVE_CAP_ERROR; + } + return; +} + +void +scsi_mmc_get_drive_cap (const CdIo *p_cdio, + /*out*/ cdio_drive_read_cap_t *p_read_cap, + /*out*/ cdio_drive_write_cap_t *p_write_cap, + /*out*/ cdio_drive_misc_cap_t *p_misc_cap) +{ + if ( ! p_cdio ) return; + scsi_mmc_get_drive_cap_private (p_cdio->env, + p_cdio->op.run_scsi_mmc_cmd, + p_read_cap, p_write_cap, p_misc_cap); +} + +void +scsi_mmc_get_drive_cap_generic (const void *p_user_data, + /*out*/ cdio_drive_read_cap_t *p_read_cap, + /*out*/ cdio_drive_write_cap_t *p_write_cap, + /*out*/ cdio_drive_misc_cap_t *p_misc_cap) +{ + const generic_img_private_t *p_env = p_user_data; + scsi_mmc_get_drive_cap( p_env->cdio, + p_read_cap, p_write_cap, p_misc_cap ); +} + + /*! Get the DVD type associated with cd object. */ discmode_t -scsi_mmc_get_dvd_struct_physical_private ( void *p_env, - const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd, +scsi_mmc_get_dvd_struct_physical_private ( void *p_env, const + scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd, cdio_dvd_struct_t *s) { scsi_mmc_cdb_t cdb = {{0, }}; @@ -349,6 +439,13 @@ scsi_mmc_get_mcn ( const CdIo *p_cdio ) p_cdio->op.run_scsi_mmc_cmd ); } +char * +scsi_mmc_get_mcn_generic (const void *p_user_data) +{ + const generic_img_private_t *p_env = p_user_data; + return scsi_mmc_get_mcn( p_env->cdio ); +} + /* Read cdtext information for a CdIo object . diff --git a/lib/scsi_mmc_private.h b/lib/scsi_mmc_private.h index 26d61d46..fc9572e7 100644 --- a/lib/scsi_mmc_private.h +++ b/lib/scsi_mmc_private.h @@ -1,6 +1,6 @@ /* private MMC helper routines. - $Id: scsi_mmc_private.h,v 1.5 2004/07/27 01:06:02 rocky Exp $ + $Id: scsi_mmc_private.h,v 1.6 2004/07/27 02:45:16 rocky Exp $ Copyright (C) 2004 Rocky Bernstein @@ -47,15 +47,47 @@ scsi_mmc_set_bsize_private ( const void *p_env, const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd, unsigned int bsize); -char * -scsi_mmc_get_mcn_private ( void *p_env, - const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd - ); -bool -scsi_mmc_init_cdtext_private ( void *user_data, const - scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd, - set_cdtext_field_fn_t set_cdtext_field_fn - ); +char *scsi_mmc_get_mcn_private ( void *p_env, + const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd + ); + +char *scsi_mmc_get_mcn_generic (const void *p_user_data); + +bool scsi_mmc_init_cdtext_private ( void *user_data, const + scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd, + set_cdtext_field_fn_t set_cdtext_field_fn + ); + +/*! + On input a MODE_SENSE command was issued and we have the results + in p. We interpret this and return a bit mask set according to the + capabilities. + */ +void scsi_mmc_get_drive_cap_buf(const uint8_t *p, + /*out*/ cdio_drive_read_cap_t *p_read_cap, + /*out*/ cdio_drive_write_cap_t *p_write_cap, + /*out*/ cdio_drive_misc_cap_t *p_misc_cap); + +/*! + Return the the kind of drive capabilities of device. + + Note: string is malloc'd so caller should free() then returned + string when done with it. + + */ +void +scsi_mmc_get_drive_cap_private (const void *p_env, + const scsi_mmc_run_cmd_fn_t run_scsi_mmc_cmd, + /*out*/ cdio_drive_read_cap_t *p_read_cap, + /*out*/ cdio_drive_write_cap_t *p_write_cap, + /*out*/ cdio_drive_misc_cap_t *p_misc_cap); +void +scsi_mmc_get_drive_cap_generic (const void *p_user_data, + /*out*/ cdio_drive_read_cap_t *p_read_cap, + /*out*/ cdio_drive_write_cap_t *p_write_cap, + /*out*/ cdio_drive_misc_cap_t *p_misc_cap); + +