X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcdintf.cpp;h=45b6be2eac3aecfa510dfa2f05c1e10789be3653;hb=f005034d4a3990efc8e445ce46222ce32600411b;hp=fbf227fef0f5f95d58a1fc56871f462a40c22063;hpb=6c19e4098a43c47f8cd1824902f7335e124b834f;p=virtualjaguar

diff --git a/src/cdintf.cpp b/src/cdintf.cpp
index fbf227f..45b6be2 100644
--- a/src/cdintf.cpp
+++ b/src/cdintf.cpp
@@ -1,39 +1,35 @@
 //
 // 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
-
-#include <cdio/cdio.h>							// Now using OS agnostic CD access routines!
-#include "log.h"
-
-// Not any more!
-#if 0
-
-// OS dependent implementations
-
-#if defined(__GCCWIN32__)
-
-#include "cdintf_win32.cpp"
-
-#elif defined(__GCCUNIX__)
-	#if defined(_OSX_)
-
-#include "cdintf_osx.cpp"
+//
+// 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.
+//
 
-	#else
+// 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
 
-#include "cdintf_linux.cpp"
+#include "cdintf.h"								// Every OS has to implement these
 
-	#endif
+#ifdef HAVE_LIB_CDIO
+#include <cdio/cdio.h>							// Now using OS agnostic CD access routines!
 #endif
+#include "log.h"
 
-#endif
 
 /*
 static void TestCDIO(void)
@@ -59,77 +55,96 @@ static void TestCDIO(void)
 // *** OK, here's where we're going to attempt to put the platform agnostic CD interface ***
 //
 
+#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)
+bool CDIntfReadBlock(uint32_t sector, uint8_t * buffer)
 {
+#warning "!!! FIX !!! CDIntfReadBlock not implemented!"
 	// !!! FIX !!!
 	WriteLog("CDINTF: ReadBlock unimplemented!\n");
 	return false;
 }
 
-uint32 CDIntfGetNumSessions(void)
+uint32_t CDIntfGetNumSessions(void)
 {
+#warning "!!! FIX !!! CDIntfGetNumSessions not implemented!"
 	// !!! FIX !!!
 	// Still need relevant code here... !!! FIX !!!
 	return 2;
 }
 
-void CDIntfSelectDrive(uint32 driveNum)
+void CDIntfSelectDrive(uint32_t driveNum)
 {
+#warning "!!! FIX !!! CDIntfSelectDrive not implemented!"
 	// !!! FIX !!!
 	WriteLog("CDINTF: SelectDrive unimplemented!\n");
 }
 
-uint32 CDIntfGetCurrentDrive(void)
+uint32_t CDIntfGetCurrentDrive(void)
 {
+#warning "!!! FIX !!! CDIntfGetCurrentDrive not implemented!"
 	// !!! FIX !!!
 	WriteLog("CDINTF: GetCurrentDrive unimplemented!\n");
 	return 0;
 }
 
-const uint8 * CDIntfGetDriveName(uint32 driveNum)
+const uint8_t * CDIntfGetDriveName(uint32_t driveNum)
 {
+#warning "!!! FIX !!! CDIntfGetDriveName driveNum is currently ignored!"
 	// driveNum is currently ignored... !!! FIX !!!
 
-	uint8 * driveName = (uint8 *)cdio_get_default_device(cdioPtr);
+#ifdef HAVE_LIB_CDIO
+	uint8_t * driveName = (uint8_t *)cdio_get_default_device(cdioPtr);
 	WriteLog("CDINTF: The drive name for the current driver is %s.\n", driveName);
 
 	return driveName;
+#else
+	return (uint8_t *)"NONE";
+#endif
 }
 
-uint8 CDIntfGetSessionInfo(uint32 session, uint32 offset)
+uint8_t CDIntfGetSessionInfo(uint32_t session, uint32_t offset)
 {
+#warning "!!! FIX !!! CDIntfGetSessionInfo not implemented!"
 	// !!! FIX !!!
 	WriteLog("CDINTF: GetSessionInfo unimplemented!\n");
 	return 0xFF;
 }
 
-uint8 CDIntfGetTrackInfo(uint32 track, uint32 offset)
+uint8_t CDIntfGetTrackInfo(uint32_t track, uint32_t offset)
 {
+#warning "!!! FIX !!! CDIntfTrackInfo not implemented!"
 	// !!! FIX !!!
 	WriteLog("CDINTF: GetTrackInfo unimplemented!\n");
 	return 0xFF;