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

Add get_blocksize. There may be some breakage as I haven't tested all of the

Browse Source 
various drivers yet.
This commit is contained in:
rocky
2005-01-20 05:07:00 +00:00
parent fb07d7d0fe
commit d6b930e6cc
7 changed files with 78 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
lib/driver/FreeBSD/freebsd.c
View File

@@ -1,5 +1,5 @@
/*
$Id: freebsd.c,v 1.5 2005/01/20 01:00:52 rocky Exp $
$Id: freebsd.c,v 1.6 2005/01/20 05:07:00 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: freebsd.c,v 1.5 2005/01/20 01:00:52 rocky Exp $";
static const char _rcsid[] = "$Id: freebsd.c,v 1.6 2005/01/20 05:07:00 rocky Exp $";
#include "freebsd.h"
@@ -54,18 +54,18 @@ str_to_access_mode_freebsd(const char *psz_access_mode)
}
static void
_free_freebsd (void *obj)
_free_freebsd (void *p_obj)
{
_img_private_t *env = obj;
_img_private_t *p_env = p_obj;
if (NULL == env) return;
if (NULL == p_env) return;
if (NULL != env->device) free(env->device);
if (NULL != p_env->device) free(p_env->device);
if (_AM_CAM == env->access_mode)
return free_freebsd_cam(env);
if (_AM_CAM == p_env->access_mode)
return free_freebsd_cam(p_env);
else
return cdio_generic_free(obj);
return cdio_generic_free(p_obj);
}
/* Check a drive to see if it is a CD-ROM
@@ -139,46 +139,49 @@ _read_mode2_sectors_freebsd (void *user_data, void *data, lsn_t lsn,
Return the size of the CD in logical block address (LBA) units.
*/
static uint32_t
_stat_size_freebsd (void *obj)
_stat_size_freebsd (void *p_obj)
{
_img_private_t *env = obj;
_img_private_t *p_env = p_obj;
if (NULL == env) return CDIO_INVALID_LBA;
if (_AM_CAM == env->access_mode)
return stat_size_freebsd_cam(env);
if (_AM_CAM == p_env->access_mode)
return stat_size_freebsd_cam(p_env);
else
return stat_size_freebsd_ioctl(env);
return stat_size_freebsd_ioctl(p_env);
}
/*!
Set the key "arg" to "value" in source device.
Set the arg "key" with "value" in the source device.
Currently "source" and "access-mode" are valid keys.
"source" sets the source device in I/O operations
"access-mode" sets the the method of CD access
DRIVER_OP_SUCCESS is returned if no error was found,
and nonzero if there as an error.
*/
static int
_set_arg_freebsd (void *user_data, const char key[], const char value[])
static driver_return_code_t
_set_arg_freebsd (void *p_user_data, const char key[], const char value[])
{
_img_private_t *env = user_data;
_img_private_t *p_env = p_user_data;
if (!strcmp (key, "source"))
{
if (!value)
return -2;
free (env->gen.source_name);
env->gen.source_name = strdup (value);
if (!value) return DRIVER_OP_ERROR;
free (p_env->gen.source_name);
p_env->gen.source_name = strdup (value);
}
else if (!strcmp (key, "access-mode"))
{
env->access_mode = str_to_access_mode_freebsd(value);
if (env->access_mode == _AM_CAM && !env->b_cam_init)
return init_freebsd_cam(env) ? 1 : -3;
return 0;
p_env->access_mode = str_to_access_mode_freebsd(value);
if (p_env->access_mode == _AM_CAM && !env->b_cam_init)
return init_freebsd_cam(p_env)
? DRIVER_OP_SUCCESS : DRIVER_OP_ERROR;
}
else
return -1;
else return DRIVER_OP_ERROR;
return DRIVER_OP_SUCCESS;
return 0;
}
/* Set CD-ROM drive speed */
@@ -344,7 +347,7 @@ run_scsi_cmd_freebsd( const void *p_user_data, unsigned int i_timeout_ms,
return run_scsi_cmd_freebsd_cam( p_user_data, i_timeout_ms, i_cdb, p_cdb,
e_direction, i_buf, p_buf );
else
return 2;
return DRIVER_OP_UNSUPPORTED;
}
/*!
@@ -573,6 +576,7 @@ cdio_open_am_freebsd (const char *psz_orig_source_name,
.eject_media = _eject_media_freebsd,
.free = _free_freebsd,
.get_arg = _get_arg_freebsd,
.get_blocksize = get_blocksize_generic,
.get_cdtext = get_cdtext_generic,
.get_default_device = cdio_get_default_device_freebsd,
.get_devices = cdio_get_devices_freebsd,
@@ -596,6 +600,7 @@ cdio_open_am_freebsd (const char *psz_orig_source_name,
.read_toc = read_toc_freebsd,
.run_scsi_mmc_cmd = run_scsi_cmd_freebsd,
.set_arg = _set_arg_freebsd,
.set_blocksize = set_blocksize_generic,
.set_speed = set_speed_freebsd,
.stat_size = _stat_size_freebsd
};

60
lib/driver/FreeBSD/freebsd_cam.c
View File

@@ -1,5 +1,5 @@
/*
$Id: freebsd_cam.c,v 1.1 2004/12/18 17:29:32 rocky Exp $
$Id: freebsd_cam.c,v 1.2 2005/01/20 05:07:00 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.1 2004/12/18 17:29:32 rocky Exp $";
static const char _rcsid[] = "$Id: freebsd_cam.c,v 1.2 2005/01/20 05:07:00 rocky Exp $";
#ifdef HAVE_FREEBSD_CDROM
@@ -155,46 +155,6 @@ free_freebsd_cam (void *user_data)
free (p_env);
}
static int
_set_bsize (_img_private_t *p_env, unsigned int bsize)
{
scsi_mmc_cdb_t cdb = {{0, }};
struct
{
uint8_t reserved1;
uint8_t medium;
uint8_t reserved2;
uint8_t block_desc_length;
uint8_t density;
uint8_t number_of_blocks_hi;
uint8_t number_of_blocks_med;
uint8_t number_of_blocks_lo;
uint8_t reserved3;
uint8_t block_length_hi;
uint8_t block_length_med;
uint8_t block_length_lo;
} mh;
memset (&mh, 0, sizeof (mh));
mh.block_desc_length = 0x08;
mh.block_length_hi = (bsize >> 16) & 0xff;
mh.block_length_med = (bsize >> 8) & 0xff;
mh.block_length_lo = (bsize >> 0) & 0xff;
memset (&cdb, 0, sizeof (cdb));
CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_MODE_SELECT_6);
cdb.field[1] = 1 << 4;
cdb.field[4] = 12;
return run_scsi_cmd_freebsd_cam (p_env, DEFAULT_TIMEOUT_MSECS,
scsi_mmc_get_cmd_len(cdb.field[0]),
&cdb, SCSI_MMC_DATA_WRITE,
sizeof(mh), &mh);
}
int
read_mode2_sector_freebsd_cam (_img_private_t *p_env, void *data, lsn_t lsn,
bool b_form2)
@@ -231,7 +191,7 @@ read_mode2_sectors_freebsd_cam (_img_private_t *p_env, void *p_buf,
CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_10);
CDIO_MMC_SET_READ_LENGTH16(cdb.field, nblocks);
if ((retval = _set_bsize (p_env, M2RAW_SECTOR_SIZE)))
if ((retval = scsi_mmc_set_blocksize (p_env->gen.cdio, M2RAW_SECTOR_SIZE)))
return retval;
if ((retval = run_scsi_cmd_freebsd_cam (p_env, 0,
@@ -241,11 +201,11 @@ read_mode2_sectors_freebsd_cam (_img_private_t *p_env, void *p_buf,
M2RAW_SECTOR_SIZE * nblocks,
p_buf)))
{
_set_bsize (p_env, CDIO_CD_FRAMESIZE);
scsi_mmc_set_blocksize (p_env->gen.cdio, CDIO_CD_FRAMESIZE);
return retval;
}
if ((retval = _set_bsize (p_env, CDIO_CD_FRAMESIZE)))
if ((retval = scsi_mmc_set_blocksize (p_env->gen.cdio, CDIO_CD_FRAMESIZE)))
return retval;
} else
CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_CD);
@@ -289,9 +249,9 @@ stat_size_freebsd_cam (_img_private_t *p_env)
p_env->ccb.csio.dxfer_len = sizeof (buf);
i_status = run_scsi_cmd_freebsd_cam(p_env, DEFAULT_TIMEOUT_MSECS,
scsi_mmc_get_cmd_len(cdb.field[0]),
&cdb, SCSI_MMC_DATA_READ,
sizeof(buf), buf);
scsi_mmc_get_cmd_len(cdb.field[0]),
&cdb, SCSI_MMC_DATA_READ,
sizeof(buf), buf);
if (0 != i_status)
return 0;
@@ -322,8 +282,8 @@ eject_media_freebsd_cam (_img_private_t *p_env)
CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_ALLOW_MEDIUM_REMOVAL);
i_status = run_scsi_cmd_freebsd_cam (p_env, DEFAULT_TIMEOUT_MSECS,
scsi_mmc_get_cmd_len(cdb.field[0]),
&cdb, SCSI_MMC_DATA_WRITE, 0, &buf);
scsi_mmc_get_cmd_len(cdb.field[0]),
&cdb, SCSI_MMC_DATA_WRITE, 0, &buf);
if (0 != i_status)
return i_status;

13
lib/driver/_cdio_generic.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_generic.c,v 1.8 2005/01/20 01:00:52 rocky Exp $
$Id: _cdio_generic.c,v 1.9 2005/01/20 05:07:00 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -25,7 +25,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.8 2005/01/20 01:00:52 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.9 2005/01/20 05:07:00 rocky Exp $";
#include <stdio.h>
#include <stdlib.h>
@@ -279,6 +279,15 @@ get_cdtext_generic (void *p_user_data, track_t i_track)
}
/* Set read blocksize (via MMC) */
int
get_blocksize_generic (void *p_user_data)
{
generic_img_private_t *p_env = p_user_data;
if (!p_env) return DRIVER_OP_UNINIT;
return scsi_mmc_get_blocksize(p_env->cdio);
}
/*!
Get disc type associated with cd object.
*/

