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

Compilation fixes after adjustments.

Browse Source
This commit is contained in:
rocky
2004-04-30 22:27:59 +00:00
parent e853206824
commit c9982234a0
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/MSWindows/aspi32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: aspi32.c,v 1.3 2004/04/30 21:36:54 rocky Exp $ $Id: aspi32.c,v 1.4 2004/04/30 22:28:00 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: aspi32.c,v 1.3 2004/04/30 21:36:54 rocky Exp $"; static const char _rcsid[] = "$Id: aspi32.c,v 1.4 2004/04/30 22:28:00 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -320,7 +320,7 @@ wnaspi32_mmc_read_sectors (_img_private_t *env, void *data, lsn_t lsn,
ssc.SRB_PostProc = (LPVOID) hEvent; ssc.SRB_PostProc = (LPVOID) hEvent;
ssc.SRB_CDBLen = 12; ssc.SRB_CDBLen = 12;
CDIO_MMC_SET_COMMAND(ssc.CDBByte, 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_TYPE(ssc.CDBByte, sector_type);
CDIO_MMC_SET_READ_LBA(ssc.CDBByte, lsn); CDIO_MMC_SET_READ_LBA(ssc.CDBByte, lsn);
CDIO_MMC_SET_READ_LENGTH(ssc.CDBByte, nblocks); CDIO_MMC_SET_READ_LENGTH(ssc.CDBByte, nblocks);

14
lib/MSWindows/win32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: win32.c,v 1.10 2004/04/30 21:36:54 rocky Exp $ $Id: win32.c,v 1.11 2004/04/30 22:28:00 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.10 2004/04/30 21:36:54 rocky Exp $"; static const char _rcsid[] = "$Id: win32.c,v 1.11 2004/04/30 22:28:00 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -337,11 +337,11 @@ _set_arg_win32 (void *user_data, const char key[], const char value[])
} }
else if (!strcmp (key, "access-mode")) else if (!strcmp (key, "access-mode"))
{ {
_obj->access_mode = str_to_access_mode_win32(value); env->access_mode = str_to_access_mode_win32(value);
if (_obj->access_mode == _AM_ASPI && !_obj->b_aspi_init) if (env->access_mode == _AM_ASPI && !env->b_aspi_init)
return winaspi_init_win32(_obj) ? 1 : -3; return wnaspi32_init_win32(env) ? 1 : -3;
else if (_obj->access_mode == _AM_IOCTL && !_obj->b_ioctl_init) else if (env->access_mode == _AM_IOCTL && !env->b_ioctl_init)
return win32ioctl_init_win32(_obj) ? 1 : -3; return win32ioctl_init_win32(env) ? 1 : -3;
else else
return -4; return -4;
return 0; return 0;

8
lib/_cdio_sunos.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_sunos.c,v 1.29 2004/04/30 07:07:49 rocky Exp $ $Id: _cdio_sunos.c,v 1.30 2004/04/30 22:27:59 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -41,7 +41,7 @@
#ifdef HAVE_SOLARIS_CDROM #ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.29 2004/04/30 07:07:49 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.30 2004/04/30 22:27:59 rocky Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -520,7 +520,7 @@ _cdio_get_drive_cap_solaris (const void *env)
memset(&my_rq_buf, 0, sizeof(my_rq_buf)); memset(&my_rq_buf, 0, sizeof(my_rq_buf));
/* Initialize my_scsi_cdb as a Mode Select(6) */ /* Initialize my_scsi_cdb as a Mode Select(6) */
my_scsi_cdb[0] = CDIO_MMC_MODE_SENSE; CDIO_MMC_SET_COMMAND(my_scsi_cdb, CDIO_MMC_MODE_SENSE);
my_scsi_cdb[1] = 0x0; my_scsi_cdb[1] = 0x0;
my_scsi_cdb[2] = 0x2a; /* MODE_PAGE_CAPABILITIES*/; my_scsi_cdb[2] = 0x2a; /* MODE_PAGE_CAPABILITIES*/;
my_scsi_cdb[3] = 0; /* Not used */ my_scsi_cdb[3] = 0; /* Not used */
@@ -584,7 +584,7 @@ _cdio_get_mcn_solaris (const void *env)
memset(&my_scsi_cdb, 0, sizeof(my_scsi_cdb)); memset(&my_scsi_cdb, 0, sizeof(my_scsi_cdb));
memset(&my_rq_buf, 0, sizeof(my_rq_buf)); memset(&my_rq_buf, 0, sizeof(my_rq_buf));
my_scsi_cdb[0] = CDIO_MMC_GPCMD_READ_SUBCHANNEL; CDIO_MMC_SET_COMMAND(my_scsi_cdb, CDIO_MMC_GPCMD_READ_SUBCHANNEL);
my_scsi_cdb[1] = 0x0; my_scsi_cdb[1] = 0x0;
my_scsi_cdb[2] = 0x40; my_scsi_cdb[2] = 0x40;
my_scsi_cdb[3] = 02; /* Give media catalog number. */ my_scsi_cdb[3] = 02; /* Give media catalog number. */