--- a/configure.in	Sat Aug 18 21:58:26 2001 +0000
+++ b/configure.in	Sat Aug 18 22:03:11 2001 +0000
@@ -1237,7 +1237,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, linux, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS linux"
+            CDROM_DRIVERS="$CDROM_DRIVERS linux/libcdrom_linux.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1302,7 +1303,8 @@
         # Set up files for the cdrom library
         # (No cdrom support yet)
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
+            CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1353,7 +1355,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, freebsd, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS freebsd"
+            CDROM_DRIVERS="$CDROM_DRIVERS freebsd/libcdrom_freebsd.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1404,7 +1407,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, openbsd, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS openbsd"
+            CDROM_DRIVERS="$CDROM_DRIVERS openbsd/libcdrom_openbsd.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1463,7 +1467,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, openbsd, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS openbsd"
+            CDROM_DRIVERS="$CDROM_DRIVERS openbsd/libcdrom_openbsd.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1517,7 +1522,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
+            CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1566,7 +1572,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, linux, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS linux"
+            CDROM_DRIVERS="$CDROM_DRIVERS linux/libcdrom_linux.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1612,7 +1619,8 @@
         # Set up files for the cdrom library
         # (No CD-ROM support yet)
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
+            CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1673,7 +1681,8 @@
         # Set up files for the cdrom library
         # (No CD-ROM support yet)
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
+            CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1717,7 +1726,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, aix, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS aix"
+            CDROM_DRIVERS="$CDROM_DRIVERS aix/libcdrom_aix.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1762,7 +1772,8 @@
         # Set up files for the cdrom library
         # (No cdrom support yet)
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
+            CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1806,7 +1817,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, qnx, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS qnx"
+            CDROM_DRIVERS="$CDROM_DRIVERS qnx/libcdrom_qnx.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1858,7 +1870,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, win32, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS win32"
+            CDROM_DRIVERS="$CDROM_DRIVERS win32/libcdrom_win32.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1913,7 +1926,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, beos, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS beos"
+            CDROM_DRIVERS="$CDROM_DRIVERS beos/libcdrom_beos.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -1956,7 +1970,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, macos, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS macos"
+            CDROM_DRIVERS="$CDROM_DRIVERS macos/libcdrom_macos.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -2002,7 +2017,8 @@
         fi
         # Set up files for the cdrom library
         if test x$enable_cdrom = xyes; then
-            COPY_ARCH_SRC(src/cdrom, dummy, SDL_syscdrom.c)
+            CDROM_SUBDIRS="$CDROM_SUBDIRS dummy"
+            CDROM_DRIVERS="$CDROM_DRIVERS dummy/libcdrom_dummy.la"
         fi
         # Set up files for the thread library
         if test x$enable_threads = xyes; then
@@ -2077,6 +2093,8 @@
 AC_SUBST(VIDEO_DRIVERS)
 AC_SUBST(JOYSTICK_SUBDIRS)
 AC_SUBST(JOYSTICK_DRIVERS)
+AC_SUBST(CDROM_SUBDIRS)
+AC_SUBST(CDROM_DRIVERS)
 AC_SUBST(SDL_EXTRADIRS)
 AC_SUBST(SDL_EXTRALIBS)
 AC_SUBST(SYSTEM_LIBS)
@@ -2164,6 +2182,15 @@
 src/joystick/macos/Makefile
 src/joystick/win32/Makefile
 src/cdrom/Makefile
+src/cdrom/aix/Makefile
+src/cdrom/beos/Makefile
+src/cdrom/dummy/Makefile
+src/cdrom/freebsd/Makefile
+src/cdrom/linux/Makefile
+src/cdrom/macos/Makefile
+src/cdrom/openbsd/Makefile
+src/cdrom/qnx/Makefile
+src/cdrom/win32/Makefile
 src/thread/Makefile
 src/timer/Makefile
 src/endian/Makefile

--- a/docs.html	Sat Aug 18 21:58:26 2001 +0000
+++ b/docs.html	Sat Aug 18 22:03:11 2001 +0000
@@ -16,6 +16,7 @@
 Major changes since SDL 1.0.0:
 </H2>
 <UL>
+	<LI> 1.2.3: Fixed IDE and SCSI CD-ROM detection on BeOS (thanks Caz!)
 	<LI> 1.2.3: Fixed the system dependent SDL_WINDOWID hack on Windows
 	<LI> 1.2.3: Added 640x480 as a scaled resolution for NTSC/PAL output 
 	<LI> 1.2.3: Added support for TV output on the Linux PlayStation Beta

--- a/src/cdrom/Makefile.am	Sat Aug 18 21:58:26 2001 +0000
+++ b/src/cdrom/Makefile.am	Sat Aug 18 22:03:11 2001 +0000
@@ -3,27 +3,17 @@
 
 noinst_LTLIBRARIES = libcdrom.la
 