5
lib/driver/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_linux.c,v 1.13 2005/01/20 01:00:52 rocky Exp $
$Id: _cdio_linux.c,v 1.14 2005/01/20 05:07:00 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.13 2005/01/20 01:00:52 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.14 2005/01/20 05:07:00 rocky Exp $";
#include <string.h>
@@ -1136,6 +1136,7 @@ cdio_open_am_linux (const char *psz_orig_source, const char *access_mode)
.eject_media = eject_media_linux,
.free = cdio_generic_free,
.get_arg = get_arg_linux,
.get_blocksize = get_blocksize_generic,
.get_cdtext = get_cdtext_generic,
.get_default_device = cdio_get_default_device_linux,
.get_devices = cdio_get_devices_linux,

5
lib/driver/_cdio_sunos.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_sunos.c,v 1.10 2005/01/20 01:00:52 rocky Exp $
$Id: _cdio_sunos.c,v 1.11 2005/01/20 05:07:00 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -38,7 +38,7 @@
#ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.10 2005/01/20 01:00:52 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.11 2005/01/20 05:07:00 rocky Exp $";
#ifdef HAVE_GLOB_H
#include <glob.h>
@@ -866,6 +866,7 @@ cdio_open_am_solaris (const char *psz_orig_source, const char *access_mode)
_funcs.eject_media = eject_media_solaris;
_funcs.free = cdio_generic_free;
_funcs.get_arg = get_arg_solaris;
_funcs.get_blocksize = get_blocksize_generic,
_funcs.get_cdtext = get_cdtext_generic;
_funcs.get_default_device = cdio_get_default_device_solaris;
_funcs.get_devices = cdio_get_devices_solaris;

8
lib/driver/cdio_private.h
View File

@@ -1,5 +1,5 @@
/*
$Id: cdio_private.h,v 1.7 2005/01/20 01:00:52 rocky Exp $
$Id: cdio_private.h,v 1.8 2005/01/20 05:07:00 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -69,6 +69,12 @@ extern "C" {
*/
const char * (*get_arg) (void *p_env, const char key[]);
/*!
Get the block size for subsequest read requests, via a SCSI MMC
MODE_SENSE 6 command.
*/
int (*get_blocksize) (void *p_env);
/*!
Get cdtext information for a CdIo object.

8
lib/driver/generic.h
View File

@@ -1,5 +1,5 @@
/*
$Id: generic.h,v 1.8 2005/01/20 01:00:52 rocky Exp $
$Id: generic.h,v 1.9 2005/01/20 05:07:00 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -157,6 +157,12 @@ extern "C" {
*/
const cdtext_t *get_cdtext_generic (void *p_user_data, track_t i_track);
/*!
Get the block size for subsequest read requests, via a SCSI MMC
MODE_SENSE 6 command.
*/
int get_blocksize_generic (void *p_user_data);
/*!
Return the number of of the first track.
CDIO_INVALID_TRACK is returned on error.