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

Allow more flexibility in specifying access mode.

Browse Source 
"IOCTL" -> "ioctl".
This commit is contained in:
rocky
2004-05-13 01:49:01 +00:00
parent 9bf0aa3771
commit cf6fd8b4c8
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/MSWindows/win32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: win32.c,v 1.14 2004/05/10 03:28:56 rocky Exp $ $Id: win32.c,v 1.15 2004/05/13 01:49:01 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.14 2004/05/10 03:28:56 rocky Exp $"; static const char _rcsid[] = "$Id: win32.c,v 1.15 2004/05/13 01:49:01 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -80,12 +80,12 @@ str_to_access_mode_win32(const char *psz_access_mode)
if (NULL==psz_access_mode) return default_access_mode; if (NULL==psz_access_mode) return default_access_mode;
if (!strcmp(psz_access_mode, "IOCTL")) if (!strcmp(psz_access_mode, "ioctl"))
return _AM_IOCTL; return _AM_IOCTL;
else if (!strcmp(psz_access_mode, "ASPI")) else if (!strcmp(psz_access_mode, "ASPI"))
return _AM_ASPI; return _AM_ASPI;
else { else {
cdio_warn ("unknown access type: %s. Default IOCTL used.", cdio_warn ("unknown access type: %s. Default 'ioctl' used.",
psz_access_mode); psz_access_mode);
return default_access_mode; return default_access_mode;
} }
@@ -421,10 +421,8 @@ _cdio_get_arg (void *user_data, const char key[])
} else if (!strcmp (key, "access-mode")) { } else if (!strcmp (key, "access-mode")) {
if (env->hASPI) if (env->hASPI)
return "ASPI"; return "ASPI";
else if ( WIN_NT )
return "IOCTL";
else else
return "undefined WIN32"; return "ioctl";
} }
return NULL; return NULL;
} }
@@ -663,7 +661,7 @@ cdio_open_win32 (const char *psz_source_name)
{ {
#ifdef HAVE_WIN32_CDROM #ifdef HAVE_WIN32_CDROM
if ( WIN_NT ) { if ( WIN_NT ) {
return cdio_open_am_win32(psz_source_name, "IOCTL"); return cdio_open_am_win32(psz_source_name, "ioctl");
} else { } else {
return cdio_open_am_win32(psz_source_name, "ASPI"); return cdio_open_am_win32(psz_source_name, "ASPI");
} }