-ARCH_SUBDIRS = $(srcdir)/dummy $(srcdir)/beos $(srcdir)/freebsd \
-	$(srcdir)/linux $(srcdir)/macos $(srcdir)/openbsd \
-	$(srcdir)/qnx $(srcdir)/win32
+# Define which subdirectories need to be built
+SUBDIRS = @CDROM_SUBDIRS@
+DIST_SUBDIRS = aix beos dummy freebsd linux macos openbsd qnx win32
+
+DRIVERS = @CDROM_DRIVERS@
 
 # Include the architecture-independent sources
-COMMON_SRCS = SDL_cdrom.c SDL_syscdrom.h
-
-# Include the architecture-specific sources
-ARCH_SRCS = SDL_syscdrom.c
-
-libcdrom_la_SOURCES = $(COMMON_SRCS) $(ARCH_SRCS)
-
-## Let automake know that it shouldn't distribute linked sources
-BUILT_SOURCES = $(ARCH_SRCS)
+COMMON_SRCS =			\
+	SDL_cdrom.c		\
+	SDL_syscdrom.h
 
-## Let automake know that it should remove these for distribution
-DISTCLEANFILES = $(ARCH_SRCS)
-
-# The architecture specific directories need to be copied into place
-# when building a distribution.
-dist-hook:
-	(cd $(distdir) && rm -f $(BUILT_SOURCES))
-	cp -rp $(ARCH_SUBDIRS) $(distdir)
-	(cd $(distdir) && rm -rf `find . -name CVS`)
+libcdrom_la_SOURCES = $(COMMON_SRCS)
+libcdrom_la_LIBADD = $(DRIVERS)
+libcdrom_la_DEPENDENCIES = $(DRIVERS)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/aix/.cvsignore	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/aix/Makefile.am	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,8 @@
+
+## Makefile.am for the AIX cdrom driver for SDL
+
+noinst_LTLIBRARIES = libcdrom_aix.la
+libcdrom_aix_la_SOURCES = $(SRCS)
+
+# The SDL cdrom driver sources
+SRCS =  SDL_syscdrom.c

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/beos/.cvsignore	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/beos/Makefile.am	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,8 @@
+
+## Makefile.am for the BeOS cdrom driver for SDL
+
+noinst_LTLIBRARIES = libcdrom_beos.la
+libcdrom_beos_la_SOURCES = $(SRCS)
+
+# The SDL cdrom driver sources
+SRCS =  SDL_syscdrom.cc

