X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcdintf.cpp;h=1f0993b482ccbc32dcf5416ac9a8a1b950812963;hb=8103796dd981a8a1c2e18979fd5ef3a1f3f1ccdb;hp=ded601cb5df421e08fd037ccd509a803ccc7a251;hpb=7644e8de75e32cd1f96e7ffd8933e02ebcf26e8b;p=virtualjaguar

diff --git a/src/cdintf.cpp b/src/cdintf.cpp
index ded601c..1f0993b 100644
--- a/src/cdintf.cpp
+++ b/src/cdintf.cpp
@@ -1,28 +1,151 @@
 //
 // OS agnostic CDROM interface functions
 //
-// by James L. Hammons
+// by James Hammons
+// (C) 2010 Underground Software
 //
-// This file is basically a shell to keep the front-end clean and also pull in the
-// appropriate back-end code depending on which target is being compiled for.
+// JLH = James Hammons <jlhamm@acm.org>
+//
+// Who  When        What
+// ---  ----------  -------------------------------------------------------------
+// JLH  01/16/2010  Created this log ;-)
 //
 
-#include "cdintf.h"									// Every OS has to implement these
+//
+// This now uses the supposedly cross-platform libcdio to do the necessary
+// low-level CD twiddling we need that libsdl can't do currently. Jury is
+// still out on whether or not to make this a conditional compilation or not.
+//
 
-// OS dependent implementations
+// Comment this out if you don't have libcdio installed
+// (Actually, this is defined in the Makefile to prevent having to edit
+//  things too damn much. Jury is still out whether or not to make this
+//  change permanent.)
+//#define HAVE_LIB_CDIO
 
-#if defined(__GCCWIN32__)
+#include "cdintf.h"								// Every OS has to implement these
 
-#include "cdintf_win32.cpp"
+#ifdef HAVE_LIB_CDIO
+#include <cdio/cdio.h>							// Now using OS agnostic CD access routines!
+#endif
+#include "log.h"
 
-#elif defined(__GCCUNIX__)
-	#if defined(_OSX_)
 
-#include "cdintf_osx.cpp"
+/*
+static void TestCDIO(void)
+{
+	// See what (if anything) is installed.
+	CdIo_t * p_cdio = cdio_open(0, DRIVER_DEVICE);
+	driver_id_t driver_id;
 
-	#else
+	if (p_cdio != NULL)
+	{
+		WriteLog("CDIO: The driver selected is %s.\n", cdio_get_driver_name(p_cdio));
+		WriteLog("CDIO: The default device for this driver is %s.\n\n", cdio_get_default_device(p_cdio));
+		cdio_destroy(p_cdio);
+	}
+	else
+	{
+		WriteLog("CDIO: A suitable CD-ROM driver was not found.\n\n");
+	}
+}
+*/
 
-#include "cdintf_linux.cpp"
+//
+// *** OK, here's where we're going to attempt to put the platform agnostic CD interface ***
+//
 
-	#endif
+#ifdef HAVE_LIB_CDIO
+static CdIo_t * cdioPtr = NULL;
 #endif
+
+bool CDIntfInit(void)
+{
+#ifdef HAVE_LIB_CDIO
+	cdioPtr = cdio_open(NULL, DRIVER_DEVICE);
+
+	if (cdioPtr == NULL)
+	{
+#endif
+		WriteLog("CDINTF: No suitable CD-ROM driver found.\n");
+		return false;
+#ifdef HAVE_LIB_CDIO
+	}
+
+	WriteLog("CDINTF: Successfully opened CD-ROM interface.\n");
+
+	return true;
+#endif
+}
+
+void CDIntfDone(void)
+{
+	WriteLog("CDINTF: Shutting down CD-ROM subsystem.\n");
+
+#ifdef HAVE_LIB_CDIO
+	if (cdioPtr)
+		cdio_destroy(cdioPtr);
+#endif
+}
+
+bool CDIntfReadBlock(uint32 sector, uint8 * buffer)
+{
+#warning "!!! FIX !!! CDIntfReadBlock not implemented!"
+	// !!! FIX !!!
+	WriteLog("CDINTF: ReadBlock unimplemented!\n");
+	return false;
+}
+
+uint32 CDIntfGetNumSessions(void)
+{
+#warning "!!! FIX !!! CDIntfGetNumSessions not implemented!"
+	// !!! FIX !!!
+	// Still need relevant code here... !!! FIX !!!
+	return 2;
+}
+
+void CDIntfSelectDrive(uint32 driveNum)
+{
+#warning "!!! FIX !!! CDIntfSelectDrive not implemented!"
+	// !!! FIX !!!
+	WriteLog("CDINTF: SelectDrive unimplemented!\n");
+}
+
+uint32 CDIntfGetCurrentDrive(void)
+{
+#warning "!!! FIX !!! CDIntfGetCurrentDrive not implemented!"
+	// !!! FIX !!!
+	WriteLog("CDINTF: GetCurrentDrive unimplemented!\n");
+	return 0;
+}
+
+const uint8 * CDIntfGetDriveName(uint32 driveNum)
+{
+#warning "!!! FIX !!! CDIntfGetDriveName driveNum is currently ignored!"
+	// driveNum is currently ignored... !!! FIX !!!
+
+#ifdef HAVE_LIB_CDIO
+	uint8 * driveName = (uint8 *)cdio_get_default_device(cdioPtr);
+	WriteLog("CDINTF: The drive name for the current driver is %s.\n", driveName);
+
+	return driveName;
+#else
+	return (uint8 *)"NONE";
+#endif
+}
+
+uint8 CDIntfGetSessionInfo(uint32 session, uint32 offset)
+{
+#warning "!!! FIX !!! CDIntfGetSessionInfo not implemented!"
+	// !!! FIX !!!
+	WriteLog("CDINTF: GetSessionInfo unimplemented!\n");
+	return 0xFF;
+}
+
+uint8 CDIntfGetTrackInfo(uint32 track, uint32 offset)
+{
+#warning "!!! FIX !!! CDIntfTrackInfo not implemented!"
+	// !!! FIX !!!
+	WriteLog("CDINTF: GetTrackInfo unimplemented!\n");
+	return 0xFF;
+}