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

More cleanup. Still sucks.

Browse Source
This commit is contained in:
rocky
2004-02-04 11:08:10 +00:00
parent 8426256abb
commit 3a1bbd984b
3 changed files with 217 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
lib/_cdio_win32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_win32.c,v 1.22 2004/02/04 10:23:01 rocky Exp $ $Id: _cdio_win32.c,v 1.23 2004/02/04 11:08:10 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: _cdio_win32.c,v 1.22 2004/02/04 10:23:01 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_win32.c,v 1.23 2004/02/04 11:08:10 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -34,9 +34,6 @@ static const char _rcsid[] = "$Id: _cdio_win32.c,v 1.22 2004/02/04 10:23:01 rock
#include "cdio_assert.h" #include "cdio_assert.h"
#include "scsi_mmc.h" #include "scsi_mmc.h"
/* LBA = msf.frame + 75 * ( msf.second - 2 + 60 * msf.minute ) */
#define MSF_TO_LBA2(min, sec, frame) ((int)frame + 75 * (sec -2 + 60 * min))
#include <string.h> #include <string.h>
#ifdef HAVE_WIN32_CDROM #ifdef HAVE_WIN32_CDROM
@@ -58,80 +55,6 @@ static const char _rcsid[] = "$Id: _cdio_win32.c,v 1.22 2004/02/04 10:23:01 rock
#define WIN_NT ( GetVersion() < 0x80000000 ) #define WIN_NT ( GetVersion() < 0x80000000 )
/* Win32 DeviceIoControl specifics */
/***** FIXME: #include ntddcdrm.h from Wine, but probably need to
modify it a little.
*/
#ifndef IOCTL_CDROM_BASE
# define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM
#endif
#ifndef IOCTL_CDROM_READ_TOC
# define IOCTL_CDROM_READ_TOC CTL_CODE(IOCTL_CDROM_BASE, 0x0000, \
METHOD_BUFFERED, FILE_READ_ACCESS)
#endif
#ifndef IOCTL_CDROM_RAW_READ
#define IOCTL_CDROM_RAW_READ CTL_CODE(IOCTL_CDROM_BASE, 0x000F, \
METHOD_OUT_DIRECT, FILE_READ_ACCESS)
#endif
#ifndef IOCTL_CDROM_READ_Q_CHANNEL
#define IOCTL_CDROM_READ_Q_CHANNEL CTL_CODE(IOCTL_CDROM_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS)
#endif
typedef struct _TRACK_DATA {
UCHAR Format;
UCHAR Control : 4;
UCHAR Adr : 4;
UCHAR TrackNumber;
UCHAR Reserved1;
UCHAR Address[4];
} TRACK_DATA, *PTRACK_DATA;
typedef struct _CDROM_TOC {
UCHAR Length[2];
UCHAR FirstTrack;
UCHAR LastTrack;
TRACK_DATA TrackData[CDIO_CD_MAX_TRACKS+1];
} CDROM_TOC, *PCDROM_TOC;
#define IOCTL_CDROM_SUB_Q_CHANNEL 0x00
#define IOCTL_CDROM_CURRENT_POSITION 0x01
#define IOCTL_CDROM_MEDIA_CATALOG 0x02
#define IOCTL_CDROM_TRACK_ISRC 0x03
typedef struct _CDROM_SUB_Q_DATA_FORMAT {
UCHAR Format;
UCHAR Track;
} CDROM_SUB_Q_DATA_FORMAT, *PCDROM_SUB_Q_DATA_FORMAT;
typedef struct _SUB_Q_HEADER {
UCHAR Reserved;
UCHAR AudioStatus;
UCHAR DataLength[2];
} SUB_Q_HEADER, *PSUB_Q_HEADER;
typedef struct _SUB_Q_MEDIA_CATALOG_NUMBER {
SUB_Q_HEADER Header;
UCHAR FormatCode;
UCHAR Reserved[3];
UCHAR Reserved1 : 7;
UCHAR Mcval :1;
UCHAR MediaCatalog[15];
} SUB_Q_MEDIA_CATALOG_NUMBER, *PSUB_Q_MEDIA_CATALOG_NUMBER;
typedef enum _TRACK_MODE_TYPE {
YellowMode2,
XAForm2,
CDDA
} TRACK_MODE_TYPE, *PTRACK_MODE_TYPE;
typedef struct __RAW_READ_INFO {
LARGE_INTEGER DiskOffset;
ULONG SectorCount;
TRACK_MODE_TYPE TrackMode;
} RAW_READ_INFO, *PRAW_READ_INFO;
/* General ioctl() CD-ROM command function */ /* General ioctl() CD-ROM command function */
static bool static bool
_cdio_mciSendCommand(int id, UINT msg, DWORD flags, void *arg) _cdio_mciSendCommand(int id, UINT msg, DWORD flags, void *arg)
@@ -405,16 +328,14 @@ _cdio_mmc_read_sectors (void *user_data, void *data, lsn_t lsn,
{ {
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
unsigned char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, }; unsigned char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
if( _obj->hASPI ) {
HANDLE hEvent; HANDLE hEvent;
struct SRB_ExecSCSICmd ssc; struct SRB_ExecSCSICmd ssc;
#if 1 #if 1
int sector_type = 0; /*all types */ sector_type = 0; /*all types */
int sync = 0; int sync = 0;
int header_code = 2; int header_code = 2;
int user_data = 1; int i_user_data = 1;
int edc_ecc = 0; int edc_ecc = 0;
int error_field = 0; int error_field = 0;
#endif #endif
@@ -449,7 +370,7 @@ _cdio_mmc_read_sectors (void *user_data, void *data, lsn_t lsn,
#if 1 #if 1
ssc.CDBByte[ 9 ] = (sync << 7) | ssc.CDBByte[ 9 ] = (sync << 7) |
(header_code << 5) | (header_code << 5) |
(user_data << 4) | (i_user_data << 4) |
(edc_ecc << 3) | (edc_ecc << 3) |
(error_field << 1); (error_field << 1);
/* ssc.CDBByte[ 9 ] = READ_CD_USERDATA_MODE2; */ /* ssc.CDBByte[ 9 ] = READ_CD_USERDATA_MODE2; */
@@ -478,33 +399,6 @@ _cdio_mmc_read_sectors (void *user_data, void *data, lsn_t lsn,
return 1; return 1;
} }
} else {
DWORD dwBytesReturned;
RAW_READ_INFO cdrom_raw;
/* Initialize CDROM_RAW_READ structure */
cdrom_raw.DiskOffset.QuadPart = CDIO_CD_FRAMESIZE * lsn;
cdrom_raw.SectorCount = 1;
cdrom_raw.TrackMode = XAForm2;
if( DeviceIoControl( _obj->h_device_handle,
IOCTL_CDROM_RAW_READ, &cdrom_raw,
sizeof(RAW_READ_INFO), buf,
sizeof(buf), &dwBytesReturned, NULL )
== 0 ) {
/* Retry in Yellowmode2 */
cdrom_raw.TrackMode = YellowMode2;
if( DeviceIoControl( _obj->h_device_handle,
IOCTL_CDROM_RAW_READ, &cdrom_raw,
sizeof(RAW_READ_INFO), buf,
sizeof(buf), &dwBytesReturned, NULL )
== 0 ) {
cdio_info("Error reading %lu (%ld)\n", lsn, GetLastError());
return 1;
}
}
}
/* FIXME! remove the 8 (SUBHEADER size) below... */ /* FIXME! remove the 8 (SUBHEADER size) below... */
memcpy (data, buf, CDIO_CD_FRAMESIZE_RAW); memcpy (data, buf, CDIO_CD_FRAMESIZE_RAW);
@@ -750,32 +644,7 @@ _cdio_read_toc (_img_private_t *_obj)
return true; return true;
} else { } else {
DWORD dwBytesReturned; return win32ioctl_read_toc(_obj);
CDROM_TOC cdrom_toc;
int i;
if( DeviceIoControl( _obj->h_device_handle,
IOCTL_CDROM_READ_TOC,
NULL, 0, &cdrom_toc, sizeof(CDROM_TOC),
&dwBytesReturned, NULL ) == 0 ) {
cdio_warn( "could not read TOCHDR: %ld" , (long int) GetLastError());
return false;
}
_obj->first_track_num = cdrom_toc.FirstTrack;
_obj->total_tracks = cdrom_toc.LastTrack - cdrom_toc.FirstTrack + 1;
for( i = 0 ; i <= _obj->total_tracks ; i++ ) {
_obj->tocent[ i ].start_lsn = MSF_TO_LBA2(
cdrom_toc.TrackData[i].Address[1],
cdrom_toc.TrackData[i].Address[2],
cdrom_toc.TrackData[i].Address[3] );
_obj->tocent[ i ].Control = cdrom_toc.TrackData[i].Control;
_obj->tocent[ i ].Format = cdrom_toc.TrackData[i].Format;
cdio_debug("p_sectors: %i, %lu", i,
(unsigned long int) (_obj->tocent[i].start_lsn));
}
} }
_obj->gen.toc_init = true; _obj->gen.toc_init = true;
return true; return true;
@@ -863,26 +732,10 @@ _cdio_get_first_track_num(void *user_data)
static char * static char *
_cdio_get_mcn (void *env) { _cdio_get_mcn (void *env) {
_img_private_t *_obj = env; _img_private_t *_env = env;
if( ! _obj->hASPI ) { if( ! _env->hASPI ) {
DWORD dwBytesReturned; win32ioctl_get_mcn(_env);
SUB_Q_MEDIA_CATALOG_NUMBER mcn;
CDROM_SUB_Q_DATA_FORMAT q_data_format;
memset( &mcn, 0, sizeof(mcn) );
q_data_format.Format = IOCTL_CDROM_MEDIA_CATALOG;
q_data_format.Track=1;
if( DeviceIoControl( _obj->h_device_handle,
IOCTL_CDROM_READ_Q_CHANNEL,
&q_data_format, sizeof(q_data_format),
&mcn, sizeof(mcn),
&dwBytesReturned, NULL ) == 0 ) {
cdio_warn( "could not read Q Channel at track 1");
} else if (mcn.Mcval)
return strdup(mcn.MediaCatalog);
} }
return NULL; return NULL;
} }

