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

msecs 2 secs cleanup

Browse Source
This commit is contained in:
rocky
2004-07-28 01:55:03 +00:00
parent de50ea25de
commit 6041f8ae47
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/MSWindows/aspi32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: aspi32.c,v 1.42 2004/07/28 01:09:59 rocky Exp $ $Id: aspi32.c,v 1.43 2004/07/28 01:55:03 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,12 +27,12 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: aspi32.c,v 1.42 2004/07/28 01:09:59 rocky Exp $"; static const char _rcsid[] = "$Id: aspi32.c,v 1.43 2004/07/28 01:55:03 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
#include <cdio/util.h> #include <cdio/util.include>
#include <cdio/scsi_mmc.h> #h <cdio/scsi_mmc.h>
#include "cdio_assert.h" #include "cdio_assert.h"
#include <string.h> #include <string.h>
@@ -192,7 +192,7 @@ get_discmode_aspi (_img_private_t *p_env)
dvd.physical.type = CDIO_DVD_STRUCT_PHYSICAL; dvd.physical.type = CDIO_DVD_STRUCT_PHYSICAL;
dvd.physical.layer_num = 0; dvd.physical.layer_num = 0;
if (0 == scsi_mmc_get_dvd_struct_physical_private (p_env, if (0 == scsi_mmc_get_dvd_struct_physical_private (p_env,
&scsi_mmc_run_cmd_aspi, &run_scsi_cmd_aspi,
&dvd)) { &dvd)) {
switch(dvd.physical.layer[0].book_type) { switch(dvd.physical.layer[0].book_type) {
case CDIO_DVD_BOOK_DVD_ROM: return CDIO_DISC_MODE_DVD_ROM; case CDIO_DVD_BOOK_DVD_ROM: return CDIO_DISC_MODE_DVD_ROM;
@@ -488,9 +488,9 @@ init_aspi (_img_private_t *env)
We return 0 if command completed successfully. We return 0 if command completed successfully.
*/ */
int int
scsi_mmc_run_cmd_aspi( const void *p_user_data, int i_timeout, run_scsi_cmd_aspi( const void *p_user_data, unsigned int i_timeout_ms,
unsigned int i_cdb, const scsi_mmc_cdb_t * p_cdb, unsigned int i_cdb, const scsi_mmc_cdb_t * p_cdb,
scsi_mmc_direction_t e_direction, scsi_mmc_direction_t e_direction,
unsigned int i_buf, /*in/out*/ void *p_buf ) unsigned int i_buf, /*in/out*/ void *p_buf )
{ {
const _img_private_t *p_env = p_user_data; const _img_private_t *p_env = p_user_data;
@@ -531,7 +531,7 @@ scsi_mmc_run_cmd_aspi( const void *p_user_data, int i_timeout,
/* If the command has still not been processed, wait until it's /* If the command has still not been processed, wait until it's
* finished */ * finished */
if( ssc.SRB_Status == SS_PENDING ) { if( ssc.SRB_Status == SS_PENDING ) {
WaitForSingleObject( hEvent, OP_TIMEOUT_MS ); WaitForSingleObject( hEvent, msecs2secs(i_timeout_ms) );
} }
CloseHandle( hEvent ); CloseHandle( hEvent );
@@ -602,7 +602,7 @@ read_sectors_aspi (const _img_private_t *env, void *data, lsn_t lsn,
i_buf = CDIO_CD_FRAMESIZE_RAW; i_buf = CDIO_CD_FRAMESIZE_RAW;
} }
return scsi_mmc_run_cmd_aspi(env, OP_TIMEOUT_MS, return run_scsi_cmd_aspi(env, OP_TIMEOUT_MS,
scsi_mmc_get_cmd_len(cdb.field[0]), scsi_mmc_get_cmd_len(cdb.field[0]),
&cdb, SCSI_MMC_DATA_READ, i_buf*nblocks, data); &cdb, SCSI_MMC_DATA_READ, i_buf*nblocks, data);
} }
@@ -668,7 +668,7 @@ read_toc_aspi (_img_private_t *p_env)
CDIO_MMC_SET_READ_LENGTH(cdb.field, sizeof(tocheader)); CDIO_MMC_SET_READ_LENGTH(cdb.field, sizeof(tocheader));
i_status = scsi_mmc_run_cmd_aspi (p_env, OP_TIMEOUT_MS, i_status = run_scsi_cmd_aspi (p_env, OP_TIMEOUT_MS,
scsi_mmc_get_cmd_len(cdb.field[0]), scsi_mmc_get_cmd_len(cdb.field[0]),
&cdb, SCSI_MMC_DATA_READ, &cdb, SCSI_MMC_DATA_READ,
sizeof(tocheader), &tocheader); sizeof(tocheader), &tocheader);
@@ -694,7 +694,7 @@ read_toc_aspi (_img_private_t *p_env)
CDIO_MMC_SET_READ_LENGTH(cdb.field, i_toclength); CDIO_MMC_SET_READ_LENGTH(cdb.field, i_toclength);
i_status = scsi_mmc_run_cmd_aspi (p_env, OP_TIMEOUT_MS, i_status = run_scsi_cmd_aspi (p_env, OP_TIMEOUT_MS,
scsi_mmc_get_cmd_len(cdb.field[0]), scsi_mmc_get_cmd_len(cdb.field[0]),
&cdb, SCSI_MMC_DATA_READ, &cdb, SCSI_MMC_DATA_READ,
i_toclength, p_fulltoc); i_toclength, p_fulltoc);
@@ -772,7 +772,7 @@ bool
init_cdtext_aspi (_img_private_t *p_env) init_cdtext_aspi (_img_private_t *p_env)
{ {
return scsi_mmc_init_cdtext_private( p_env->gen.cdio, return scsi_mmc_init_cdtext_private( p_env->gen.cdio,
&scsi_mmc_run_cmd_aspi, &run_scsi_cmd_aspi,
set_cdtext_field_win32 set_cdtext_field_win32
); );
} }
@@ -798,10 +798,10 @@ get_drive_cap_aspi (const _img_private_t *p_env,
cdb.field[7] = 0x01; cdb.field[7] = 0x01;
cdb.field[8] = 0x00; cdb.field[8] = 0x00;
i_status = scsi_mmc_run_cmd_aspi(p_env, OP_TIMEOUT_MS, i_status = run_scsi_cmd_aspi(p_env, OP_TIMEOUT_MS,
scsi_mmc_get_cmd_len(cdb.field[0]), scsi_mmc_get_cmd_len(cdb.field[0]),
&cdb, SCSI_MMC_DATA_READ, &cdb, SCSI_MMC_DATA_READ,
sizeof(buf), buf); sizeof(buf), buf);
if (0 == i_status) { if (0 == i_status) {
uint8_t *p; uint8_t *p;
int lenData = ((unsigned int)buf[0] << 8) + buf[1]; int lenData = ((unsigned int)buf[0] << 8) + buf[1];

6
lib/MSWindows/win32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: win32.c,v 1.33 2004/07/27 02:21:23 rocky Exp $ $Id: win32.c,v 1.34 2004/07/28 01:55:03 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: win32.c,v 1.33 2004/07/27 02:21:23 rocky Exp $"; static const char _rcsid[] = "$Id: win32.c,v 1.34 2004/07/28 01:55:03 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -611,7 +611,7 @@ _cdio_get_track_green(void *obj, track_t i_track)
return false; return false;
case TRACK_FORMAT_DATA: case TRACK_FORMAT_DATA:
if (_AM_ASPI == p_env->access_mode ) if (_AM_ASPI == p_env->access_mode )
return false; return ((p_env->tocent[i_track-p_env->gen.i_first_track].Control & 8) != 0);
default: default:
break; break;
} }

9
lib/MSWindows/win32_ioctl.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: win32_ioctl.c,v 1.28 2004/07/28 01:09:59 rocky Exp $ $Id: win32_ioctl.c,v 1.29 2004/07/28 01:55:03 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.28 2004/07/28 01:09:59 rocky Exp $"; static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.29 2004/07/28 01:55:03 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -144,7 +144,8 @@ typedef struct _SUB_Q_MEDIA_CATALOG_NUMBER {
Return 0 if command completed successfully. Return 0 if command completed successfully.
*/ */
int int
scsi_mmc_run_cmd_win32ioctl( const void *p_user_data, int i_timeout, scsi_mmc_run_cmd_win32ioctl( const void *p_user_data,
unsigned int i_timeout_ms,
unsigned int i_cdb, const scsi_mmc_cdb_t * p_cdb, unsigned int i_cdb, const scsi_mmc_cdb_t * p_cdb,
scsi_mmc_direction_t e_direction, scsi_mmc_direction_t e_direction,
unsigned int i_buf, /*in/out*/ void *p_buf ) unsigned int i_buf, /*in/out*/ void *p_buf )
@@ -163,7 +164,7 @@ scsi_mmc_run_cmd_win32ioctl( const void *p_user_data, int i_timeout,
sptd.DataIn = SCSI_MMC_DATA_READ == e_direction ? sptd.DataIn = SCSI_MMC_DATA_READ == e_direction ?
SCSI_IOCTL_DATA_IN : SCSI_IOCTL_DATA_OUT; SCSI_IOCTL_DATA_IN : SCSI_IOCTL_DATA_OUT;
sptd.DataTransferLength= i_buf; sptd.DataTransferLength= i_buf;
sptd.TimeOutValue=i_timeout; sptd.TimeOutValue = msecs2secs(i_timeout_ms);
sptd.DataBuffer= (void *) p_buf; sptd.DataBuffer= (void *) p_buf;
sptd.SenseInfoOffset=0; sptd.SenseInfoOffset=0;