From 784b579c284f0664780737b243421ce06f9eb5a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Strohh=C3=A4cker?= Date: Sun, 27 May 2007 16:11:35 +0000 Subject: [PATCH] use ioctl cdrom access by default if possible Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2859 --- src/dos/dos_programs.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/dos/dos_programs.cpp b/src/dos/dos_programs.cpp index 89152ac6..28c90cca 100644 --- a/src/dos/dos_programs.cpp +++ b/src/dos/dos_programs.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: dos_programs.cpp,v 1.71 2007-05-26 19:42:09 c2woody Exp $ */ +/* $Id: dos_programs.cpp,v 1.72 2007-05-27 16:11:35 c2woody Exp $ */ #include #include @@ -220,9 +220,15 @@ public: int num = -1; cmd->FindInt("-usecd",num,true); int error; - if (cmd->FindExist("-aspi",false)) MSCDEX_SetCDInterface(CDROM_USE_ASPI, num); else - if (cmd->FindExist("-ioctl",false)) MSCDEX_SetCDInterface(CDROM_USE_IOCTL, num); - else MSCDEX_SetCDInterface(CDROM_USE_SDL, num); + if (cmd->FindExist("-aspi",false)) { + MSCDEX_SetCDInterface(CDROM_USE_ASPI, num); + } else if (cmd->FindExist("-ioctl",false)) { + MSCDEX_SetCDInterface(CDROM_USE_IOCTL, num); + } else if (cmd->FindExist("-noioctl",false)) { + MSCDEX_SetCDInterface(CDROM_USE_SDL, num); + } else { + MSCDEX_SetCDInterface(CDROM_USE_IOCTL, num); + } newdrive = new cdromDrive(drive,temp_line.c_str(),sizes[0],bit8size,sizes[2],0,mediaid,error); // Check Mscdex, if it worked out... switch (error) {