diff options
| author | Justin M. Seger <jseger@FreeBSD.org> | 1998-10-13 03:30:30 +0000 |
|---|---|---|
| committer | Justin M. Seger <jseger@FreeBSD.org> | 1998-10-13 03:30:30 +0000 |
| commit | a9953d086263caacf9b2c11c529622fd0aad7c42 (patch) | |
| tree | 46d6c35818acf484efbe5126584caa6906f8673b /audio/workman/files/patch-ac | |
| parent | Unbreak for ELF. (diff) | |
Unbreak for ELF.
Partially submitted by: ken@plutotech.com
Notes
Notes:
svn path=/head/; revision=13934
Diffstat (limited to '')
| -rw-r--r-- | audio/workman/files/patch-ac | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/audio/workman/files/patch-ac b/audio/workman/files/patch-ac new file mode 100644 index 000000000000..f73fb3a8cd5b --- /dev/null +++ b/audio/workman/files/patch-ac @@ -0,0 +1,69 @@ +--- plat_freebsd.c.orig Mon Feb 20 17:29:55 1995 ++++ plat_freebsd.c Tue Oct 13 03:24:22 1998 +@@ -5,6 +5,9 @@ + * + * Todd Pfaff, 3/20/94 + * ++ * 11/26/95: Modified to work under FreeBSD 2.x ++ * by Donald Burr <d_burr@ix.netcom.com> ++ * + */ + static char *ident = "@(#)plat_freebsd.c 1.2 2/20/95"; + +@@ -22,21 +25,17 @@ + #include <string.h> + #include <sys/ioctl.h> + #include <sys/cdio.h> +-#include <sys/scsiio.h> + #ifdef __NetBSD__ + #define MSF_MINUTES 1 + #define MSF_SECONDS 2 + #define MSF_FRAMES 3 + #include "/sys/scsi/scsi_all.h" + #include "/sys/scsi/scsi_cd.h" +-#else +-#include <scsi/scsi_all.h> +-#include <scsi/scsi_cd.h> + #endif + + #include "struct.h" + +-#define DEFAULT_CD_DEVICE "/dev/rcd0d" ++#define DEFAULT_CD_DEVICE "/dev/rcd0c" + + void *malloc(); + +@@ -163,7 +162,7 @@ + } + + if (ioctl(d->fd, CDIOCREADSUBCHANNEL, &sc)) { +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) + /* we need to release the device so the kernel will notice + reloaded media */ + (void) close(d->fd); +@@ -261,6 +260,9 @@ + + bzero((char *)&vol, sizeof(vol)); + ++#define LEFT_PORT 0 ++#define RIGHT_PORT 1 ++ + vol.vol[LEFT_PORT] = left; + vol.vol[RIGHT_PORT] = right; + +@@ -345,12 +347,12 @@ + if (fstatfs(stbuf.st_rdev, &buf) == 0) + return (-3); + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) + rval = ioctl(d->fd, CDIOCALLOW); + if (rval == 0) + #endif + rval = ioctl(d->fd, CDIOCEJECT); +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) + if (rval == 0) + rval = ioctl(d->fd, CDIOCPREVENT); + #endif |