Move a set_speed and set_blocksize (via MMC)from driver-specific

places to generic.

Add _t to yet another type.
This commit is contained in:
rocky
2005-01-20 01:00:52 +00:00
parent f7ebed2287
commit bd333bc73f
13 changed files with 99 additions and 104 deletions

View File

@@ -1,5 +1,5 @@
/*
$Id: win32.c,v 1.6 2005/01/18 05:41:58 rocky Exp $
$Id: win32.c,v 1.7 2005/01/20 01:00:52 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: win32.c,v 1.6 2005/01/18 05:41:58 rocky Exp $";
static const char _rcsid[] = "$Id: win32.c,v 1.7 2005/01/20 01:00:52 rocky Exp $";
#include <cdio/cdio.h>
#include <cdio/sector.h>
@@ -494,20 +494,6 @@ _get_arg_win32 (void *user_data, const char key[])
return NULL;
}
static int
set_speed_win32 (void *p_user_data, int i_speed) {
const _img_private_t *p_env = p_user_data;
if (!p_env) return -1;
return scsi_mmc_set_speed( p_env->gen.cdio, i_speed );
}
static int
set_blocksize_win32 (void *p_user_data, int i_blocksize) {
const _img_private_t *p_env = p_user_data;
if (!p_env) return -1;
return scsi_mmc_set_blocksize( p_env->gen.cdio, i_blocksize );
}
/*!
Return the media catalog number MCN.
@@ -773,8 +759,8 @@ cdio_open_am_win32 (const char *psz_orig_source, const char *psz_access_mode)
_funcs.read_toc = &read_toc_win32;
_funcs.run_scsi_mmc_cmd = &run_scsi_cmd_win32;
_funcs.set_arg = set_arg_win32;
_funcs.set_blocksize = set_blocksize_win32;
_funcs.set_speed = set_speed_win32;
_funcs.set_blocksize = set_blocksize_generic;
_funcs.set_speed = set_speed_generic;
_funcs.stat_size = stat_size_win32;
_data = _cdio_malloc (sizeof (_img_private_t));