Attempt at raw drive access for linux / osx, test please :)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2410 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99
2009-02-24 07:30:10 +00:00
parent 772e37be9a
commit 5dfbb9438e
6 changed files with 67 additions and 32 deletions

View File

@ -16,33 +16,31 @@
// http://code.google.com/p/dolphin-emu/
#include <string>
#include "Common.h"
#include "DriveUtil.h"
#ifdef _WIN32
#include <windows.h>
#include <winioctl.h>
#elif defined(__GNUC__) // TODO: replace these with real linux / os x functinos
#define GetLogicalDriveStrings(x, y) (int)memcpy(y,"/dev/cdrom\0/dev/cdrom1\0/dev/cdrom2\0/dev/cdrom3\0/dev/cdrom4\0/dev/cdrom5\0/dev/cdrom6\0/dev/cdrom7\0/dev/cdrom8\0/dev/cdrom9\0\0\0", 121);
#else
#define GetLogicalDriveStrings(x, y) (int)memcpy(y,"/dev/disk2\0/dev/disk3\0/dev/disk4\0/dev/disk5\0/dev/disk6\0/dev/disk7\0/dev/disk8\0/dev/disk9\0/dev/disk10\0/dev/disk11\0\0\0",114);
#endif
void GetAllRemovableDrives(std::vector<std::string> *drives) {
drives->clear();
#ifdef _WIN32
char drives_string[1024];
int max_drive_pos = GetLogicalDriveStrings(1024, drives_string);
char *p = drives_string;
// GetLogicalDriveStrings returns the drives as a a series of null-terminated strings
// laid out right after each other in RAM, with a double null at the end.
while (*p)
{
if (GetDriveType(p) == DRIVE_CDROM) // CD_ROM also applies to DVD. Noone has a plain CDROM without DVD anymore so we should be fine.
if (File::IsDisk(p))
{
drives->push_back(std::string(p).substr(0, 2));
drives->push_back(std::string(p));
}
p += strlen(p) + 1;
}
#else
// TODO
// stat("/media/cdrom") or whatever etc etc
#endif
}

View File

@ -20,6 +20,8 @@
#include <string>
#include <vector>
#include "Common.h"
#include "FileUtil.h"
// Tools to enumerate drives (HDD, DVD, CD) in a platform-independent manner.

View File

@ -30,6 +30,9 @@
#include <dirent.h>
#include <errno.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <linux/cdrom.h>
#endif
#include <fstream>
@ -72,11 +75,33 @@ bool Exists(const char *filename)
bool IsDisk(const char *filename)
{
#ifdef _WIN32
std::string copy = filename;
if (copy.size() < 4 && copy.c_str()[1] == ':')
if (GetDriveType(filename) == DRIVE_CDROM) // CD_ROM also applies to DVD. Noone has a plain CDROM without DVD anymore so we should be fine.
return true;
#else
// TODO: add linux \ osx
struct stat statInfo;
if((stat(filename, &statInfo) > -1) && (S_ISCHR(statInfo.st_mode) || S_ISBLK(statInfo.st_mode)))
{
int fileHandle;
// try to open the device
fileHandle = open(filename, O_RDONLY | O_NONBLOCK, 0);
if (fileHandle >= 0)
{
cdrom_subchnl cdChannelInfo;
cdChannelInfo.cdsc_format = CDROM_MSF;
if ((ioctl(fileHandle, CDROMSUBCHNL, &cdChannelInfo) == 0) ||
(errno == EIO) || (errno == ENOENT) ||
(errno == EINVAL)
#ifdef __GNUC__
|| (errno == ENOMEDIUM)
#endif
)
{
return true;
}
close(fileHandle);
}
}
#endif
return false;
}

View File

@ -9,6 +9,7 @@ files = [
"ConsoleWindow.cpp",
"ColorUtil.cpp",
"CPUDetect.cpp",
"DriveUtil.cpp",
"DynamicLibrary.cpp",
"Hash.cpp",
"IniFile.cpp",