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

Compilation fixes and modulization improvements.

Browse Source
This commit is contained in:
rocky
2004-04-30 21:36:53 +00:00
parent a4cc1496e5
commit e853206824
8 changed files with 82 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/MSWindows/aspi32.c
View File

@@ -1,5 +1,5 @@
/*
$Id: aspi32.c,v 1.2 2004/04/30 06:54:15 rocky Exp $
$Id: aspi32.c,v 1.3 2004/04/30 21:36:54 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: aspi32.c,v 1.2 2004/04/30 06:54:15 rocky Exp $";
static const char _rcsid[] = "$Id: aspi32.c,v 1.3 2004/04/30 21:36:54 rocky Exp $";
#include <cdio/cdio.h>
#include <cdio/sector.h>
@@ -320,9 +320,7 @@ wnaspi32_mmc_read_sectors (_img_private_t *env, void *data, lsn_t lsn,
ssc.SRB_PostProc = (LPVOID) hEvent;
ssc.SRB_CDBLen = 12;
/* Operation code */
ssc.CDBByte[ 0 ] = CDIO_MMC_GPCMD_READ_CD;
CDIO_MMC_SET_COMMAND(ssc.CDBByte, CDIO_MMC_GPCMD_READ_CD));
CDIO_MMC_SET_READ_TYPE(ssc.CDBByte, sector_type);
CDIO_MMC_SET_READ_LBA(ssc.CDBByte, lsn);
CDIO_MMC_SET_READ_LENGTH(ssc.CDBByte, nblocks);
@@ -417,13 +415,13 @@ wnaspi32_read_toc (_img_private_t *env)
ssc.SRB_CDBLen = 10;
/* Operation code */
ssc.CDBByte[ 0 ] = READ_TOC;
CDIO_MMC_SET_COMMAND(ssc.CDBByte, CDIO_MMC_READ_TOC);
/* Format */
ssc.CDBByte[ 2 ] = READ_TOC_FORMAT_TOC;
/* Starting track */
ssc.CDBByte[ 6 ] = 0;
CDIO_MMC_SET_START_TRACK(ssc.CDBByte, 0);
/* Allocation length and buffer */
ssc.SRB_BufLen = sizeof( p_tocheader );

13
lib/MSWindows/win32.c
View File

@@ -1,5 +1,5 @@
/*
$Id: win32.c,v 1.9 2004/04/30 07:33:51 rocky Exp $
$Id: win32.c,v 1.10 2004/04/30 21:36:54 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: win32.c,v 1.9 2004/04/30 07:33:51 rocky Exp $";
static const char _rcsid[] = "$Id: win32.c,v 1.10 2004/04/30 21:36:54 rocky Exp $";
#include <cdio/cdio.h>
#include <cdio/sector.h>
@@ -337,7 +337,14 @@ _set_arg_win32 (void *user_data, const char key[], const char value[])
}
else if (!strcmp (key, "access-mode"))
{
return str_to_access_mode_win32(value);
_obj->access_mode = str_to_access_mode_win32(value);
if (_obj->access_mode == _AM_ASPI && !_obj->b_aspi_init)
return winaspi_init_win32(_obj) ? 1 : -3;
else if (_obj->access_mode == _AM_IOCTL && !_obj->b_ioctl_init)
return win32ioctl_init_win32(_obj) ? 1 : -3;
else
return -4;
return 0;
}
else
return -1;