From 670928f59061abd0570cfcb3cd5b2280701b41da Mon Sep 17 00:00:00 2001 From: Ulf Wohlers Date: Wed, 28 Jan 2004 12:03:07 +0000 Subject: [PATCH] use ioctl interface as default in linux Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1609 --- src/dos/dos_mscdex.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/dos/dos_mscdex.cpp b/src/dos/dos_mscdex.cpp index f6f93650..4559914d 100644 --- a/src/dos/dos_mscdex.cpp +++ b/src/dos/dos_mscdex.cpp @@ -27,8 +27,8 @@ #include "cdrom.h" -//#define MSCDEX_LOG LOG(LOG_MISC,LOG_ERROR) -#define MSCDEX_LOG +#define MSCDEX_LOG LOG(LOG_MISC,LOG_ERROR) +//#define MSCDEX_LOG #define MSCDEX_VERSION_HIGH 2 #define MSCDEX_VERSION_LOW 23 @@ -261,11 +261,12 @@ int CMscdex::AddDrive(Bit16u _drive, char* physicalPath, Bit8u& subUnit) } #endif #if defined (LINUX) - if (useCdromInterface==CDROM_USE_IOCTL) { + // Always use IOCTL in Linux +// if (useCdromInterface==CDROM_USE_IOCTL) { cdrom[numDrives] = new CDROM_Interface_Ioctl(); LOG(LOG_MISC,LOG_NORMAL)("MSCDEX: IOCTL Interface."); break; - } +// } #endif cdrom[numDrives] = new CDROM_Interface_SDL(); LOG(LOG_MISC,LOG_NORMAL)("MSCDEX: SDL Interface.");