--- a/src/cdrom/beos/SDL_syscdrom.c	Sat Aug 18 21:58:26 2001 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,398 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997, 1998, 1999, 2000, 2001  Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    Sam Lantinga
-    slouken@devolution.com
-*/
-
-#ifdef SAVE_RCSID
-static char rcsid =
- "@(#) $Id$";
-#endif
-
-/* Functions for system-level CD-ROM audio control on BeOS
-   (not completely implemented yet)
- */
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <scsi.h>
-
-#include "SDL_error.h"
-#include "SDL_cdrom.h"
-#include "SDL_syscdrom.h"
-
-/* Constants to help us get at the SCSI table-of-contents info */
-#define CD_NUMTRACKS(toc)	toc.toc_data[3]
-#define CD_TRACK(toc, track)	(&toc.toc_data[6+(track)*8])
-#define CD_TRACK_N(toc, track)	CD_TRACK(toc, track)[0]
-#define CD_TRACK_M(toc, track)	CD_TRACK(toc, track)[3]
-#define CD_TRACK_S(toc, track)	CD_TRACK(toc, track)[4]
-#define CD_TRACK_F(toc, track)	CD_TRACK(toc, track)[5]
-
-/* Constants to help us get at the SCSI position info */
-#define POS_TRACK(pos)	pos.position[6]
-#define POS_ABS_M(pos)	pos.position[9]
-#define POS_ABS_S(pos)	pos.position[10]
-#define POS_ABS_F(pos)	pos.position[11]
-#define POS_REL_M(pos)	pos.position[13]
-#define POS_REL_S(pos)	pos.position[14]
-#define POS_REL_F(pos)	pos.position[15]
-
-/* The maximum number of CD-ROM drives we'll detect */
-#define MAX_DRIVES	16	
-
-/* A list of available CD-ROM drives */
-static char *SDL_cdlist[MAX_DRIVES];
-
-/* The system-dependent CD control functions */
-static const char *SDL_SYS_CDName(int drive);
-static int SDL_SYS_CDOpen(int drive);
-static int SDL_SYS_CDGetTOC(SDL_CD *cdrom);
-static CDstatus SDL_SYS_CDStatus(SDL_CD *cdrom, int *position);
-static int SDL_SYS_CDPlay(SDL_CD *cdrom, int start, int length);
-static int SDL_SYS_CDPause(SDL_CD *cdrom);
-static int SDL_SYS_CDResume(SDL_CD *cdrom);
-static int SDL_SYS_CDStop(SDL_CD *cdrom);
-static int SDL_SYS_CDEject(SDL_CD *cdrom);
-static void SDL_SYS_CDClose(SDL_CD *cdrom);
-
-
-/* Check a drive to see if it is a CD-ROM */
-static int CheckDrive(char *drive)
-{
-	struct stat stbuf;
-	int is_cd, cdfd;
-	device_geometry info;
-
-	/* If it doesn't exist, return -1 */
-	if ( stat(drive, &stbuf) < 0 ) {
-		return(-1);
-	}
-
-	/* If it does exist, verify that it's an available CD-ROM */
-	is_cd = 0;
-	cdfd = open(drive, 0);
-	if ( cdfd >= 0 ) {
-		if ( ioctl(cdfd, B_GET_GEOMETRY, &info) == B_NO_ERROR ) {
-			if ( info.device_type == B_CD ) {
-				is_cd = 1;
-			}
-		}
-		close(cdfd);
-	} else {
-		/* This can happen when the drive is open .. (?) */;
-		is_cd = 1;
-	}
-	return(is_cd);
-}
-
-/* Add a CD-ROM drive to our list of valid drives */
-static void AddDrive(char *drive)
-{
-	int i;
-
-	if ( SDL_numcds < MAX_DRIVES ) {
-		/* Add this drive to our list */
-		i = SDL_numcds;
-		SDL_cdlist[i] = (char *)malloc(strlen(drive)+1);
-		if ( SDL_cdlist[i] == NULL ) {
-			SDL_OutOfMemory();
-			return;
-		}
-		strcpy(SDL_cdlist[i], drive);
-		++SDL_numcds;
-#ifdef CDROM_DEBUG
-  fprintf(stderr, "Added CD-ROM drive: %s\n", drive);
-#endif
-	}
-}
-
-# if 0 /* Save this for later, when I can test it */
-/* SCSI bus scanning magic */
-static int CheckSCSI(int path, int id, int lun)
-{
-	int is_cd;
-	int fd;
-	scsiprobe_inquiry inquiry;
-
-	is_cd = 0;
-	fd = open("/dev/scsiprobe", 0);
-	if ( fd >= 0 ) {
-		inquiry.path = path;
-		inquiry.id = id;
-		inquiry.lun = lun;
-		inquiry.len = sizeof(inquiry);
-		if ( ioctl(fd, B_SCSIPROBE_INQUIRY, &inquiry) == B_NO_ERROR ) {
-			if ( (inquiry.data[0]&0x1F) == B_SCSI_CD ) {
-				is_cd = 1;
-			}
-		}
-		close(fd);
-	}
-	return(is_cd);
-}
-#endif
-		
-/* IDE bus scanning magic */
-enum {
-	IDE_GET_DEVICES_INFO = B_DEVICE_OP_CODES_END + 50,
-};
-struct ide_ctrl_info {
-	bool	ide_0_present;
-	bool	ide_0_master_present;
-	bool	ide_0_slave_present;
-	int	ide_0_master_type;
-	int	ide_0_slave_type;
-	bool	ide_1_present;
-	bool	ide_1_master_present;
-	bool	ide_1_slave_present;
-	int	ide_1_master_type;
-	int	ide_1_slave_type;
-};
-
-int  SDL_SYS_CDInit(void)
-{
-	char *SDLcdrom;
-	int raw_fd;
-	struct ide_ctrl_info info;
-
-	/* Fill in our driver capabilities */
-	SDL_CDcaps.Name = SDL_SYS_CDName;
-	SDL_CDcaps.Open = SDL_SYS_CDOpen;
-	SDL_CDcaps.GetTOC = SDL_SYS_CDGetTOC;
-	SDL_CDcaps.Status = SDL_SYS_CDStatus;
-	SDL_CDcaps.Play = SDL_SYS_CDPlay;
-	SDL_CDcaps.Pause = SDL_SYS_CDPause;
-	SDL_CDcaps.Resume = SDL_SYS_CDResume;
-	SDL_CDcaps.Stop = SDL_SYS_CDStop;
-	SDL_CDcaps.Eject = SDL_SYS_CDEject;
-	SDL_CDcaps.Close = SDL_SYS_CDClose;
-
-	/* Look in the environment for our CD-ROM drive list */
-	SDLcdrom = getenv("SDL_CDROM");	/* ':' separated list of devices */
-	if ( SDLcdrom != NULL ) {
-		char *cdpath, *delim;
-		cdpath = malloc(strlen(SDLcdrom)+1);
-		if ( cdpath != NULL ) {
-			strcpy(cdpath, SDLcdrom);
-			SDLcdrom = cdpath;
-			do {
-				delim = strchr(SDLcdrom, ':');
-				if ( delim ) {
-					*delim++ = '\0';
-				}
-				if ( CheckDrive(SDLcdrom) > 0 ) {
-					AddDrive(SDLcdrom);
-				}
-				if ( delim ) {
-					SDLcdrom = delim;
-				} else {
-					SDLcdrom = NULL;
-				}
-			} while ( SDLcdrom );
-			free(cdpath);
-		}
-
-		/* If we found our drives, there's nothing left to do */
-		if ( SDL_numcds > 0 ) {
-			return(0);
-		}
-	}
-
-	/* Scan the system for CD-ROM drives */
-	raw_fd = open("/dev/disk/ide/rescan", 0);
-	if ( raw_fd >= 0 ) {
-		if (ioctl(raw_fd, IDE_GET_DEVICES_INFO, &info) == B_NO_ERROR) {
-			if ( info.ide_0_master_type == B_CD ) {
-				AddDrive("/dev/disk/ide/0/master/raw");
-			}
-			if ( info.ide_0_slave_type == B_CD ) {
-				AddDrive("/dev/disk/ide/0/slave/raw");
-			}
-			if ( info.ide_1_master_type == B_CD ) {
-				AddDrive("/dev/disk/ide/1/master/raw");
-			}
-			if ( info.ide_1_slave_type == B_CD ) {
-				AddDrive("/dev/disk/ide/1/slave/raw");
-			}
-		}
-		close(raw_fd);
-	}
-	return(0);
-}
-
-/* General ioctl() CD-ROM command function */
-static int SDL_SYS_CDioctl(int index, int command, void *arg)
-{
-	int okay;
-	int fd;
-
-	okay = 0;
-	fd = open(SDL_cdlist[index], 0);
-	if ( fd >= 0 ) {
-		if ( ioctl(fd, command, arg) == B_NO_ERROR ) {
-			okay = 1;
-		}
-		close(fd);
-	}
-	return(okay ? 0 : -1);
-}
-
-static const char *SDL_SYS_CDName(int drive)
-{
-	return(SDL_cdlist[drive]);
-} 
-
-static int SDL_SYS_CDOpen(int drive)
-{
-	return(drive);
-}
-
-static int SDL_SYS_CDGetTOC(SDL_CD *cdrom)
-{
-	int i;
-	scsi_toc toc;
-
-	if ( SDL_SYS_CDioctl(cdrom->id, B_SCSI_GET_TOC, &toc) == 0 ) {
-		cdrom->numtracks = CD_NUMTRACKS(toc);
-		if ( cdrom->numtracks > SDL_MAX_TRACKS ) {
-			cdrom->numtracks = SDL_MAX_TRACKS;
-		}
-		for ( i=0; i<=cdrom->numtracks; ++i ) {
-			cdrom->track[i].id = CD_TRACK_N(toc, i);
-			/* FIXME:  How do we tell on BeOS? */
-			cdrom->track[i].type = SDL_AUDIO_TRACK;
-			cdrom->track[i].offset = MSF_TO_FRAMES(
-							CD_TRACK_M(toc, i),
-							CD_TRACK_S(toc, i),
-							CD_TRACK_F(toc, i));
-			cdrom->track[i].length = 0;
-			if ( i > 0 ) {
-				cdrom->track[i-1].length =
-						cdrom->track[i].offset-
-						cdrom->track[i-1].offset;
-			}
-		}
-		return(0);
-	} else {
-		return(-1);
-	}
-}
-
-/* Get CD-ROM status */
-static CDstatus SDL_SYS_CDStatus(SDL_CD *cdrom, int *position)
-{
-	CDstatus status;
-	int fd;
-	int cur_frame;
-	scsi_position pos;
-
-	fd = open(SDL_cdlist[cdrom->id], 0);
-	cur_frame = 0;
-	if ( fd >= 0 ) {
-		if ( ioctl(fd, B_SCSI_GET_POSITION, &pos) == B_NO_ERROR ) {
-			cur_frame = MSF_TO_FRAMES(
-				POS_ABS_M(pos), POS_ABS_S(pos), POS_ABS_F(pos));
-		}
-		if ( ! pos.position[1] || (pos.position[1] >= 0x13) ||
-			((pos.position[1] == 0x12) && (!pos.position[6])) ) {
-			status = CD_STOPPED;
-		} else
-		if ( pos.position[1] == 0x11 ) {
-			status = CD_PLAYING;
-		} else {
-			status = CD_PAUSED;
-		}
-		close(fd);
-	} else {
-		status = CD_TRAYEMPTY;
-	}
-	if ( position ) {
-		*position = cur_frame;
-	}
-	return(status);
-}
-
-/* Start play */
-static int SDL_SYS_CDPlay(SDL_CD *cdrom, int start, int length)
-{
-	int okay;
-	int fd;
-	scsi_play_position pos;
-
-	okay = 0;
-	fd = open(SDL_cdlist[cdrom->id], 0);
-	if ( fd >= 0 ) {
-		FRAMES_TO_MSF(start, &pos.start_m, &pos.start_s, &pos.start_f);
-		FRAMES_TO_MSF(start+length, &pos.end_m, &pos.end_s, &pos.end_f);
-		if ( ioctl(fd, B_SCSI_PLAY_POSITION, &pos) == B_NO_ERROR ) {
-			okay = 1;
-		}
-		close(fd);
-	}
-	return(okay ? 0 : -1);
-}
-
-/* Pause play */
-static int SDL_SYS_CDPause(SDL_CD *cdrom)
-{
-	return(SDL_SYS_CDioctl(cdrom->id, B_SCSI_PAUSE_AUDIO, 0));
-}
-
-/* Resume play */
-static int SDL_SYS_CDResume(SDL_CD *cdrom)
-{
-	return(SDL_SYS_CDioctl(cdrom->id, B_SCSI_RESUME_AUDIO, 0));
-}
-
-/* Stop play */
-static int SDL_SYS_CDStop(SDL_CD *cdrom)
-{
-	return(SDL_SYS_CDioctl(cdrom->id, B_SCSI_STOP_AUDIO, 0));
-}
-
-/* Eject the CD-ROM */
-static int SDL_SYS_CDEject(SDL_CD *cdrom)
-{
-	return(SDL_SYS_CDioctl(cdrom->id, B_SCSI_EJECT, 0));
-}
-
-/* Close the CD-ROM handle */
-static void SDL_SYS_CDClose(SDL_CD *cdrom)
-{
-	free(cdrom);
-}
-
-void SDL_SYS_CDQuit(void)
-{
-	int i;
-
-	if ( SDL_numcds > 0 ) {
-		for ( i=0; i<SDL_numcds; ++i ) {
-			free(SDL_cdlist[i]);
-		}
-		SDL_numcds = 0;
-	}
-}
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/beos/SDL_syscdrom.cc	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,414 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997, 1998, 1999, 2000, 2001  Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    Sam Lantinga
+    slouken@devolution.com
+*/
+
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id$";
+#endif
+
+/* Functions for system-level CD-ROM audio control on BeOS
+   (not completely implemented yet)
+ */
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <scsi.h>
+#include <Directory.h>
+#include <Entry.h>
+#include <Path.h>
+
+#include "SDL_error.h"
+#include "SDL_cdrom.h"
+extern "C" {
+#include "SDL_syscdrom.h"
+}
+
+/* Constants to help us get at the SCSI table-of-contents info */
+#define CD_NUMTRACKS(toc)	toc.toc_data[3]
+#define CD_TRACK(toc, track)	(&toc.toc_data[6+(track)*8])
+#define CD_TRACK_N(toc, track)	CD_TRACK(toc, track)[0]
+#define CD_TRACK_M(toc, track)	CD_TRACK(toc, track)[3]
+#define CD_TRACK_S(toc, track)	CD_TRACK(toc, track)[4]
+#define CD_TRACK_F(toc, track)	CD_TRACK(toc, track)[5]
+
+/* Constants to help us get at the SCSI position info */
+#define POS_TRACK(pos)	pos.position[6]
+#define POS_ABS_M(pos)	pos.position[9]
+#define POS_ABS_S(pos)	pos.position[10]
+#define POS_ABS_F(pos)	pos.position[11]
+#define POS_REL_M(pos)	pos.position[13]
+#define POS_REL_S(pos)	pos.position[14]
+#define POS_REL_F(pos)	pos.position[15]
+
+/* The maximum number of CD-ROM drives we'll detect */
+#define MAX_DRIVES	16	
+
+/* A list of available CD-ROM drives */
+static char *SDL_cdlist[MAX_DRIVES];
+
+/* The system-dependent CD control functions */
+static const char *SDL_SYS_CDName(int drive);
+static int SDL_SYS_CDOpen(int drive);
+static int SDL_SYS_CDGetTOC(SDL_CD *cdrom);
+static CDstatus SDL_SYS_CDStatus(SDL_CD *cdrom, int *position);
+static int SDL_SYS_CDPlay(SDL_CD *cdrom, int start, int length);
+static int SDL_SYS_CDPause(SDL_CD *cdrom);
+static int SDL_SYS_CDResume(SDL_CD *cdrom);
+static int SDL_SYS_CDStop(SDL_CD *cdrom);
+static int SDL_SYS_CDEject(SDL_CD *cdrom);
+static void SDL_SYS_CDClose(SDL_CD *cdrom);
+int try_dir(const char *directory);
+
+
+/* Check a drive to see if it is a CD-ROM */
+static int CheckDrive(char *drive)
+{
+	struct stat stbuf;
+	int is_cd, cdfd;
+	device_geometry info;
+
+	/* If it doesn't exist, return -1 */
+	if ( stat(drive, &stbuf) < 0 ) {
+		return(-1);
+	}
+
+	/* If it does exist, verify that it's an available CD-ROM */
+	is_cd = 0;
+	cdfd = open(drive, 0);
+	if ( cdfd >= 0 ) {
+		if ( ioctl(cdfd, B_GET_GEOMETRY, &info) == B_NO_ERROR ) {
+			if ( info.device_type == B_CD ) {
+				is_cd = 1;
+			}
+		}
+		close(cdfd);
+	} else {
+		/* This can happen when the drive is open .. (?) */;
+		is_cd = 1;
+	}
+	return(is_cd);
+}
+
+/* Add a CD-ROM drive to our list of valid drives */
+static void AddDrive(char *drive)
+{
+	int i;
+
+	if ( SDL_numcds < MAX_DRIVES ) {
+		/* Add this drive to our list */
+		i = SDL_numcds;
+		SDL_cdlist[i] = (char *)malloc(strlen(drive)+1);
+		if ( SDL_cdlist[i] == NULL ) {
+			SDL_OutOfMemory();
+			return;
+		}
+		strcpy(SDL_cdlist[i], drive);
+		++SDL_numcds;
+#ifdef CDROM_DEBUG
+  fprintf(stderr, "Added CD-ROM drive: %s\n", drive);
+#endif
+	}
+}
+
+/* IDE bus scanning magic */
+enum {
+	IDE_GET_DEVICES_INFO = B_DEVICE_OP_CODES_END + 50,
+};
+struct ide_ctrl_info {
+	bool	ide_0_present;
+	bool	ide_0_master_present;
+	bool	ide_0_slave_present;
+	int	ide_0_master_type;
+	int	ide_0_slave_type;
+	bool	ide_1_present;
+	bool	ide_1_master_present;
+	bool	ide_1_slave_present;
+	int	ide_1_master_type;
+	int	ide_1_slave_type;
+};
+
+int  SDL_SYS_CDInit(void)
+{
+	char *SDLcdrom;
+	int raw_fd;
+	struct ide_ctrl_info info;
+
+	/* Fill in our driver capabilities */
+	SDL_CDcaps.Name = SDL_SYS_CDName;
+	SDL_CDcaps.Open = SDL_SYS_CDOpen;
+	SDL_CDcaps.GetTOC = SDL_SYS_CDGetTOC;
+	SDL_CDcaps.Status = SDL_SYS_CDStatus;
+	SDL_CDcaps.Play = SDL_SYS_CDPlay;
+	SDL_CDcaps.Pause = SDL_SYS_CDPause;
+	SDL_CDcaps.Resume = SDL_SYS_CDResume;
+	SDL_CDcaps.Stop = SDL_SYS_CDStop;
+	SDL_CDcaps.Eject = SDL_SYS_CDEject;
+	SDL_CDcaps.Close = SDL_SYS_CDClose;
+
+	/* Look in the environment for our CD-ROM drive list */
+	SDLcdrom = getenv("SDL_CDROM");	/* ':' separated list of devices */
+	if ( SDLcdrom != NULL ) {
+		char *cdpath, *delim;
+		cdpath = (char *)malloc(strlen(SDLcdrom)+1);
+		if ( cdpath != NULL ) {
+			strcpy(cdpath, SDLcdrom);
+			SDLcdrom = cdpath;
+			do {
+				delim = strchr(SDLcdrom, ':');
+				if ( delim ) {
+					*delim++ = '\0';
+				}
+				if ( CheckDrive(SDLcdrom) > 0 ) {
+					AddDrive(SDLcdrom);
+				}
+				if ( delim ) {
+					SDLcdrom = delim;
+				} else {
+					SDLcdrom = NULL;
+				}
+			} while ( SDLcdrom );
+			free(cdpath);
+		}
+
+		/* If we found our drives, there's nothing left to do */
+		if ( SDL_numcds > 0 ) {
+			return(0);
+		}
+	}
+	
+	/* Scan the system for CD-ROM drives */
+	try_dir("/dev/disk");
+	return 0;
+}
+
+
+int try_dir(const char *directory)
+{ 
+	BDirectory dir; 
+	dir.SetTo(directory); 
+	if(dir.InitCheck() != B_NO_ERROR) { 
+		return false; 
+	} 
+	dir.Rewind(); 
+	BEntry entry; 
+	while(dir.GetNextEntry(&entry) >= 0) { 
+		BPath path; 
+		const char *name; 
+		entry_ref e; 
+		
+		if(entry.GetPath(&path) != B_NO_ERROR) 
+			continue; 
+		name = path.Path(); 
+		
+		if(entry.GetRef(&e) != B_NO_ERROR) 
+			continue; 
+
+		if(entry.IsDirectory()) { 
+			if(strcmp(e.name, "floppy") == 0) 
+				continue; /* ignore floppy (it is not silent)  */
+			int devfd = try_dir(name);
+			if(devfd >= 0)
+				return devfd;
+		} 
+		else { 
+			int devfd; 
+			device_geometry g; 
+
+			if(strcmp(e.name, "raw") != 0) 
+				continue; /* ignore partitions */
+
+			devfd = open(name, O_RDONLY); 
+			if(devfd < 0) 
+				continue; 
+
+			if(ioctl(devfd, B_GET_GEOMETRY, &g, sizeof(g)) >= 0) {
+				if(g.device_type == B_CD)
+				{
+				AddDrive(strdup(name));
+				}
+			}
+			close(devfd);
+		} 
+	}
+	return B_ERROR;
+}
+
+
+/* General ioctl() CD-ROM command function */
+static int SDL_SYS_CDioctl(int index, int command, void *arg)
+{
+	int okay;
+	int fd;
+
+	okay = 0;
+	fd = open(SDL_cdlist[index], 0);
+	if ( fd >= 0 ) {
+		if ( ioctl(fd, command, arg) == B_NO_ERROR ) {
+			okay = 1;
+		}
+		close(fd);
+	}
+	return(okay ? 0 : -1);
+}
+
+static const char *SDL_SYS_CDName(int drive)
+{
+	return(SDL_cdlist[drive]);
+} 
+
+static int SDL_SYS_CDOpen(int drive)
+{
+	return(drive);
+}
+
+static int SDL_SYS_CDGetTOC(SDL_CD *cdrom)
+{
+	int i;
+	scsi_toc toc;
+
+	if ( SDL_SYS_CDioctl(cdrom->id, B_SCSI_GET_TOC, &toc) == 0 ) {
+		cdrom->numtracks = CD_NUMTRACKS(toc);
+		if ( cdrom->numtracks > SDL_MAX_TRACKS ) {
+			cdrom->numtracks = SDL_MAX_TRACKS;
+		}
+		for ( i=0; i<=cdrom->numtracks; ++i ) {
+			cdrom->track[i].id = CD_TRACK_N(toc, i);
+			/* FIXME:  How do we tell on BeOS? */
+			cdrom->track[i].type = SDL_AUDIO_TRACK;
+			cdrom->track[i].offset = MSF_TO_FRAMES(
+							CD_TRACK_M(toc, i),
+							CD_TRACK_S(toc, i),
+							CD_TRACK_F(toc, i));
+			cdrom->track[i].length = 0;
+			if ( i > 0 ) {
+				cdrom->track[i-1].length =
+						cdrom->track[i].offset-
+						cdrom->track[i-1].offset;
+			}
+		}
+		return(0);
+	} else {
+		return(-1);
+	}
+}
+
+/* Get CD-ROM status */
+static CDstatus SDL_SYS_CDStatus(SDL_CD *cdrom, int *position)
+{
+	CDstatus status;
+	int fd;
+	int cur_frame;
+	scsi_position pos;
+
+	fd = open(SDL_cdlist[cdrom->id], 0);
+	cur_frame = 0;
+	if ( fd >= 0 ) {
+		if ( ioctl(fd, B_SCSI_GET_POSITION, &pos) == B_NO_ERROR ) {
+			cur_frame = MSF_TO_FRAMES(
+				POS_ABS_M(pos), POS_ABS_S(pos), POS_ABS_F(pos));
+		}
+		if ( ! pos.position[1] || (pos.position[1] >= 0x13) ||
+			((pos.position[1] == 0x12) && (!pos.position[6])) ) {
+			status = CD_STOPPED;
+		} else
+		if ( pos.position[1] == 0x11 ) {
+			status = CD_PLAYING;
+		} else {
+			status = CD_PAUSED;
+		}
+		close(fd);
+	} else {
+		status = CD_TRAYEMPTY;
+	}
+	if ( position ) {
+		*position = cur_frame;
+	}
+	return(status);
+}
+
+/* Start play */
+static int SDL_SYS_CDPlay(SDL_CD *cdrom, int start, int length)
+{
+	int okay;
+	int fd;
+	scsi_play_position pos;
+
+	okay = 0;
+	fd = open(SDL_cdlist[cdrom->id], 0);
+	if ( fd >= 0 ) {
+		FRAMES_TO_MSF(start, &pos.start_m, &pos.start_s, &pos.start_f);
+		FRAMES_TO_MSF(start+length, &pos.end_m, &pos.end_s, &pos.end_f);
+		if ( ioctl(fd, B_SCSI_PLAY_POSITION, &pos) == B_NO_ERROR ) {
+			okay = 1;
+		}
+		close(fd);
+	}
+	return(okay ? 0 : -1);
+}
+
+/* Pause play */
+static int SDL_SYS_CDPause(SDL_CD *cdrom)
+{
+	return(SDL_SYS_CDioctl(cdrom->id, B_SCSI_PAUSE_AUDIO, 0));
+}
+
+/* Resume play */
+static int SDL_SYS_CDResume(SDL_CD *cdrom)
+{
+	return(SDL_SYS_CDioctl(cdrom->id, B_SCSI_RESUME_AUDIO, 0));
+}
+
+/* Stop play */
+static int SDL_SYS_CDStop(SDL_CD *cdrom)
+{
+	return(SDL_SYS_CDioctl(cdrom->id, B_SCSI_STOP_AUDIO, 0));
+}
+
+/* Eject the CD-ROM */
+static int SDL_SYS_CDEject(SDL_CD *cdrom)
+{
+	return(SDL_SYS_CDioctl(cdrom->id, B_SCSI_EJECT, 0));
+}
+
+/* Close the CD-ROM handle */
+static void SDL_SYS_CDClose(SDL_CD *cdrom)
+{
+	close(cdrom->id);
+}
+
+void SDL_SYS_CDQuit(void)
+{
+	int i;
+
+	if ( SDL_numcds > 0 ) {
+		for ( i=0; i<SDL_numcds; ++i ) {
+			free(SDL_cdlist[i]);
+		}
+		SDL_numcds = 0;
+	}
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/dummy/.cvsignore	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/dummy/Makefile.am	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,8 @@
+
+## Makefile.am for the dummy cdrom driver for SDL
+
+noinst_LTLIBRARIES = libcdrom_dummy.la
+libcdrom_dummy_la_SOURCES = $(SRCS)
+
+# The SDL cdrom driver sources
+SRCS =  SDL_syscdrom.c

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/freebsd/.cvsignore	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/freebsd/Makefile.am	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,8 @@
+
+## Makefile.am for the FreeBSD cdrom driver for SDL
+
+noinst_LTLIBRARIES = libcdrom_freebsd.la
+libcdrom_freebsd_la_SOURCES = $(SRCS)
+
+# The SDL cdrom driver sources
+SRCS =  SDL_syscdrom.c

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/linux/.cvsignore	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/linux/Makefile.am	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,8 @@
+
+## Makefile.am for the Linux cdrom driver for SDL
+
+noinst_LTLIBRARIES = libcdrom_linux.la
+libcdrom_linux_la_SOURCES = $(SRCS)
+
+# The SDL cdrom driver sources
+SRCS =  SDL_syscdrom.c

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/macos/.cvsignore	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/macos/Makefile.am	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,8 @@
+
+## Makefile.am for the MacOS Classic cdrom driver for SDL
+
+noinst_LTLIBRARIES = libcdrom_macos.la
+libcdrom_macos_la_SOURCES = $(SRCS)
+
+# The SDL cdrom driver sources
+SRCS = SDL_syscdrom.c SDL_syscdrom_c.h

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/openbsd/.cvsignore	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/openbsd/Makefile.am	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,8 @@
+
+## Makefile.am for the OpenBSD cdrom driver for SDL
+
+noinst_LTLIBRARIES = libcdrom_openbsd.la
+libcdrom_openbsd_la_SOURCES = $(SRCS)
+
+# The SDL cdrom driver sources
+SRCS =  SDL_syscdrom.c

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/qnx/.cvsignore	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/qnx/Makefile.am	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,8 @@
+
+## Makefile.am for the QNX cdrom driver for SDL
+
+noinst_LTLIBRARIES = libcdrom_qnx.la
+libcdrom_qnx_la_SOURCES = $(SRCS)
+
+# The SDL cdrom driver sources
+SRCS =  SDL_syscdrom.c

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/win32/.cvsignore	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,6 @@
+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cdrom/win32/Makefile.am	Sat Aug 18 22:03:11 2001 +0000
@@ -0,0 +1,8 @@
+
+## Makefile.am for the Windows cdrom driver for SDL
+
+noinst_LTLIBRARIES = libcdrom_win32.la
+libcdrom_win32_la_SOURCES = $(SRCS)
+
+# The SDL cdrom driver sources
+SRCS =  SDL_syscdrom.c