git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54386 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 19 insertions, 10 deletions

diff --git a/plugins/dfcdrom/cdr.h b/plugins/dfcdrom/cdr.h
index 7faa3c0e..fa4f8cc0 100644
--- a/plugins/dfcdrom/cdr.h
+++ b/plugins/dfcdrom/cdr.h
@@ -74,7 +74,7 @@ struct cdrom_msf {
 #define CD_FRAMESIZE_SUB	96
 #define CD_MSF_OFFSET		150
 
-#ifdef __FreeBSD__
+#if defined (__FreeBSD__)
 
 #include <sys/ata.h>
 #include <sys/cdio.h>
@@ -83,6 +83,14 @@ struct cdrom_msf {
 
 #define DEV_DEF		"/dev/acd0"
 
+#elif defined (__sun)
+
+#include <sys/cdio.h>
+
+/* The CD-ROM device name seems to vary on different computers on Solaris, so
+   let user set this. */
+#define DEV_DEF		""
+
 #else
 
 #define DEV_DEF		""
@@ -178,14 +186,15 @@ unsigned int msf_to_lba(char m, char s, char f);
 void lba_to_msf(unsigned int s, char *msf);
 
 int OpenCdHandle();
-void CloseCdHandle(int handle);
-long GetTN(int handle, unsigned char *buffer);
-long GetTD(int handle, unsigned char track, unsigned char *buffer);
-long GetTE(int handle, unsigned char track, unsigned char *m, unsigned char *s, unsigned char *f);
-long ReadSector(int handle, crdata *cr);
-long PlayCDDA(int handle, unsigned char *sector);
-long StopCDDA(int handle);
-long GetStatus(int handle, int playing, struct CdrStat *stat);
-unsigned char *ReadSub(int handle, const unsigned char *time);
+void CloseCdHandle();
+int IsCdHandleOpen();
+long GetTN(unsigned char *buffer);
+long GetTD(unsigned char track, unsigned char *buffer);
+long GetTE(unsigned char track, unsigned char *m, unsigned char *s, unsigned char *f);
+long ReadSector(crdata *cr);
+long PlayCDDA(unsigned char *sector);
+long StopCDDA();
+long GetStatus(int playing, struct CdrStat *stat);
+unsigned char *ReadSub(const unsigned char *time);
 
 #endif