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

sort libcdio.sym. Remove duplicated tests.

Browse Source
This commit is contained in:
R. Bernstein
2010-02-09 07:49:52 -05:00
parent cbe5ebacd0
commit 1f41c50b09
2 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/driver/libcdio.sym
View File

@@ -201,9 +201,9 @@ mmc_feature_profile2str
mmc_get_blocksize mmc_get_blocksize
mmc_get_cmd_len mmc_get_cmd_len
mmc_get_configuration mmc_get_configuration
mmc_get_disc_erasable
mmc_get_discmode mmc_get_discmode
mmc_get_disctype mmc_get_disctype
mmc_get_disc_erasable
mmc_get_drive_mmc_cap mmc_get_drive_mmc_cap
mmc_get_dvd_struct_physical mmc_get_dvd_struct_physical
mmc_get_event_status mmc_get_event_status
@@ -234,6 +234,7 @@ mmc_sense_key2str
mmc_set_blocksize mmc_set_blocksize
mmc_set_speed mmc_set_speed
mmc_start_stop_unit mmc_start_stop_unit
mmc_test_unit_ready
mmc_timeout_ms mmc_timeout_ms
mmc_test_unit_ready mmc_test_unit_ready
track_format2str track_format2str

30
test/driver/mmc.c
View File

@@ -629,28 +629,6 @@ test_write(char *drive_path, unsigned int i_flag)
printf("Drive '%s' has cdio_get_arg(\"scsi-tuple\") = '%s'\n", printf("Drive '%s' has cdio_get_arg(\"scsi-tuple\") = '%s'\n",
drive_path, scsi_tuple); drive_path, scsi_tuple);
/* Test availability of sense reply in case of unready drive.
E.g. if the tray is already ejected.
*/
ret = test_test_unit_ready(p_cdio, &sense_avail, sense, !!verbose);
if (ret != 0 && sense_avail < 18) {
fprintf(stderr,
"Error: Drive not ready. Only %d sense bytes. Expected >= 18.\n",
sense_avail);
{ret = 2; goto ex;}
}
/* Cause sense reply failure by requesting inappropriate mode page 3Eh */
ret = test_mode_sense(p_cdio, &sense_avail, sense,
0x3e, 0, alloc_len, buf, &i_size, !!verbose);
if (ret != 0 && sense_avail < 18) {
fprintf(stderr,
"Error: An illegal command yields only %d sense bytes. Expected >= 18.\n",
sense_avail);
{ret = 2; goto ex;}
}
/* Test availability of sense reply in case of unready drive. /* Test availability of sense reply in case of unready drive.
E.g. if the tray is already ejected. E.g. if the tray is already ejected.
*/ */
@@ -743,7 +721,6 @@ ex:;
int int
main(int argc, const char *argv[]) main(int argc, const char *argv[])
{ {
const char *scsi_tuple;
CdIo_t *p_cdio; CdIo_t *p_cdio;
char **ppsz_drives=NULL; char **ppsz_drives=NULL;
const char *psz_source = NULL; const char *psz_source = NULL;
@@ -787,13 +764,6 @@ main(int argc, const char *argv[])
if ( psz_have_mmc if ( psz_have_mmc
&& 0 == strncmp("true", psz_have_mmc, sizeof("true")) ) { && 0 == strncmp("true", psz_have_mmc, sizeof("true")) ) {
scsi_tuple = cdio_get_arg(p_cdio, "scsi-tuple");
if (scsi_tuple == NULL) {
fprintf(stderr, "cdio_get_arg(\"scsi-tuple\") returns NULL.\n");
exit(3);
} else if (cdio_loglevel_default == CDIO_LOG_DEBUG)
printf("Drive '%s' has cdio_get_arg(\"scsi-tuple\") = '%s'\n",
psz_source, scsi_tuple);
/* Test the MMC enhancements of version 0.83 in december 2009 */ /* Test the MMC enhancements of version 0.83 in december 2009 */
ret = test_write(ppsz_drives[0], ret = test_write(ppsz_drives[0],