9
lib/_cdio_win32.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_win32.h,v 1.1 2004/02/04 10:23:01 rocky Exp $ $Id: _cdio_win32.h,v 1.2 2004/02/04 11:08:10 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -67,4 +67,11 @@ const char *win32ioctl_is_cdrom(const char drive_letter);
*/ */
bool win32ioctl_init_win32 (_img_private_t *env); bool win32ioctl_init_win32 (_img_private_t *env);
/*!
Read and cache the CD's Track Table of Contents and track info.
Return true if successful or false if an error.
*/
bool win32ioctl_read_toc (_img_private_t *env);
char *win32ioctl_get_mcn (_img_private_t *env);

138
lib/win32ioctl.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: win32ioctl.c,v 1.1 2004/02/04 10:23:01 rocky Exp $ $Id: win32ioctl.c,v 1.2 2004/02/04 11:08:10 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: win32ioctl.c,v 1.1 2004/02/04 10:23:01 rocky Exp $"; static const char _rcsid[] = "$Id: win32ioctl.c,v 1.2 2004/02/04 11:08:10 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -41,6 +41,11 @@ static const char _rcsid[] = "$Id: win32ioctl.c,v 1.1 2004/02/04 10:23:01 rocky
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
/* Win32 DeviceIoControl specifics */
/***** FIXME: #include ntddcdrm.h from Wine, but probably need to
modify it a little.
*/
#ifndef IOCTL_CDROM_BASE #ifndef IOCTL_CDROM_BASE
# define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM # define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM
#endif #endif
@@ -49,6 +54,43 @@ static const char _rcsid[] = "$Id: win32ioctl.c,v 1.1 2004/02/04 10:23:01 rocky
METHOD_OUT_DIRECT, FILE_READ_ACCESS) METHOD_OUT_DIRECT, FILE_READ_ACCESS)
#endif #endif
#ifndef IOCTL_CDROM_BASE
# define IOCTL_CDROM_BASE FILE_DEVICE_CD_ROM
#endif
#ifndef IOCTL_CDROM_READ_TOC
# define IOCTL_CDROM_READ_TOC CTL_CODE(IOCTL_CDROM_BASE, 0x0000, \
METHOD_BUFFERED, FILE_READ_ACCESS)
#endif
#ifndef IOCTL_CDROM_RAW_READ
#define IOCTL_CDROM_RAW_READ CTL_CODE(IOCTL_CDROM_BASE, 0x000F, \
METHOD_OUT_DIRECT, FILE_READ_ACCESS)
#endif
#ifndef IOCTL_CDROM_READ_Q_CHANNEL
#define IOCTL_CDROM_READ_Q_CHANNEL CTL_CODE(IOCTL_CDROM_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS)
#endif
typedef struct _TRACK_DATA {
UCHAR Format;
UCHAR Control : 4;
UCHAR Adr : 4;
UCHAR TrackNumber;
UCHAR Reserved1;
UCHAR Address[4];
} TRACK_DATA, *PTRACK_DATA;
typedef struct _CDROM_TOC {
UCHAR Length[2];
UCHAR FirstTrack;
UCHAR LastTrack;
TRACK_DATA TrackData[CDIO_CD_MAX_TRACKS+1];
} CDROM_TOC, *PCDROM_TOC;
#define IOCTL_CDROM_SUB_Q_CHANNEL 0x00
#define IOCTL_CDROM_CURRENT_POSITION 0x01
#define IOCTL_CDROM_MEDIA_CATALOG 0x02
#define IOCTL_CDROM_TRACK_ISRC 0x03
typedef enum _TRACK_MODE_TYPE { typedef enum _TRACK_MODE_TYPE {
YellowMode2, YellowMode2,
XAForm2, XAForm2,
@@ -61,6 +103,26 @@ typedef struct __RAW_READ_INFO {
TRACK_MODE_TYPE TrackMode; TRACK_MODE_TYPE TrackMode;
} RAW_READ_INFO, *PRAW_READ_INFO; } RAW_READ_INFO, *PRAW_READ_INFO;
typedef struct _CDROM_SUB_Q_DATA_FORMAT {
UCHAR Format;
UCHAR Track;
} CDROM_SUB_Q_DATA_FORMAT, *PCDROM_SUB_Q_DATA_FORMAT;
typedef struct _SUB_Q_HEADER {
UCHAR Reserved;
UCHAR AudioStatus;
UCHAR DataLength[2];
} SUB_Q_HEADER, *PSUB_Q_HEADER;
typedef struct _SUB_Q_MEDIA_CATALOG_NUMBER {
SUB_Q_HEADER Header;
UCHAR FormatCode;
UCHAR Reserved[3];
UCHAR Reserved1 : 7;
UCHAR Mcval :1;
UCHAR MediaCatalog[15];
} SUB_Q_MEDIA_CATALOG_NUMBER, *PSUB_Q_MEDIA_CATALOG_NUMBER;
#include "_cdio_win32.h" #include "_cdio_win32.h"
const char * const char *
@@ -201,4 +263,76 @@ win32ioctl_init_win32 (_img_private_t *env)
return false; return false;
} }
#define MSF_TO_LBA2(min, sec, frame) \
((int) frame + CDIO_CD_FRAMES_PER_SEC * (CDIO_CD_SECS_PER_MIN*min + sec) \
- CDIO_PREGAP_SECTORS )
/*!
Read and cache the CD's Track Table of Contents and track info.
Return true if successful or false if an error.
*/
bool
win32ioctl_read_toc (_img_private_t *env)
{
DWORD dwBytesReturned;
CDROM_TOC cdrom_toc;
int i;
if( DeviceIoControl( env->h_device_handle,
IOCTL_CDROM_READ_TOC,
NULL, 0, &cdrom_toc, sizeof(CDROM_TOC),
&dwBytesReturned, NULL ) == 0 ) {
cdio_warn( "could not read TOCHDR: %ld" , (long int) GetLastError());
return false;
}
env->first_track_num = cdrom_toc.FirstTrack;
env->total_tracks = cdrom_toc.LastTrack - cdrom_toc.FirstTrack + 1;
for( i = 0 ; i <= env->total_tracks ; i++ ) {
env->tocent[ i ].start_lsn = MSF_TO_LBA2(
cdrom_toc.TrackData[i].Address[1],
cdrom_toc.TrackData[i].Address[2],
cdrom_toc.TrackData[i].Address[3] );
env->tocent[ i ].Control = cdrom_toc.TrackData[i].Control;
env->tocent[ i ].Format = cdrom_toc.TrackData[i].Format;
cdio_debug("p_sectors: %i, %lu", i,
(unsigned long int) (env->tocent[i].start_lsn));
}
env->gen.toc_init = true;
return true;
}
/*!
Return the media catalog number MCN.
Note: string is malloc'd so caller should free() then returned
string when done with it.
*/
char *
win32ioctl_get_mcn (_img_private_t *env) {
DWORD dwBytesReturned;
SUB_Q_MEDIA_CATALOG_NUMBER mcn;
CDROM_SUB_Q_DATA_FORMAT q_data_format;
memset( &mcn, 0, sizeof(mcn) );
q_data_format.Format = IOCTL_CDROM_MEDIA_CATALOG;
q_data_format.Track=1;
if( DeviceIoControl( env->h_device_handle,
IOCTL_CDROM_READ_Q_CHANNEL,
&q_data_format, sizeof(q_data_format),
&mcn, sizeof(mcn),
&dwBytesReturned, NULL ) == 0 ) {
cdio_warn( "could not read Q Channel at track 1");
} else if (mcn.Mcval)
return strdup(mcn.MediaCatalog);
return NULL;
}
#endif /*HAVE_WIN32_CDROM*/ #endif /*HAVE_WIN32_CDROM*/