summaryrefslogtreecommitdiff
path: root/emulators/BasiliskII/patches/patch-af
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/BasiliskII/patches/patch-af')
-rw-r--r--emulators/BasiliskII/patches/patch-af40
1 files changed, 20 insertions, 20 deletions
diff --git a/emulators/BasiliskII/patches/patch-af b/emulators/BasiliskII/patches/patch-af
index 2d40c0982a1..a23c299a819 100644
--- a/emulators/BasiliskII/patches/patch-af
+++ b/emulators/BasiliskII/patches/patch-af
@@ -1,9 +1,9 @@
-$NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
+$NetBSD: patch-af,v 1.2 2005/11/23 12:17:56 adam Exp $
---- src/Unix/sys_unix.cpp.orig 2005-11-17 14:25:16.000000000 +0000
+--- src/Unix/sys_unix.cpp.orig 2005-08-01 07:23:02.000000000 +0200
+++ src/Unix/sys_unix.cpp
-@@ -52,7 +52,7 @@ static int _llseek(unsigned int fd, unsi
- #endif
+@@ -37,7 +37,7 @@
+ #include <dirent.h>
#endif
-#if defined(__FreeBSD__) || defined(__NetBSD__)
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
#include <sys/cdio.h>
#endif
-@@ -79,7 +79,7 @@ struct file_handle {
+@@ -64,7 +64,7 @@ struct file_handle {
#if defined(__linux__)
int cdrom_cap; // CD-ROM capability flags (only valid if is_cdrom is true)
@@ -20,7 +20,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
struct ioc_capability cdrom_cap;
#elif defined(__APPLE__) && defined(__MACH__)
char *ioctl_name; // For CDs on OS X - a device for special ioctls
-@@ -237,7 +237,7 @@ void SysAddCDROMPrefs(void)
+@@ -222,7 +222,7 @@ void SysAddCDROMPrefs(void)
// Until I can convince the other guys that my Darwin code is useful,
// we just do nothing (it is safe to have no cdrom device)
#endif
@@ -29,7 +29,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
PrefsAddString("cdrom", "/dev/cd0c");
#endif
}
-@@ -257,7 +257,7 @@ void SysAddSerialPrefs(void)
+@@ -242,7 +242,7 @@ void SysAddSerialPrefs(void)
PrefsAddString("seriala", "/dev/tts/0");
PrefsAddString("serialb", "/dev/tts/1");
}
@@ -38,7 +38,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
PrefsAddString("seriala", "/dev/cuaa0");
PrefsAddString("serialb", "/dev/cuaa1");
#elif defined(__NetBSD__)
-@@ -319,7 +319,7 @@ static bool is_drive_mounted(const char
+@@ -304,7 +304,7 @@ static bool is_drive_mounted(const char
void *Sys_open(const char *name, bool read_only)
{
bool is_file = strncmp(name, "/dev/", 5) != 0;
@@ -47,7 +47,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
// SCSI IDE
bool is_cdrom = strncmp(name, "/dev/cd", 7) == 0 || strncmp(name, "/dev/acd", 8) == 0;
#else
-@@ -367,7 +367,7 @@ void *Sys_open(const char *name, bool re
+@@ -352,7 +352,7 @@ void *Sys_open(const char *name, bool re
}
// Open file/device
@@ -56,7 +56,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
int fd = open(name, (read_only ? O_RDONLY : O_RDWR) | (is_cdrom ? O_NONBLOCK : 0));
#else
int fd = open(name, read_only ? O_RDONLY : O_RDWR);
-@@ -414,7 +414,7 @@ void *Sys_open(const char *name, bool re
+@@ -395,7 +395,7 @@ void *Sys_open(const char *name, bool re
#else
fh->cdrom_cap = 0;
#endif
@@ -65,7 +65,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
fh->is_floppy = ((st.st_rdev >> 16) == 2);
#ifdef CDIOCCAPABILITY
if (is_cdrom) {
-@@ -586,7 +586,7 @@ void SysEject(void *arg)
+@@ -555,7 +555,7 @@ void SysEject(void *arg)
close(fh->fd); // Close and reopen so the driver will see the media change
fh->fd = open(fh->name, O_RDONLY | O_NONBLOCK);
}
@@ -74,7 +74,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
if (fh->is_floppy) {
fsync(fh->fd);
} else if (fh->is_cdrom) {
-@@ -723,7 +723,7 @@ bool SysIsDiskInserted(void *arg)
+@@ -692,7 +692,7 @@ bool SysIsDiskInserted(void *arg)
#endif
cdrom_tochdr header;
return ioctl(fh->fd, CDROMREADTOCHDR, &header) == 0;
@@ -83,7 +83,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
} else if (fh->is_floppy) {
return false; //!!
} else if (fh->is_cdrom) {
-@@ -831,7 +831,7 @@ bool SysCDReadTOC(void *arg, uint8 *toc)
+@@ -800,7 +800,7 @@ bool SysCDReadTOC(void *arg, uint8 *toc)
extern bool DarwinCDReadTOC(char *name, uint8 *toc);
return DarwinCDReadTOC(fh->name, toc);
@@ -92,7 +92,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
uint8 *p = toc + 2;
// Header
-@@ -942,7 +942,7 @@ bool SysCDGetPosition(void *arg, uint8 *
+@@ -911,7 +911,7 @@ bool SysCDGetPosition(void *arg, uint8 *
*pos++ = chan.cdsc_reladdr.msf.second;
*pos++ = chan.cdsc_reladdr.msf.frame;
return true;
@@ -101,7 +101,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
struct ioc_read_subchannel chan;
chan.data_format = CD_MSF_FORMAT;
chan.address_format = CD_MSF_FORMAT;
-@@ -994,7 +994,7 @@ bool SysCDPlay(void *arg, uint8 start_m,
+@@ -963,7 +963,7 @@ bool SysCDPlay(void *arg, uint8 start_m,
play.cdmsf_sec1 = end_s;
play.cdmsf_frame1 = end_f;
return ioctl(fh->fd, CDROMPLAYMSF, &play) == 0;
@@ -110,7 +110,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
struct ioc_play_msf play;
play.start_m = start_m;
play.start_s = start_s;
-@@ -1024,7 +1024,7 @@ bool SysCDPause(void *arg)
+@@ -993,7 +993,7 @@ bool SysCDPause(void *arg)
if (fh->is_cdrom) {
#if defined(__linux__)
return ioctl(fh->fd, CDROMPAUSE) == 0;
@@ -119,7 +119,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
return ioctl(fh->fd, CDIOCPAUSE) == 0;
#else
return false;
-@@ -1047,7 +1047,7 @@ bool SysCDResume(void *arg)
+@@ -1016,7 +1016,7 @@ bool SysCDResume(void *arg)
if (fh->is_cdrom) {
#if defined(__linux__)
return ioctl(fh->fd, CDROMRESUME) == 0;
@@ -128,7 +128,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
return ioctl(fh->fd, CDIOCRESUME) == 0;
#else
return false;
-@@ -1070,7 +1070,7 @@ bool SysCDStop(void *arg, uint8 lead_out
+@@ -1039,7 +1039,7 @@ bool SysCDStop(void *arg, uint8 lead_out
if (fh->is_cdrom) {
#if defined(__linux__)
return ioctl(fh->fd, CDROMSTOP) == 0;
@@ -137,7 +137,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
return ioctl(fh->fd, CDIOCSTOP) == 0;
#else
return false;
-@@ -1111,7 +1111,7 @@ void SysCDSetVolume(void *arg, uint8 lef
+@@ -1080,7 +1080,7 @@ void SysCDSetVolume(void *arg, uint8 lef
vol.channel0 = vol.channel2 = left;
vol.channel1 = vol.channel3 = right;
ioctl(fh->fd, CDROMVOLCTRL, &vol);
@@ -146,7 +146,7 @@ $NetBSD: patch-af,v 1.1 2005/11/17 16:56:39 joerg Exp $
struct ioc_vol vol;
vol.vol[0] = vol.vol[2] = left;
vol.vol[1] = vol.vol[3] = right;
-@@ -1138,7 +1138,7 @@ void SysCDGetVolume(void *arg, uint8 &le
+@@ -1107,7 +1107,7 @@ void SysCDGetVolume(void *arg, uint8 &le
ioctl(fh->fd, CDROMVOLREAD, &vol);
left = vol.channel0;
right = vol.channel1;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 22:47:30 +0000