Make sure milliseconds get converted to seconds if needed.

Some function renaming, and a typo in a DVD book type.
This commit is contained in:
rocky
2004-07-28 01:09:59 +00:00
parent b2acdb3e8e
commit 7716188c38
10 changed files with 156 additions and 147 deletions

View File

@@ -1,5 +1,5 @@
/*
$Id: dvd.h,v 1.2 2004/07/25 15:46:40 rocky Exp $
$Id: dvd.h,v 1.3 2004/07/28 01:09:59 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
Modeled after GNU/Linux definitions in linux/cdrom.h
@@ -29,7 +29,7 @@
#include <cdio/types.h>
/* DVD structure types */
/*! Values used in a READ DVD STRUCTURE */
#define CDIO_DVD_STRUCT_PHYSICAL 0x00
#define CDIO_DVD_STRUCT_COPYRIGHT 0x01
@@ -37,12 +37,13 @@
#define CDIO_DVD_STRUCT_BCA 0x03
#define CDIO_DVD_STRUCT_MANUFACT 0x04
/*! Media definitions for "Book Type" */
#define CDIO_DVD_BOOK_DVD_ROM 0
#define CDIO_DVD_BOOK_DVD_RAM 1
#define CDIO_DVD_BOOK_DVD_R 2
#define CDIO_DVD_BOOK_DVD_RW 3
#define CDIO_DVD_BOOK_DVD_PW 8
#define CDIO_DVD_BOOK_DVD_PRW 9
#define CDIO_DVD_BOOK_DVD_R 2 /**< DVD-R */
#define CDIO_DVD_BOOK_DVD_RW 3 /**< DVD-RW */
#define CDIO_DVD_BOOK_DVD_PR 8 /**< DVD+R */
#define CDIO_DVD_BOOK_DVD_PRW 9 /**< DVD+RW */
typedef struct cdio_dvd_layer {
uint8_t book_version : 4;

View File

@@ -1,5 +1,5 @@
/*
$Id: scsi_mmc.h,v 1.19 2004/07/27 02:45:16 rocky Exp $
$Id: scsi_mmc.h,v 1.20 2004/07/28 01:09:59 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -170,9 +170,8 @@ uint8_t scsi_mmc_get_cmd_len(uint8_t scsi_cmd);
Run a SCSI MMC command.
cdio CD structure set by cdio_open().
i_timeout time in milliseconds we will wait for the command
to complete. If this value is -1, use the default
time-out value.
i_timeout_ms time in milliseconds we will wait for the command
to complete.
p_cdb CDB bytes. All values that are needed should be set on
input. We'll figure out what the right CDB length should be.
e_direction direction the transfer is to go.
@@ -181,7 +180,7 @@ uint8_t scsi_mmc_get_cmd_len(uint8_t scsi_cmd);
Returns 0 if command completed successfully.
*/
int scsi_mmc_run_cmd( const CdIo *cdio, int t_timeout,
int scsi_mmc_run_cmd( const CdIo *cdio, unsigned int i_timeout_ms,
const scsi_mmc_cdb_t *p_cdb,
scsi_mmc_direction_t e_direction, unsigned int i_buf,
/*in/out*/ void *p_buf );