use /dev/cd? instead of /dev/acd? on freebsd

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54651 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\weimingzhi_cp 2010-07-15 07:07:34 +00:00
parent 31db690668
commit 4595ee36db
4 changed files with 16 additions and 5 deletions

View File

@ -1,3 +1,10 @@
July 15, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* plugins/dfcdrom/cdr-libcdio.c: Force MMC access mode on FreeBSD.
* plugins/dfcdrom/cdrcfg-0.1df/main.c: Use /dev/cd? instead on /dev/acd? on
FreeBSD.
* plugins/dfcdrom/cdr.h: Likewise.
July 14, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* plugins/dfcdrom/cdr.h: Silenced warning on macro redefination when using

View File

@ -78,7 +78,11 @@ int OpenCdHandle(const char *dev) {
}
}
#ifdef __FreeBSD__
cdHandle = cdio_open_am_cd(dev, "MMC");
#else
cdHandle = cdio_open_cd(dev);
#endif
if (cdHandle != NULL) {
SetSpeed(CdrSpeed);

View File

@ -78,7 +78,7 @@ struct cdrom_msf {
#define CD_FRAMESIZE_SUB 96
#if defined (__FreeBSD__)
#define DEV_DEF "/dev/acd0"
#define DEV_DEF "/dev/cd0"
#else
#define DEV_DEF ""
#endif

View File

@ -110,10 +110,10 @@ void fill_drives_list(GtkWidget *widget) {
""};
#elif defined (__FreeBSD__)
static const char *cdrom_devices[] = {
"/dev/acd0",
"/dev/acd1",
"/dev/acd2",
"/dev/acd3",
"/dev/cd0",
"/dev/cd1",
"/dev/cd2",
"/dev/cd3",
""};
#elif defined (__sun)
char cdrom_devices[256][256];