summaryrefslogtreecommitdiff
path: root/plugins/dfcdrom
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-07-15 07:07:34 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-07-15 07:07:34 +0000
commit4595ee36dbf027ccc8f700cc6d6256f47cd05a98 (patch)
tree1a6c3a2cc621d7d6a1811b3d5cb24f220f05b047 /plugins/dfcdrom
parent31db6906681fa9815373d5550dce12b77d2518e4 (diff)
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
Diffstat (limited to 'plugins/dfcdrom')
-rw-r--r--plugins/dfcdrom/cdr-libcdio.c4
-rw-r--r--plugins/dfcdrom/cdr.h2
-rw-r--r--plugins/dfcdrom/cdrcfg-0.1df/main.c8
3 files changed, 9 insertions, 5 deletions
diff --git a/plugins/dfcdrom/cdr-libcdio.c b/plugins/dfcdrom/cdr-libcdio.c
index 2b4a309c..560cd76b 100644
--- a/plugins/dfcdrom/cdr-libcdio.c
+++ b/plugins/dfcdrom/cdr-libcdio.c
@@ -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);
diff --git a/plugins/dfcdrom/cdr.h b/plugins/dfcdrom/cdr.h
index 9348de14..fee46dc5 100644
--- a/plugins/dfcdrom/cdr.h
+++ b/plugins/dfcdrom/cdr.h
@@ -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
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index 6f486c40..c6111207 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -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];